Prevent loading core files multiple times. Fixes #4130 - Too much recurson with...

diff --git a/ui/effects.core.js b/ui/effects.core.js
index 080339a1152d154514b4ba6dc64ec0563c4056d2..eb448e71eb70a2e33cca7db0fd2fa16a30d7fd74 100644 (file)
--- a/ui/effects.core.js
+++ b/ui/effects.core.js
@@ -7,11 +7,9 @@
  *
  * http://docs.jquery.com/UI/Effects/
  */
-;(function($) {
+;jQuery.effects || (function($) {
 
-$.effects = $.effects || {}; //Add the 'effects' scope
-
-$.extend($.effects, {
+$.effects = {
        version: "@VERSION",
 
        // Saves a set of properties in a data storage
@@ -130,7 +128,7 @@ $.extend($.effects, {
 
                });
        }
-});
+};
 
 
 function _normalizeArguments(a, m) {

diff --git a/ui/ui.core.js b/ui/ui.core.js
index beee725bca9d5bb89a9b1b26d133a2b8d80fa50c..b8ea359c868945d5ccc8691194e654cc319eeddd 100644 (file)
--- a/ui/ui.core.js
+++ b/ui/ui.core.js
@@ -7,7 +7,7 @@
  *
  * http://docs.jquery.com/UI
  */
-;(function($) {
+;jQuery.ui || (function($) {
 
 var _remove = $.fn.remove,
        isFF2 = $.browser.mozilla && (parseFloat($.browser.version) < 1.9);