aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2009-02-13 02:25:21 +0000
committerScott González <scott.gonzalez@gmail.com>2009-02-13 02:25:21 +0000
commit16c0c8f2594234ad970fc22112d4752c3f1e467e (patch)
tree4339a5feb96321b9847104eaba58ed0daa2ab926 /ui
parent8ba40888a5943efd64c17d6edd2dda86dd7a6ec2 (diff)
downloadjquery-ui-16c0c8f2594234ad970fc22112d4752c3f1e467e.tar.gz
jquery-ui-16c0c8f2594234ad970fc22112d4752c3f1e467e.zip
Prevent loading core files multiple times. Fixes #4130 - Too much recurson with double include.
Diffstat (limited to 'ui')
-rw-r--r--ui/effects.core.js8
-rw-r--r--ui/ui.core.js2
2 files changed, 4 insertions, 6 deletions
diff --git a/ui/effects.core.js b/ui/effects.core.js
index 080339a11..eb448e71e 100644
--- 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 beee725bc..b8ea359c8 100644
--- 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);