[open-ils-commits] [GIT] Evergreen ILS branch master updated. 314b1a5dcb13a67cf146ea8b4c9c9722c57ce78b

[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, master has been updated
       via  314b1a5dcb13a67cf146ea8b4c9c9722c57ce78b (commit)
      from  64bdb45d4ca0047f8573fd0f7f643a0df7c5a706 (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 314b1a5dcb13a67cf146ea8b4c9c9722c57ce78b
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.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/js/dojo/fieldmapper/IDL.js b/Open-ILS/web/js/dojo/fieldmapper/IDL.js
index 8ccdca5..46f0241 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/IDL.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/IDL.js
@@ -31,7 +31,10 @@ if(!dojo._hasResource["fieldmapper.IDL"]) {
                 window._preload_fieldmapper_IDL = null;
             }
 
-            if(!fieldmapper.IDL.fmclasses || !fieldmapper.IDL.fmclasses.length || (classlist && classlist.length)) {
+            if(!fieldmapper.IDL.fmclasses || 
+                    !Object.keys(fieldmapper.IDL.fmclasses).length || 
+                    (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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS