src/js/init.js
branchnew-model
changeset 937 eb3c442cec50
parent 927 977a39c4ee80
child 941 1e64e46a954f
--- a/src/js/init.js	Wed Aug 29 18:32:34 2012 +0200
+++ b/src/js/init.js	Wed Aug 29 18:34:11 2012 +0200
@@ -95,7 +95,7 @@
         IriSP.jQuery = window.jQuery.noConflict();
     }
     if (typeof IriSP._ === "undefined" && typeof window._ !== "undefined") {
-        IriSP._ = window._.noConflict();
+        IriSP._ = window._;
     }
     IriSP.loadCss(IriSP.getLib("cssjQueryUI"));
     IriSP.loadCss(this.config.gui.css);