MAID: updated version numbers, fixed the way the promises were returned.

This commit is contained in:
walljm 2017-01-26 21:14:55 -05:00
parent d0d597f78c
commit 53f6218fa6
7 changed files with 13 additions and 12 deletions

View File

@ -1,6 +1,6 @@
{
"project": {
"version": "3.0.0-beta.22-1",
"version": "3.0.0",
"name": "Dynamic Bible"
},
"apps": [

View File

@ -1,5 +1,5 @@
{
"name": "db",
"name": "DynamicBible",
"app_id": "",
"v2": true,
"typescript": true

View File

@ -1,5 +1,5 @@
{
"version": "2.0.0",
"version": "3.0.0",
"name": "dynamicbible",
"author": "Jason Wall",
"homepage": "http://dynamicbible.com/",
@ -13,6 +13,7 @@
"ionic:build": "ionic-app-scripts build",
"ionic:serve": "ionic-app-scripts serve",
"start": "ionic serve",
"lab": "ionic serve --lab",
"test": "ng test",
"test-coverage": "ng test --code-coverage"
},
@ -28,12 +29,12 @@
"@angular/platform-server": "2.2.1",
"@ionic/storage": "1.1.7",
"@types/jasmine": "^2.5.38",
"ionic-angular": "2.0.0-rc.5",
"ionic-angular": "2.0.0",
"ionic-native": "2.2.11",
"ionicons": "3.0.0",
"rxjs": "5.0.0-beta.12",
"zone.js": "0.6.26",
"sw-toolbox": "3.4.0"
"sw-toolbox": "3.4.0",
"zone.js": "0.6.26"
},
"devDependencies": {
"@ionic/app-scripts": "1.0.0",

View File

@ -15,9 +15,9 @@ export class BibleService
{
}
getResultAsPromise(section:Section): Promise<BiblePassageResult>
getResultAsPromise(section: Section): Promise<BiblePassageResult>
{
return Promise.resolve(this.getResult(section));
return new Promise((resolve, reject) => { resolve(this.getResult(section)); });
}
getResult(section: Section): BiblePassageResult

View File

@ -11,10 +11,10 @@ export class StrongsService
constructor(private http: Http)
{
}
getResultAsPromise(sn: number, dict: string): Promise<StrongsResult>
{
return Promise.resolve(this.getResult(sn, dict));
return new Promise((resolve, reject) => { resolve(this.getResult(sn, dict)); });
}
getResult(sn: number, dict: string): StrongsResult

View File

@ -11,7 +11,7 @@ export class WordService
getResultAsPromise(qry: string): Promise<WordLookupResult>
{
return Promise.resolve(this.getResult(qry));
return new Promise((resolve, reject) => { resolve(this.getResult(qry)); });
}
getResult(qry: string): WordLookupResult

View File

@ -68,4 +68,4 @@ $colors: (
// http://ionicframework.com/docs/v2/ionicons/
$ionicons-font-path: "../assets/fonts";
@import "ionicons";
@import "ionic.ionicons";