r2990 commited - effects: rollback to r2950, changes will be submitted as a patch for t...

r2990 commited - effects: rollback to r2950, changes will be submitted as a patch for t...


Revision: 2990
Author: cloudream@gmail.com
Date: Mon Jul 27 01:24:41 2009
Log: effects: rollback to r2950, changes will be submitted as a patch for
trunk
http://code.google.com/p/jquery-ui/source/detail?r=2990
Modified:
/branches/dev/effects/ui/effects.core.js
=======================================
--- /branches/dev/effects/ui/effects.core.js    Sun Jul 26 08:16:51 2009
+++ /branches/dev/effects/ui/effects.core.js    Mon Jul 27 01:24:41 2009
@@ -370,23 +370,8 @@
    removeClass: function(classNames,speed,easing,callback) {
        return speed ? $.effects.animateClass.apply(this, [{ remove: classNames
},speed,easing,callback]) : this._removeClass(classNames);
    },
-    toggleClass: function(classNames,force,speed,easing,callback) {
-        if ( typeof force == "boolean" || force === undefined ) {
-            if ( !speed ) {
-                // $().toggleClass(classNames, switch);
-                return this._toggleClass(classNames, force);
-            } else {
-                //$().toggleClass(classNames, switch, speed[, easing, callback]);
-                if ( force ) {
-                    return $.effects.animateClass.apply(this, [{ add: classNames
},speed,easing,callback]);
-                } else {
-                    return $.effects.animateClass.apply(this, [{ remove: classNames
},speed,easing,callback]);
-                }
-            }
-        } else {
-            // $().toggleClass(classNames, speed[, easing, callback]);
-            return $.effects.animateClass.apply(this, [{ toggle: classNames
},force,speed,easing]);
-        }
+    toggleClass: function(classNames,speed,easing,callback) {
+        return ( (typeof speed !== "boolean") && speed ) ?
$.effects.animateClass.apply(this, [{ toggle: classNames
},speed,easing,callback]) : this._toggleClass(classNames, speed);
    },
    morph: function(remove,add,speed,easing,callback) {
        return $.effects.animateClass.apply(this, [{ add: add, remove: remove
},speed,easing,callback]);