From 7e374c3dfd65e1047eac92af1288ceff882686b7 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 15 Mar 2013 09:24:45 -0400 Subject: [PATCH] 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 Signed-off-by: Lebbeous Fogle-Weekley --- Open-ILS/web/js/dojo/fieldmapper/IDL.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/dojo/fieldmapper/IDL.js b/Open-ILS/web/js/dojo/fieldmapper/IDL.js index 8ccdca52c2..19e148d923 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] != '*')) { -- 2.11.0