diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-10-23 02:06:25 +0200 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-10-23 02:06:25 +0200 |
| commit | eebf8c31fff4653cfcbb273f7da5fa7177217dca (patch) | |
| tree | 86a101d5b225698e1ff341ac78acf58a56aceb35 /ui/jquery.ui.spinner.js | |
| parent | bc3d283d2c1547ac3d8b5aeb894b2e6290e2d3c6 (diff) | |
| download | jquery-ui-eebf8c31fff4653cfcbb273f7da5fa7177217dca.tar.gz jquery-ui-eebf8c31fff4653cfcbb273f7da5fa7177217dca.zip | |
Using button widget for the spinner buttons. Can still use some improvements, dropping custom theme stuff in favor of button styles.
Diffstat (limited to 'ui/jquery.ui.spinner.js')
| -rw-r--r-- | ui/jquery.ui.spinner.js | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 4fc77389b..f4227b8f6 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -101,16 +101,18 @@ $.widget('ui.spinner', { // button bindings
this.buttons = uiSpinner.find('.ui-spinner-button')
.attr("tabIndex", -1)
+ .button()
+ .first()
+ .removeClass("ui-corner-all")
+ .end()
+ .last()
+ .removeClass("ui-corner-all")
+ .end()
.bind('mousedown', function(event) {
if (self._start(event) === false) {
return false;
}
self._repeat(null, $(this).hasClass('ui-spinner-up') ? 1 : -1, event);
-
- if (!self.options.disabled) {
- $(this).addClass(active);
- uiSpinner.addClass(active);
- }
})
.bind('mouseup', function(event) {
if (self.counter == 1) {
@@ -120,19 +122,22 @@ $.widget('ui.spinner', { self._stop(event);
self._change(event);
}
- $(this).removeClass(active);
})
- .hover(function() {
- if (!self.options.disabled) {
- $(this).addClass(hover);
+ .bind("mouseenter", function() {
+ // button will add ui-state-active if mouse was down while mouseleave and kept down
+ if ($(this).hasClass("ui-state-active")) {
+ if (self._start(event) === false) {
+ return false;
+ }
+ self._repeat(null, $(this).hasClass('ui-spinner-up') ? 1 : -1, event);
}
- }, function(event) {
- $(this).removeClass(active + ' ' + hover);
+ })
+ .bind("mouseleave", function() {
if (self.timer && self.spinning) {
self._stop(event);
self._change(event);
}
- });
+ })
self.uiSpinner = uiSpinner;
},
@@ -143,9 +148,9 @@ $.widget('ui.spinner', { '"></div>';
},
_buttonHtml: function() {
- return '<a class="ui-spinner-button ui-spinner-up ui-state-default ui-corner-t' + this.options.dir.substr(-1,1) +
+ return '<a class="ui-spinner-button ui-spinner-up ui-corner-t' + this.options.dir.substr(-1,1) +
'"><span class="ui-icon ui-icon-triangle-1-n">▲</span></a>' +
- '<a class="ui-spinner-button ui-spinner-down ui-state-default ui-corner-b' + this.options.dir.substr(-1,1) +
+ '<a class="ui-spinner-button ui-spinner-down ui-corner-b' + this.options.dir.substr(-1,1) +
'"><span class="ui-icon ui-icon-triangle-1-s">▼</span></a>';
},
_start: function(event) {
|