diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-09-12 23:47:09 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-09-12 23:47:09 +0200 |
| commit | 3a0340f4ee2d343cdebeb398da10c2a71a948a9f (patch) | |
| tree | 311426230fc3951d395ffe535b457b5acba957b0 | |
| parent | 30482cd04b1fe2d5c4c1e29b624eb44828942de4 (diff) | |
| download | jquery-ui-3a0340f4ee2d343cdebeb398da10c2a71a948a9f.tar.gz jquery-ui-3a0340f4ee2d343cdebeb398da10c2a71a948a9f.zip | |
Widget: return timer value from _delay
| -rw-r--r-- | tests/unit/widget/widget_core.js | 8 | ||||
| -rw-r--r-- | ui/jquery.ui.widget.js | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index 0b272a0d5..0510da4b4 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -1041,19 +1041,21 @@ test( "redefine", function() { }); asyncTest( "_delay", function() { - expect( 4 ); + expect( 6 ); var order = 0, that; $.widget( "ui.testWidget", { defaultElement: null, _create: function() { that = this; - this._delay(function() { + var timer = this._delay(function() { strictEqual( this, that ); equal( order, 1 ); start(); }, 500); - this._delay("callback"); + ok( timer !== undefined ); + timer = this._delay("callback"); + ok( timer !== undefined ); }, callback: function() { strictEqual( this, that ); diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 55b6eda5d..31328a455 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -339,7 +339,7 @@ $.Widget.prototype = { .apply( instance, arguments ); } var instance = this; - setTimeout( handlerProxy, delay || 0 ); + return setTimeout( handlerProxy, delay || 0 ); }, _hoverable: function( element ) { |