From 2293807bfe929e57f952eb2e07bba148acb98b66 Mon Sep 17 00:00:00 2001
From: "jason.wall" <jason@walljm.com>
Date: Tue, 31 Jan 2017 14:16:51 -0500
Subject: [PATCH] FIX: bug fixes

 * fixed bug in strongs modal where item crossrefs is sometimes null (not all
        strongs numbers relate to a word used in the bible, some are just roots
        of words used in the bible)
 * fixed bug in links.  forgot to update event reference to ui update function
        when i changed it.
---
 .../platforms/android/res/xml/config.xml      | 19 +++++++++++++++++++
 .../strongs-modal/strongs-modal.html          | 16 +++++++++-------
 .../components/strongs-modal/strongs-modal.ts |  8 +++++---
 .../src/components/strongs/strongs.html       |  2 +-
 DynamicBibleIonic/src/pages/search/search.ts  |  3 +++
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/DynamicBibleIonic/platforms/android/res/xml/config.xml b/DynamicBibleIonic/platforms/android/res/xml/config.xml
index 431ab00e..b5bdd268 100644
--- a/DynamicBibleIonic/platforms/android/res/xml/config.xml
+++ b/DynamicBibleIonic/platforms/android/res/xml/config.xml
@@ -1,5 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.walljm.dynamicbible" version="3.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <feature name="Keyboard">
+        <param name="android-package" value="io.ionic.keyboard.IonicKeyboard" />
+        <param name="onload" value="true" />
+    </feature>
+    <feature name="Whitelist">
+        <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
+        <param name="onload" value="true" />
+    </feature>
+    <feature name="StatusBar">
+        <param name="android-package" value="org.apache.cordova.statusbar.StatusBar" />
+        <param name="onload" value="true" />
+    </feature>
+    <feature name="Device">
+        <param name="android-package" value="org.apache.cordova.device.Device" />
+    </feature>
+    <feature name="SplashScreen">
+        <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen" />
+        <param name="onload" value="true" />
+    </feature>
     <name>Dynamic Bible</name>
     <description>A bible app designed for bible study</description>
     <author email="jason@walljm.com" href="http://dynamicbible.com/">Jason Wall</author>
diff --git a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html
index 32b7346f..fa56b1e1 100644
--- a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html
+++ b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html
@@ -28,13 +28,15 @@
             </li>
         </ul>
     </template>
-    <h2>Cross References</h2>
-    &nbsp;&nbsp;&nbsp;Translated as {{item.crossrefs.ss.length}} words 
-    <dl>
-        <dd *ngFor="let wrd of item.crossrefs.ss">
-            <strong>{{wrd.w}}:</strong> <span *ngFor="let p of wrd.rs"><a (click)="openPassage(p.r)">{{makePassage(p.r)}}</a>, </span>
-        </dd>
-    </dl>
+    <div class="strongs-cross" *ngIf="item.crossrefs != null && item.crossrefs.ss != null">
+        <h2>Cross References</h2>
+        &nbsp;&nbsp;&nbsp;Translated as {{item.crossrefs.ss.length}} words 
+        <dl>
+            <dd *ngFor="let wrd of item.crossrefs.ss">
+                <strong>{{wrd.w}}:</strong> <span *ngFor="let p of wrd.rs"><a (click)="openPassage(p.r)">{{makePassage(p.r)}}</a>, </span>
+            </dd>
+        </dl>
+    </div>
 </ion-content>
  <ion-content *ngIf="item !== undefined && item.status === -1">
     <error-message [msg]="item.msg"></error-message>
diff --git a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts
index 7979b16b..1b7e5a36 100644
--- a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts
+++ b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts
@@ -25,9 +25,11 @@ export class StrongsModal implements OnInit
     {
         this.sn = this.params.get('sn') as number;
         this.dict = this.params.get('dict') as string;
-        this.onItemClicked.subscribe(item =>
-            this.params.get('onItemClicked').getItems(item)
-        )
+        this.onItemClicked.subscribe(item =>
+        {
+            let pg = this.params.get('onItemClicked');
+            pg.updateUIwithItems(item, false)
+        });
     }
 
     ngOnInit(): void
diff --git a/DynamicBibleIonic/src/components/strongs/strongs.html b/DynamicBibleIonic/src/components/strongs/strongs.html
index 64613362..4718ddcf 100644
--- a/DynamicBibleIonic/src/components/strongs/strongs.html
+++ b/DynamicBibleIonic/src/components/strongs/strongs.html
@@ -24,7 +24,7 @@
             </ul>
         </template>
     </div>
-    <div class="strongs-cross">
+    <div class="strongs-cross" *ngIf="data.crossrefs != null && data.crossrefs.ss != null">
         <h2>Cross References</h2>
         &nbsp;&nbsp;&nbsp;Translated as {{data.crossrefs.ss.length}} words 
         <ion-scroll scrollY="true">
diff --git a/DynamicBibleIonic/src/pages/search/search.ts b/DynamicBibleIonic/src/pages/search/search.ts
index feb6d7f0..f884a69b 100644
--- a/DynamicBibleIonic/src/pages/search/search.ts
+++ b/DynamicBibleIonic/src/pages/search/search.ts
@@ -99,10 +99,13 @@ export class SearchPage implements OnInit
                 }
             }
         }
+
         // initialize the pages.
         this.pagesService.initializePages(u.user.saved_pages);
+
         if (this.params.data.queries !== undefined)
             this.userProfile.user.items = this.params.data.queries.slice();
+
         if (this.params.data.title === undefined)
             this.title = "Search";
         else