From 53f6218fa6d90f635f1a4605d432a20577ee7060 Mon Sep 17 00:00:00 2001
From: walljm <none@none>
Date: Thu, 26 Jan 2017 21:14:55 -0500
Subject: [PATCH] MAID: updated version numbers, fixed the way the promises
 were returned.

---
 DynamicBibleIonic/angular-cli.json                | 2 +-
 DynamicBibleIonic/ionic.config.json               | 2 +-
 DynamicBibleIonic/package.json                    | 9 +++++----
 DynamicBibleIonic/src/services/bible-service.ts   | 4 ++--
 DynamicBibleIonic/src/services/strongs-service.ts | 4 ++--
 DynamicBibleIonic/src/services/word-service.ts    | 2 +-
 DynamicBibleIonic/src/theme/variables.scss        | 2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/DynamicBibleIonic/angular-cli.json b/DynamicBibleIonic/angular-cli.json
index 0c98060c..fb34db64 100644
--- a/DynamicBibleIonic/angular-cli.json
+++ b/DynamicBibleIonic/angular-cli.json
@@ -1,6 +1,6 @@
 {
   "project": {
-    "version": "3.0.0-beta.22-1",
+    "version": "3.0.0",
     "name": "Dynamic Bible"
   },
   "apps": [
diff --git a/DynamicBibleIonic/ionic.config.json b/DynamicBibleIonic/ionic.config.json
index 61e13ac8..03289f9d 100644
--- a/DynamicBibleIonic/ionic.config.json
+++ b/DynamicBibleIonic/ionic.config.json
@@ -1,5 +1,5 @@
 {
-  "name": "db",
+  "name": "DynamicBible",
   "app_id": "",
   "v2": true,
   "typescript": true
diff --git a/DynamicBibleIonic/package.json b/DynamicBibleIonic/package.json
index 4953c93e..f1420d43 100644
--- a/DynamicBibleIonic/package.json
+++ b/DynamicBibleIonic/package.json
@@ -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",
diff --git a/DynamicBibleIonic/src/services/bible-service.ts b/DynamicBibleIonic/src/services/bible-service.ts
index 53c38644..37568974 100644
--- a/DynamicBibleIonic/src/services/bible-service.ts
+++ b/DynamicBibleIonic/src/services/bible-service.ts
@@ -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
diff --git a/DynamicBibleIonic/src/services/strongs-service.ts b/DynamicBibleIonic/src/services/strongs-service.ts
index ee97ec3b..392915e6 100644
--- a/DynamicBibleIonic/src/services/strongs-service.ts
+++ b/DynamicBibleIonic/src/services/strongs-service.ts
@@ -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
diff --git a/DynamicBibleIonic/src/services/word-service.ts b/DynamicBibleIonic/src/services/word-service.ts
index 3ae76de8..8fd89fd2 100644
--- a/DynamicBibleIonic/src/services/word-service.ts
+++ b/DynamicBibleIonic/src/services/word-service.ts
@@ -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
diff --git a/DynamicBibleIonic/src/theme/variables.scss b/DynamicBibleIonic/src/theme/variables.scss
index 49e7c6bc..2fbcb249 100644
--- a/DynamicBibleIonic/src/theme/variables.scss
+++ b/DynamicBibleIonic/src/theme/variables.scss
@@ -68,4 +68,4 @@ $colors: (
 // http://ionicframework.com/docs/v2/ionicons/
 
 $ionicons-font-path: "../assets/fonts";
-@import "ionicons";
+@import "ionic.ionicons";