diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-08-11 19:45:43 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-08-11 19:45:43 +0200 |
| commit | dd272e75689a7e105f7d852f0fc903e4f4bda245 (patch) | |
| tree | 5c097bc4ce4ab3ead310c63ac228bb1f0d3683b6 /ui/jquery.ui.effect-blind.js | |
| parent | 549b97ed6cc718087ce8b9bff3c8556ab4ca7848 (diff) | |
| parent | 30b579f598a3abdc9b0b7ad18bc76c8b5438d5ca (diff) | |
| download | jquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.tar.gz jquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.effect-blind.js')
| -rw-r--r-- | ui/jquery.ui.effect-blind.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.effect-blind.js b/ui/jquery.ui.effect-blind.js index 7cc353525..c4ff12fdc 100644 --- a/ui/jquery.ui.effect-blind.js +++ b/ui/jquery.ui.effect-blind.js @@ -3,7 +3,7 @@ * http://jqueryui.com * * Copyright 2012 jQuery Foundation and other contributors - * Dual licensed under the MIT or GPL Version 2 licenses. + * Released under the MIT license. * http://jquery.org/license * * http://docs.jquery.com/UI/Effects/Blind @@ -42,7 +42,7 @@ $.effects.effect.blind = function( o, done ) { }); distance = wrapper[ ref ](); - margin = parseFloat( wrapper.css( ref2 ) ); + margin = parseFloat( wrapper.css( ref2 ) ) || 0; animation[ ref ] = show ? distance : 0; if ( !motion ) { @@ -51,7 +51,7 @@ $.effects.effect.blind = function( o, done ) { .css( vertical ? "top" : "left", "auto" ) .css({ position: "absolute" }); - animation[ ref2 ] = show ? margin : distance + margin; + animation[ ref2 ] = show ? margin : distance + margin; } // start at 0 if we are showing |