projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8399d37)
Acq: fix a bug that sometimes prevents the general search page from loading
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thu, 6 Oct 2011 16:06:09 +0000 (12:06 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 2 Nov 2011 20:53:45 +0000 (16:53 -0400)
Within Acquisitions General Search, javascript included from one file
in the <head> relies on the variable "localeStrings" being initialized
by javascript included from a file in <body>.  Sometimes the wrong
javascript wins the race, you get an error about localeStrings being
undefined in the Javascript console, and the page stops loading.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/web/js/ui/default/acq/common/li_table.js patch | blob | history
Open-ILS/web/js/ui/default/acq/search/unified.js patch | blob | history

diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 1178515..3733314 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -15,8 +15,10 @@ dojo.require('openils.widget.ProgressDialog');
 dojo.require('openils.PermaCrud');
 dojo.require("openils.widget.PCrudAutocompleteBox");
 
-dojo.requireLocalization('openils.acq', 'acq');
-var localeStrings = dojo.i18n.getLocalization('openils.acq', 'acq');
+if (!localeStrings) {   /* we can do this because javascript doesn't have block scope */
+    dojo.requireLocalization('openils.acq', 'acq');
+    var localeStrings = dojo.i18n.getLocalization('openils.acq', 'acq');
+}
 const XUL_OPAC_WRAPPER = 'chrome://open_ils_staff_client/content/cat/opac.xul';
 var li_exportable_attrs = ["issn", "isbn", "upc"];
 
diff --git a/Open-ILS/web/js/ui/default/acq/search/unified.js b/Open-ILS/web/js/ui/default/acq/search/unified.js
index 8ff340e..02e1d68 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/search/unified.js
+++ b/Open-ILS/web/js/ui/default/acq/search/unified.js
@@ -5,6 +5,12 @@ dojo.require("openils.widget.AutoWidget");
 dojo.require("openils.widget.XULTermLoader");
 dojo.require("openils.PermaCrud");
 
+if (!localeStrings) {   /* we can do this because javascript doesn't have block 
+                           scope */
+    dojo.requireLocalization('openils.acq', 'acq');
+    var localeStrings = dojo.i18n.getLocalization('openils.acq', 'acq');
+}
+
 var termSelectorFactory;
 var termManager;
 var resultManager;
Evergreen ILS