diff options
| author | Ca-Phun Ung <pazu2k@gmail.com> | 2008-09-26 07:21:56 +0000 |
|---|---|---|
| committer | Ca-Phun Ung <pazu2k@gmail.com> | 2008-09-26 07:21:56 +0000 |
| commit | 24afc68d5b4e2cca792980d41cef6f0a1e0fcdda (patch) | |
| tree | a75b62da1d19a55d790f86772766273652a7ba03 | |
| parent | b920e5893a082d0445251c3832e1a40be73e7abf (diff) | |
| download | jquery-ui-24afc68d5b4e2cca792980d41cef6f0a1e0fcdda.tar.gz jquery-ui-24afc68d5b4e2cca792980d41cef6f0a1e0fcdda.zip | |
Spinner: added a timer to mousewheel interaction which fires a change event when the mousewheel stops spinning.
Added a few missing options to test case.
| -rw-r--r-- | tests/spinner.js | 6 | ||||
| -rw-r--r-- | tests/visual/spinner.html | 1 | ||||
| -rw-r--r-- | ui/ui.spinner.js | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/tests/spinner.js b/tests/spinner.js index 533034a95..507d2c897 100644 --- a/tests/spinner.js +++ b/tests/spinner.js @@ -56,7 +56,7 @@ test("enable", function() { }); test("defaults", function() { - expect(7); + expect(10); el = $("#spin").spinner(); equals(el.data("currency.spinner"), false, "currency"); @@ -66,6 +66,9 @@ test("defaults", function() { equals(el.data("min.spinner"), undefined, "min"); equals(el.data("start.spinner"), 0, "start"); equals(el.data("stepping.spinner"), 1, "stepping"); + equals(el.data("decimals.spinner"), 0, "decimals"); + equals(el.data("format.spinner"), '%', "format"); + equals(el.data("items.spinner"), false, "items"); }); @@ -261,7 +264,6 @@ test("mouse click on buttons", function() { equals(el.val(), 0, "mouse double click to down"); - }); test("callback", function() { diff --git a/tests/visual/spinner.html b/tests/visual/spinner.html index 438ce110e..18b8f4611 100644 --- a/tests/visual/spinner.html +++ b/tests/visual/spinner.html @@ -6,6 +6,7 @@ <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.spinner.js"></script> +<script type="text/javascript" src="../../jquery.mousewheel.js"></script> <script type="text/javascript"> diff --git a/ui/ui.spinner.js b/ui/ui.spinner.js index cbce210e8..8d81716d1 100644 --- a/ui/ui.spinner.js +++ b/ui/ui.spinner.js @@ -263,8 +263,14 @@ $.widget('ui.spinner', { (/[0-9\-\.]/).test(String.fromCharCode(e.keyCode))) ? true : false; }, _mousewheel: function(e, delta) { + var self = this; delta = ($.browser.opera ? -delta / Math.abs(delta) : delta); - (delta > 0 ? this._up(e) : this._down(e)); + (delta > 0 ? self._up(e) : self._down(e)); + if (self.timeout) { + window.clearTimeout(self.timeout); + self.timeout = 0; + } + self.timeout = window.setTimeout(function(){self._propagate('change', e)}, 500); e.preventDefault(); }, _getValue: function() { |