# HG changeset patch # User durandn # Date 1443088470 -7200 # Node ID e9765601184d6e9883441481eea3d7d42c00b412 # Parent f8adaa2caecb2a8ba06cdfc9348fa931e768ad6a Try for a fix for JqueryUI/Lab.js bug diff -r f8adaa2caecb -r e9765601184d src/js/widgets-container/metadataplayer.js --- a/src/js/widgets-container/metadataplayer.js Tue Sep 22 17:07:58 2015 +0200 +++ b/src/js/widgets-container/metadataplayer.js Thu Sep 24 11:54:30 2015 +0200 @@ -61,7 +61,20 @@ $L.queueScript(ns.getLib("json")); } - $L.queueWait().queueScript(ns.getLib("jQueryUI")).queueWait(); + $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(); /* widget specific requirements */ for(var _i = 0; _i < this.config.widgets.length; _i++) { @@ -84,18 +97,6 @@ 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);