From 60e315f6b891d2f06641890b0cbcc955e9b18fe3 Mon Sep 17 00:00:00 2001
From: walljm <none@none>
Date: Tue, 16 Apr 2013 17:09:09 -0400
Subject: [PATCH]  - fixed localStorage errors.  - new android build

---
 Android/DynamicBible/AndroidManifest.xml  |  4 +-
 Android/DynamicBible/assets/css/bible.css |  1 +
 Android/DynamicBible/assets/js/common.js  | 48 +++++++++++++----------
 css/bible.css                             |  1 +
 js/common.js                              | 48 +++++++++++++----------
 5 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/Android/DynamicBible/AndroidManifest.xml b/Android/DynamicBible/AndroidManifest.xml
index b96479c4..eb8fb4a8 100644
--- a/Android/DynamicBible/AndroidManifest.xml
+++ b/Android/DynamicBible/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="walljm.dynamicbible"
-    android:versionCode="7"
-    android:versionName="1.3.4" >
+    android:versionCode="8"
+    android:versionName="1.3.5" >
 <supports-screens 
                   android:smallScreens="false"
                   android:normalScreens="true"
diff --git a/Android/DynamicBible/assets/css/bible.css b/Android/DynamicBible/assets/css/bible.css
index c0f67703..0e31a10c 100644
--- a/Android/DynamicBible/assets/css/bible.css
+++ b/Android/DynamicBible/assets/css/bible.css
@@ -24,6 +24,7 @@ em {font-style: normal;}
 	font-weight: bold;
 	text-align: center;
 	border: 2px solid #999;
+	min-width: 300px;
 }
 
 #searchvalue
