diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-06-02 14:06:54 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-06-02 14:06:54 +0200 |
| commit | afe0f72945170879571ebaf060a816b39c9871b8 (patch) | |
| tree | 8892e33dc624fe920c9d2838cac0d82b34e04882 /ui/jquery.ui.widget.js | |
| parent | cfaddbfb2a49fbd7f511d49f6404c7447469c5b0 (diff) | |
| parent | 27a4fdd8ed4fe7733ea139022c04bd7ef8033cba (diff) | |
| download | jquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.tar.gz jquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.zip | |
Merge branch 'master' into widget-factory-demo
Diffstat (limited to 'ui/jquery.ui.widget.js')
| -rw-r--r-- | ui/jquery.ui.widget.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 4167fd4e5..da52a5a9c 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -49,7 +49,7 @@ $.widget = function( name, base, prototype ) { if ( arguments.length ) { this._createWidget( options, element ); } - }, $[ namespace ][ name ] ); + }, $[ namespace ][ name ], { version: prototype.version } ); var basePrototype = new base(); // we need to make the options hash a property directly on the new instance @@ -379,7 +379,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { var hasOptions = !$.isEmptyObject( options ), effectName = options.effect || defaultEffect; options.complete = callback; - if (options.delay) { + if ( options.delay ) { element.delay( options.delay ); } if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) { |