rollback fix + changed default jquery file to load as it seems to hotfix the jquery-ui/lab.js bug
authordurandn
Thu, 24 Sep 2015 15:51:32 +0200
changeset 1065 77658c018e83
parent 1064 b9c816d95ab0
child 1066 5ef7182907c5
rollback fix + changed default jquery file to load as it seems to hotfix the jquery-ui/lab.js bug
src/js/widgets-container/metadataplayer.js
--- a/src/js/widgets-container/metadataplayer.js	Thu Sep 24 12:25:47 2015 +0200
+++ b/src/js/widgets-container/metadataplayer.js	Thu Sep 24 15:51:32 2015 +0200
@@ -61,20 +61,7 @@
         $L.queueScript(ns.getLib("json"));
     }
     
-    $L.queueWait(function(){
-        if (typeof ns.jQuery === "undefined" && typeof window.jQuery !== "undefined") {
-            ns.jQuery = window.jQuery;
-            if (former$ || formerJQuery) {
-                window.jQuery.noConflict(formerJQuery);
-            }
-        }
-        if (typeof ns._ === "undefined" && typeof window._ !== "undefined") {
-            ns._ = window._;
-            if (formerUnderscore) {
-                _.noConflict();
-            }
-        }
-    }).queueScript(ns.getLib("jQueryUI")).queueWait();
+    $L.queueWait().queueScript(ns.getLib("jQueryUI")).queueWait();
 
     /* widget specific requirements */
     for(var _i = 0; _i < this.config.widgets.length; _i++) {
@@ -97,6 +84,20 @@
 
 Metadataplayer.prototype.onLibsLoaded = function() {
     ns.log("IriSP.Metadataplayer.prototype.onLibsLoaded");
+
+    if (typeof ns.jQuery === "undefined" && typeof window.jQuery !== "undefined") {
+        ns.jQuery = window.jQuery;
+        if (former$ || formerJQuery) {
+            window.jQuery.noConflict(formerJQuery);
+        }
+    }
+    if (typeof ns._ === "undefined" && typeof window._ !== "undefined") {
+        ns._ = window._;
+        if (formerUnderscore) {
+            _.noConflict();
+        }
+    }
+    
     ns.loadCss(ns.getLib("cssjQueryUI"));
     ns.loadCss(this.config.css);