Effects: Allow 'null' for options - Fixes #8670 - null reference when using effects...

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 9b4787a575047299641d714030b55908046e67b9..c4e5c24f92fd7707cbf3b503e037a4006c0bd3ed 100644 (file)
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -31,6 +31,17 @@ test( "Immediate Return Conditions", function() {
        equal( ++count, 3, "Both Functions worked properly" );
 });
 
+asyncTest( "Parse of null for options", function() {
+       var hidden = $( "div.hidden" ),
+               count = 0;
+       expect( 1 );
+       hidden.show( "blind", null, 1, function() {
+               equal( ++count, 1, "null for options still works" );
+               start();
+       });
+});
+
+
 /* TODO: Disabled - Can't figure out why this is failing in IE 6/7
 test( "createWrapper and removeWrapper retain focused elements (#7595)", function() {
        expect( 2 );

diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
index 65108e7ba4e6493e82e9e2b363545899e35884f6..3fb428c1a1c3f8dc6e64529f964fe45f04f403ab 100644 (file)
--- a/ui/jquery.ui.effect.js
+++ b/ui/jquery.ui.effect.js
@@ -1054,8 +1054,8 @@ function _normalizeArguments( effect, options, speed, callback ) {
        // convert to an object
        effect = { effect: effect };
 
-       // catch (effect)
-       if ( options === undefined ) {
+       // catch (effect, null, ...)
+       if ( options == null ) {
                options = {};
        }