r2067 - trunk/ui

r2067 - trunk/ui


Author: scott.gonzalez
Date: Thu Feb 12 18:25:21 2009
New Revision: 2067
Modified:
trunk/ui/effects.core.js
trunk/ui/ui.core.js
Log:
Prevent loading core files multiple times. Fixes #4130 - Too much recurson
with double include.
Modified: trunk/ui/effects.core.js
==============================================================================
--- trunk/ui/effects.core.js    (original)
+++ trunk/ui/effects.core.js    Thu Feb 12 18:25:21 2009
@@ -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 @@
        });
    }
-});
+};
function _normalizeArguments(a, m) {
Modified: trunk/ui/ui.core.js
==============================================================================
--- trunk/ui/ui.core.js    (original)
+++ trunk/ui/ui.core.js    Thu Feb 12 18:25:21 2009
@@ -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);