diff options
author | jzaefferer <joern.zaefferer@gmail.com> | 2011-02-26 12:10:52 +0100 |
---|---|---|
committer | jzaefferer <joern.zaefferer@gmail.com> | 2011-02-26 12:10:52 +0100 |
commit | 48f060ac25a805f8070a3ec5daf8be8e56d2b60b (patch) | |
tree | 86ccf253f330578a0f4b639b0827a5a4af8b9706 | |
parent | 9ac6bde8a91f5f41c30fceeee6b98f9ca4bb8a91 (diff) | |
download | jquery-ui-48f060ac25a805f8070a3ec5daf8be8e56d2b60b.tar.gz jquery-ui-48f060ac25a805f8070a3ec5daf8be8e56d2b60b.zip |
Spinner: Ignore delta of 0 from triggered mousewheel event. Verified
that mousewheel scrolling actually works fine in IE6.
-rw-r--r-- | tests/unit/spinner/spinner_core.js | 5 | ||||
-rw-r--r-- | ui/jquery.ui.spinner.js | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js index df2243adc..19bdb3495 100644 --- a/tests/unit/spinner/spinner_core.js +++ b/tests/unit/spinner/spinner_core.js @@ -120,14 +120,15 @@ test("mouse click on buttons", function() { });
test("mouse wheel on input", function() {
- expect(3);
+ expect(4);
+ stop();
var el = $("#spin").spinner();
+ equal(el.val(), 0);
el.trigger("mousewheel", 1);
equal(el.val(), 1);
// mousewheel handler uses a timeout, need to accomodate that
- stop();
setTimeout(function() {
el.trigger("mousewheel", -1);
equal(el.val(), 0);
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 9dd0afe9b..ae7583eec 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -181,12 +181,13 @@ $.widget('ui.spinner', { } var self = this; this.element.bind("mousewheel.spinner", function(event, delta) { - if (self.options.disabled) { + if (self.options.disabled || !delta) { return; } if (!self.spinning && !self._start(event)) { return false; } + $("<div>").text("delta: " + delta).appendTo(document.body) self._spin((delta > 0 ? 1 : -1) * self.options.step, event); clearTimeout(self.timeout); self.timeout = setTimeout(function() { |