diff --git a/Android/DynamicBible/assets/js/common.js b/Android/DynamicBible/assets/js/common.js
index c4cc0f83..5fa846de 100644
--- a/Android/DynamicBible/assets/js/common.js
+++ b/Android/DynamicBible/assets/js/common.js
@@ -121,10 +121,12 @@ var Settings = {
     Load: function() {
         if(typeof(Storage)!=="undefined")
         {
-            $("#resultwrap").css("float", localStorage.Panes);
-            $("#searchresultswrap").css("float", localStorage.Panes);
-
-            if (localStorage.Search == "none") {
+            if (localStorage.Panes !== "undefined") {
+                $("#resultwrap").css("float", localStorage.Panes);
+                $("#searchresultswrap").css("float", localStorage.Panes);
+            }
+            
+            if (localStorage.Search !== "undefined" && localStorage.Search == "none") {
                 $("#searchresultswrap").css("display", "none");
                 $("#showhidesearch").html("Show Search");
                 $("#resultwrap").css("width", "100%");
@@ -134,28 +136,33 @@ var Settings = {
                 $("#showhidesearch").html("Hide Search");
                 $("#resultwrap").css("width", "70%");
             }
-
-            $("#result").css("font-size", localStorage.FontSize);
-            $("#result").css("font-family", localStorage.Font);
-            $("#changefont").val(localStorage.Font);
             
-            if (localStorage.StrongsAsDialog == "false") {
+            if (localStorage.FontSize !== "undefined") {
+                $("#result").css("font-size", localStorage.FontSize);
+            }
+            if (localStorage.Font !== "undefined") {
+                $("#result").css("font-family", localStorage.Font);
+                $("#changefont").val(localStorage.Font);
+            }
+            if (localStorage.StrongsAsDialog !== "undefined" && localStorage.StrongsAsDialog == "false") {
                 $("#display-strongs-as-dialog")[0].checked = false;
             } else {
                 $("#display-strongs-as-dialog")[0].checked = true;
             }
             
-            $("#resultwrap").html(localStorage.Results);
-            $("#searchresultswrap").html(localStorage.SearchResults);
-            $("#resultwrap").find(".hiddenlink").click(function(e) {
-                Util.HandleHiddenLink(e);
-            });
-            $("#resultwrap").find(".removeresult").click(function(e) {
-                Util.RemoveResult(e);
-            });
-            $("#searchresultswrap").find(".link").click(function(e) {
-                Util.HandleLink(e);
-            });
+            if (localStorage.Results !== "undefined" && localStorage.SearchResults !== "undefined") {
+                $("#resultwrap").html(localStorage.Results);
+                $("#searchresultswrap").html(localStorage.SearchResults);
+                $("#resultwrap").find(".hiddenlink").click(function(e) {
+                    Util.HandleHiddenLink(e);
+                });
+                $("#resultwrap").find(".removeresult").click(function(e) {
+                    Util.RemoveResult(e);
+                });
+                $("#searchresultswrap").find(".link").click(function(e) {
+                    Util.HandleLink(e);
+                });
+            }
         }
     },
     Save: function() {
@@ -166,7 +173,6 @@ var Settings = {
             localStorage.FontSize = $("#result").css("font-size");
             localStorage.Font = $("#result").css("font-family");
             localStorage.StrongsAsDialog = $("#display-strongs-as-dialog")[0].checked;
-            localStorage.Results = $("#result").html();
         }
     },
     ShowHideSearch: function() {
diff --git a/css/bible.css b/css/bible.css
index c0f67703..0e31a10c 100644
--- a/css/bible.css
+++ b/css/bible.css
@@ -24,6 +24,7 @@ em {font-style: normal;}
 	font-weight: bold;
 	text-align: center;
 	border: 2px solid #999;
+	min-width: 300px;
 }
 
 #searchvalue
diff --git a/js/common.js b/js/common.js
index c4cc0f83..5fa846de 100644
--- a/js/common.js
+++ b/js/common.js
@@ -121,10 +121,12 @@ var Settings = {
     Load: function() {
         if(typeof(Storage)!=="undefined")
         {
-            $("#resultwrap").css("float", localStorage.Panes);
-            $("#searchresultswrap").css("float", localStorage.Panes);
-
-            if (localStorage.Search == "none") {
+            if (localStorage.Panes !== "undefined") {
+                $("#resultwrap").css("float", localStorage.Panes);
+                $("#searchresultswrap").css("float", localStorage.Panes);
+            }
+            
+            if (localStorage.Search !== "undefined" && localStorage.Search == "none") {
                 $("#searchresultswrap").css("display", "none");
                 $("#showhidesearch").html("Show Search");
                 $("#resultwrap").css("width", "100%");
@@ -134,28 +136,33 @@ var Settings = {
                 $("#showhidesearch").html("Hide Search");
                 $("#resultwrap").css("width", "70%");
             }
-
-            $("#result").css("font-size", localStorage.FontSize);
-            $("#result").css("font-family", localStorage.Font);
-            $("#changefont").val(localStorage.Font);
             
-            if (localStorage.StrongsAsDialog == "false") {
+            if (localStorage.FontSize !== "undefined") {
+                $("#result").css("font-size", localStorage.FontSize);
+            }
+            if (localStorage.Font !== "undefined") {
+                $("#result").css("font-family", localStorage.Font);
+                $("#changefont").val(localStorage.Font);
+            }
+            if (localStorage.StrongsAsDialog !== "undefined" && localStorage.StrongsAsDialog == "false") {
                 $("#display-strongs-as-dialog")[0].checked = false;
             } else {
                 $("#display-strongs-as-dialog")[0].checked = true;
             }
             
-            $("#resultwrap").html(localStorage.Results);
-            $("#searchresultswrap").html(localStorage.SearchResults);
-            $("#resultwrap").find(".hiddenlink").click(function(e) {
-                Util.HandleHiddenLink(e);
-            });
-            $("#resultwrap").find(".removeresult").click(function(e) {
-                Util.RemoveResult(e);
-            });
-            $("#searchresultswrap").find(".link").click(function(e) {
-                Util.HandleLink(e);
-            });
+            if (localStorage.Results !== "undefined" && localStorage.SearchResults !== "undefined") {
+                $("#resultwrap").html(localStorage.Results);
+                $("#searchresultswrap").html(localStorage.SearchResults);
+                $("#resultwrap").find(".hiddenlink").click(function(e) {
+                    Util.HandleHiddenLink(e);
+                });
+                $("#resultwrap").find(".removeresult").click(function(e) {
+                    Util.RemoveResult(e);
+                });
+                $("#searchresultswrap").find(".link").click(function(e) {
+                    Util.HandleLink(e);
+                });
+            }
         }
     },
     Save: function() {
@@ -166,7 +173,6 @@ var Settings = {
             localStorage.FontSize = $("#result").css("font-size");
             localStorage.Font = $("#result").css("font-family");
             localStorage.StrongsAsDialog = $("#display-strongs-as-dialog")[0].checked;
-            localStorage.Results = $("#result").html();
         }
     },
     ShowHideSearch: function() {