LP 1155611 - prevent unnecessary load of fm_IDL.xml
authorBill Erickson <berick@esilibrary.com>
Fri, 15 Mar 2013 13:24:45 +0000 (09:24 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 19 Mar 2013 15:15:44 +0000 (11:15 -0400)
Ensure fm_IDL.xml is loaded only when IDL2js has not been loaded.

Modified for 2.3 and before to avoid using Object.keys(), which is not
supported in all browsers, but is needed by JSPAC.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Open-ILS/web/js/dojo/fieldmapper/IDL.js

index 8ccdca5..19e148d 100644 (file)
@@ -31,7 +31,14 @@ if(!dojo._hasResource["fieldmapper.IDL"]) {
                 window._preload_fieldmapper_IDL = null;
             }
 
-            if(!fieldmapper.IDL.fmclasses || !fieldmapper.IDL.fmclasses.length || (classlist && classlist.length)) {
+            var hasclasses = false;
+            for (var x in fieldmapper.IDL.fmclasses) {
+                hasclasses = true;
+                break;
+            }
+
+            if(!fieldmapper.IDL.fmclasses || !hasclasses || (classlist && classlist.length)) {
+
                 var idl_url = this._URL_PATH;
 
                 if (classlist.length && (classlist.length > 1 || classlist[0] != '*')) {