From a612a20f78b0e53ee406dba6827d847dee0aaa08 Mon Sep 17 00:00:00 2001 From: walljm Date: Wed, 13 Feb 2013 18:53:33 -0500 Subject: [PATCH] fixed display bug when there were more than one number. --- Android/DynamicBible/AndroidManifest.xml | 6 ++-- Android/DynamicBible/assets/js/common.js | 28 ++++++++++++------- Android/DynamicBible/bin/AndroidManifest.xml | 6 ++-- .../DynamicBibleUtility.sln.DotSettings | 3 ++ js/common.js | 28 ++++++++++++------- 5 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 DynamicBibleUtility/DynamicBibleUtility.sln.DotSettings diff --git a/Android/DynamicBible/AndroidManifest.xml b/Android/DynamicBible/AndroidManifest.xml index 788ce038..4ec3067e 100644 --- a/Android/DynamicBible/AndroidManifest.xml +++ b/Android/DynamicBible/AndroidManifest.xml @@ -1,11 +1,11 @@ + android:versionCode="4" + android:versionName="1.3.1" > diff --git a/Android/DynamicBible/assets/js/common.js b/Android/DynamicBible/assets/js/common.js index 33fbbaf6..8cb212c0 100644 --- a/Android/DynamicBible/assets/js/common.js +++ b/Android/DynamicBible/assets/js/common.js @@ -96,19 +96,27 @@ function Search(sv) dict = "grk"; } q = q.substring(1, q.length); - var results = Strongs.GetStrongs(q, dict); - - // display results. - if ($("#display-strongs-as-dialog")[0].checked) + var Ss = q.split(' '); + + var results = []; + for (var s in Ss) { - Strongs.DisplayStrongsDialog(results); - } - else - { - Strongs.DisplayStrongs(results); - + results.push(Strongs.GetStrongs(Ss[s], dict)); } + + for (var result in results) + { + // display results. + if ($("#display-strongs-as-dialog")[0].checked) + { + Strongs.DisplayStrongsDialog(results[result]); + } + else + { + Strongs.DisplayStrongs(results[result]); + } + } } // its a verse reference. diff --git a/Android/DynamicBible/bin/AndroidManifest.xml b/Android/DynamicBible/bin/AndroidManifest.xml index 788ce038..46b72a37 100644 --- a/Android/DynamicBible/bin/AndroidManifest.xml +++ b/Android/DynamicBible/bin/AndroidManifest.xml @@ -1,14 +1,14 @@ + android:versionCode="4" + android:versionName="1.3.1" > +android:anyDensity="true"/> diff --git a/DynamicBibleUtility/DynamicBibleUtility.sln.DotSettings b/DynamicBibleUtility/DynamicBibleUtility.sln.DotSettings new file mode 100644 index 00000000..11f2c267 --- /dev/null +++ b/DynamicBibleUtility/DynamicBibleUtility.sln.DotSettings @@ -0,0 +1,3 @@ + + <data><IncludeFilters /><ExcludeFilters /></data> + <data /> \ No newline at end of file diff --git a/js/common.js b/js/common.js index 33fbbaf6..8cb212c0 100644 --- a/js/common.js +++ b/js/common.js @@ -96,19 +96,27 @@ function Search(sv) dict = "grk"; } q = q.substring(1, q.length); - var results = Strongs.GetStrongs(q, dict); - - // display results. - if ($("#display-strongs-as-dialog")[0].checked) + var Ss = q.split(' '); + + var results = []; + for (var s in Ss) { - Strongs.DisplayStrongsDialog(results); - } - else - { - Strongs.DisplayStrongs(results); - + results.push(Strongs.GetStrongs(Ss[s], dict)); } + + for (var result in results) + { + // display results. + if ($("#display-strongs-as-dialog")[0].checked) + { + Strongs.DisplayStrongsDialog(results[result]); + } + else + { + Strongs.DisplayStrongs(results[result]); + } + } } // its a verse reference.