[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 7e374c3dfd65e1047eac92af1288ceff882686b7

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_2 has been updated
       via  7e374c3dfd65e1047eac92af1288ceff882686b7 (commit)
      from  71bfa4a091225ccb13892d3c2a19c2cf729dfd5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e374c3dfd65e1047eac92af1288ceff882686b7
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Mar 15 09:24:45 2013 -0400

    LP 1155611 - prevent unnecessary load of fm_IDL.xml
    
    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 at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/web/js/dojo/fieldmapper/IDL.js b/Open-ILS/web/js/dojo/fieldmapper/IDL.js
index 8ccdca5..19e148d 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/IDL.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/IDL.js
@@ -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] != '*')) {

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/dojo/fieldmapper/IDL.js |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS