From f7d8a1ba570fd620d65b377ebe806eac0b578328 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Fri, 22 Oct 2010 06:16:12 +0200 Subject: Porting old spinner implementation to 1.8, dropping some baggage. --- themes/base/jquery.ui.base.css | 1 + themes/base/jquery.ui.spinner.css | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 themes/base/jquery.ui.spinner.css (limited to 'themes') diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css index 7634fb61e..62d17c7e2 100644 --- a/themes/base/jquery.ui.base.css +++ b/themes/base/jquery.ui.base.css @@ -18,4 +18,5 @@ @import url("jquery.ui.resizable.css"); @import url("jquery.ui.selectable.css"); @import url("jquery.ui.slider.css"); +@import url("jquery.ui.spinner.css"); @import url("jquery.ui.tabs.css"); diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css new file mode 100644 index 000000000..6d8bfa59b --- /dev/null +++ b/themes/base/jquery.ui.spinner.css @@ -0,0 +1,24 @@ +/* Spinner +----------------------------------*/ +.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; height: 1.8em; } +.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; } +.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; } +.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; } /* more specificity required here to overide default borders */ +.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ +.ui-spinner-up { top: 0; } +.ui-spinner-down { bottom: 0; } + +/* ltr (default) */ +.ui-spinner-ltr { direction: ltr; } +.ui-spinner-ltr .ui-spinner-input { float: left; margin-left: .4em; margin-right: 22px; } +.ui-spinner-ltr .ui-spinner-button { right: 0; } +.ui-spinner-ltr a.ui-spinner-button { border-right: none; } + +/* rtl */ +.ui-spinner-rtl { direction: rtl; } +.ui-spinner-rtl .ui-spinner-input { float: right; margin-left: 22px; margin-right: .4em; } +.ui-spinner-rtl .ui-spinner-button { left: 0; } +.ui-spinner-rtl a.ui-spinner-button { border-left: none; } + +/* TR overrides */ +div.ui-spinner { background: none; } -- cgit v1.2.3 From 0e7bef4401e84a8440278662b74c5d3c96bc88b8 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Mon, 25 Oct 2010 18:10:07 +0200 Subject: Slider: Removing dir option. Implementation caused more damage then being useful - will eventually implement RTL support in all widgets. --- themes/base/jquery.ui.spinner.css | 18 +++--------------- ui/jquery.ui.spinner.js | 9 +++------ 2 files changed, 6 insertions(+), 21 deletions(-) (limited to 'themes') diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css index 6d8bfa59b..0a0a5ef6d 100644 --- a/themes/base/jquery.ui.spinner.css +++ b/themes/base/jquery.ui.spinner.css @@ -1,24 +1,12 @@ /* Spinner ----------------------------------*/ .ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; height: 1.8em; } -.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; } -.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; } -.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; } /* more specificity required here to overide default borders */ +.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; float: left; margin-left: .4em; margin-right: 22px; } +.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } +.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ .ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ .ui-spinner-up { top: 0; } .ui-spinner-down { bottom: 0; } -/* ltr (default) */ -.ui-spinner-ltr { direction: ltr; } -.ui-spinner-ltr .ui-spinner-input { float: left; margin-left: .4em; margin-right: 22px; } -.ui-spinner-ltr .ui-spinner-button { right: 0; } -.ui-spinner-ltr a.ui-spinner-button { border-right: none; } - -/* rtl */ -.ui-spinner-rtl { direction: rtl; } -.ui-spinner-rtl .ui-spinner-input { float: right; margin-left: 22px; margin-right: .4em; } -.ui-spinner-rtl .ui-spinner-button { left: 0; } -.ui-spinner-rtl a.ui-spinner-button { border-left: none; } - /* TR overrides */ div.ui-spinner { background: none; } diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 022e7f7da..4cfbe62e1 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -21,7 +21,6 @@ var hover = 'ui-state-hover', $.widget('ui.spinner', { options: { - dir: 'ltr', incremental: true, max: Number.MAX_VALUE, min: -Number.MAX_VALUE, @@ -138,13 +137,11 @@ $.widget('ui.spinner', { self.uiSpinner = uiSpinner; }, _uiSpinnerHtml: function() { - return ''; + return ''; }, _buttonHtml: function() { - return '' + - ''; + return '' + + ''; }, _start: function(event) { if (!this.spinning && this._trigger('start', event, { value: this.value()}) !== false) { -- cgit v1.2.3 From 9ef5cd02fa17e81d28e91b8a51f590148aa15949 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Tue, 30 Nov 2010 13:41:54 +0100 Subject: Spinner: Use inline-element for better inline-block support. Removed float:left from input to fix input focussing in IE6. --- themes/base/jquery.ui.spinner.css | 4 ++-- ui/jquery.ui.spinner.js | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'themes') diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css index 0a0a5ef6d..711f4c885 100644 --- a/themes/base/jquery.ui.spinner.css +++ b/themes/base/jquery.ui.spinner.css @@ -1,7 +1,7 @@ /* Spinner ----------------------------------*/ .ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; height: 1.8em; } -.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; float: left; margin-left: .4em; margin-right: 22px; } +.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } .ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } .ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ .ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ @@ -9,4 +9,4 @@ .ui-spinner-down { bottom: 0; } /* TR overrides */ -div.ui-spinner { background: none; } +span.ui-spinner { background: none; } diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 80ade7ba4..8be9bbd0c 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -70,12 +70,6 @@ $.widget('ui.spinner', { self.hovered = false; }); - // TODO: move to theme, ask FG how - // fix inline-block issues for IE. Since IE8 supports inline-block we need to exclude it. - if (!$.support.opacity && uiSpinner.css('display') == 'inline-block' && $.browser.version < 8) { - uiSpinner.css('display', 'inline'); - } - this.element .bind('keydown.spinner', function(event) { if (self.options.disabled) { @@ -206,7 +200,7 @@ $.widget('ui.spinner', { }, _uiSpinnerHtml: function() { - return ''; + return ''; }, _buttonHtml: function() { -- cgit v1.2.3 From 285c991b72f9eeaa4c79b723b8337b2ef1fa4cc9 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Tue, 30 Nov 2010 13:43:43 +0100 Subject: Spinner: Fix crlf to lf line endings. --- themes/base/jquery.ui.spinner.css | 24 +- ui/jquery.ui.spinner.js | 724 +++++++++++++++++++------------------- 2 files changed, 374 insertions(+), 374 deletions(-) (limited to 'themes') diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css index 711f4c885..77be36847 100644 --- a/themes/base/jquery.ui.spinner.css +++ b/themes/base/jquery.ui.spinner.css @@ -1,12 +1,12 @@ -/* Spinner -----------------------------------*/ -.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; height: 1.8em; } -.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } -.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } -.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ -.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ -.ui-spinner-up { top: 0; } -.ui-spinner-down { bottom: 0; } - -/* TR overrides */ -span.ui-spinner { background: none; } +/* Spinner +----------------------------------*/ +.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; height: 1.8em; } +.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } +.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } +.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ +.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ +.ui-spinner-up { top: 0; } +.ui-spinner-down { bottom: 0; } + +/* TR overrides */ +span.ui-spinner { background: none; } diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 8be9bbd0c..d9659d167 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -1,362 +1,362 @@ -/* - * jQuery UI Spinner @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Spinner - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function($) { - -// shortcut constants -var pageModifier = 10; - -$.widget('ui.spinner', { - options: { - incremental: true, - max: null, - min: null, - numberformat: null, - step: null, - value: null - }, - - _create: function() { - this._draw(); - this._markupOptions(); - this._mousewheel(); - this._aria(); - }, - - _markupOptions: function() { - var _this = this; - $.each({ - min: -Number.MAX_VALUE, - max: Number.MAX_VALUE, - step: 1 - }, function(attr, defaultValue) { - if (_this.options[attr] === null) { - var value = _this.element.attr(attr); - _this.options[attr] = typeof value == "string" && value.length > 0 ? _this._parse(value) : defaultValue; - } - }); - this.value(this.options.value !== null ? this.options.value : this.element.val() || 0); - }, - - _draw: function() { - var self = this, - options = self.options; - - var uiSpinner = this.uiSpinner = self.element - .addClass('ui-spinner-input') - .attr('autocomplete', 'off') - .wrap(self._uiSpinnerHtml()) - .parent() - // add buttons - .append(self._buttonHtml()) - // add behaviours - .hover(function() { - if (!options.disabled) { - $(this).addClass('ui-state-hover'); - } - self.hovered = true; - }, function() { - $(this).removeClass('ui-state-hover'); - self.hovered = false; - }); - - this.element - .bind('keydown.spinner', function(event) { - if (self.options.disabled) { - return; - } - if (self._start(event)) { - return self._keydown(event); - } - return true; - }) - .bind('keyup.spinner', function(event) { - if (self.options.disabled) { - return; - } - if (self.spinning) { - self._stop(event); - self._change(event); - } - }) - .bind('focus.spinner', function() { - uiSpinner.addClass('ui-state-active'); - self.focused = true; - }) - .bind('blur.spinner', function(event) { - self.value(self.element.val()); - if (!self.hovered) { - uiSpinner.removeClass('ui-state-active'); - } - self.focused = false; - }); - - // button bindings - this.buttons = uiSpinner.find('.ui-spinner-button') - .attr("tabIndex", -1) - .button() - .removeClass("ui-corner-all") - .bind('mousedown', function(event) { - if (self.options.disabled) { - return; - } - if (self._start(event) === false) { - return false; - } - self._repeat(null, $(this).hasClass('ui-spinner-up') ? 1 : -1, event); - }) - .bind('mouseup', function(event) { - if (self.options.disabled) { - return; - } - if (self.spinning) { - self._stop(event); - self._change(event); - } - }) - .bind("mouseenter", function() { - if (self.options.disabled) { - return; - } - // 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); - } - }) - .bind("mouseleave", function() { - if (self.spinning) { - self._stop(event); - self._change(event); - } - }); - - // disable spinner if element was already disabled - if (options.disabled) { - this.disable(); - } - }, - - _keydown: function(event) { - var o = this.options, - KEYS = $.ui.keyCode; - - switch (event.keyCode) { - case KEYS.UP: - this._repeat(null, 1, event); - return false; - case KEYS.DOWN: - this._repeat(null, -1, event); - return false; - case KEYS.PAGE_UP: - this._repeat(null, pageModifier, event); - return false; - case KEYS.PAGE_DOWN: - this._repeat(null, -pageModifier, event); - return false; - - case KEYS.ENTER: - this.value(this.element.val()); - } - - return true; - }, - - _mousewheel: function() { - // need the delta normalization that mousewheel plugin provides - if (!$.fn.mousewheel) { - return; - } - var self = this; - this.element.bind("mousewheel.spinner", function(event, delta) { - if (self.options.disabled) { - return; - } - if (!self.spinning && !self._start(event)) { - return false; - } - self._spin((delta > 0 ? 1 : -1) * self.options.step, event); - clearTimeout(self.timeout); - self.timeout = setTimeout(function() { - if (self.spinning) { - self._stop(event); - self._change(event); - } - }, 100); - event.preventDefault(); - }); - }, - - _uiSpinnerHtml: function() { - return ''; - }, - - _buttonHtml: function() { - return '' + - ''; - }, - - _start: function(event) { - if (!this.spinning && this._trigger('start', event) !== false) { - if (!this.counter) { - this.counter = 1; - } - this.spinning = true; - return true; - } - return false; - }, - - _repeat: function(i, steps, event) { - var self = this; - i = i || 500; - - clearTimeout(this.timer); - this.timer = setTimeout(function() { - self._repeat(40, steps, event); - }, i); - - self._spin(steps * self.options.step, event); - }, - - _spin: function(step, event) { - if (!this.counter) { - this.counter = 1; - } - - // TODO refactor, maybe figure out some non-linear math - var newVal = this.value() + step * (this.options.incremental && - this.counter > 20 - ? this.counter > 100 - ? this.counter > 200 - ? 100 - : 10 - : 2 - : 1); - - if (this._trigger('spin', event, { value: newVal }) !== false) { - this.value(newVal); - this.counter++; - } - }, - - _stop: function(event) { - this.counter = 0; - if (this.timer) { - window.clearTimeout(this.timer); - } - this.element[0].focus(); - this.spinning = false; - this._trigger('stop', event); - }, - - _change: function(event) { - this._trigger('change', event); - }, - - _setOption: function(key, value) { - if (key == 'value') { - value = this._parse(value); - if (value < this.options.min) { - value = this.options.min; - } - if (value > this.options.max) { - value = this.options.max; - } - } - if (key == 'disabled') { - if (value) { - this.element.attr("disabled", true); - this.buttons.button("disable"); - } else { - this.element.removeAttr("disabled"); - this.buttons.button("enable"); - } - } - $.Widget.prototype._setOption.call( this, key, value ); - }, - - _setOptions: function( options ) { - $.Widget.prototype._setOptions.call( this, options ); - if ( "value" in options ) { - this._format( this.options.value ); - } - this._aria(); - }, - - _aria: function() { - this.uiSpinner - .attr('aria-valuemin', this.options.min) - .attr('aria-valuemax', this.options.max) - .attr('aria-valuenow', this.options.value); - }, - - _parse: function(val) { - var input = val; - if (typeof val == 'string') { - // special case for currency formatting until Globalization handles currencies - if (this.options.numberformat == "C" && window.Globalization) { - // parseFloat should accept number format, including currency - var culture = Globalization.culture || Globalization.cultures['default']; - val = val.replace(culture.numberFormat.currency.symbol, ""); - } - val = window.Globalization && this.options.numberformat ? Globalization.parseFloat(val) : +val; - } - return isNaN(val) ? null : val; - }, - - _format: function(num) { - var num = this.options.value; - this.element.val( window.Globalization && this.options.numberformat ? Globalization.format(num, this.options.numberformat) : num ); - }, - - destroy: function() { - this.element - .removeClass('ui-spinner-input') - .removeAttr('disabled') - .removeAttr('autocomplete'); - $.Widget.prototype.destroy.call( this ); - this.uiSpinner.replaceWith(this.element); - }, - - stepUp: function(steps) { - this._spin((steps || 1) * this.options.step); - }, - - stepDown: function(steps) { - this._spin((steps || 1) * -this.options.step); - }, - - pageUp: function(pages) { - this.stepUp((pages || 1) * pageModifier); - }, - - pageDown: function(pages) { - this.stepDown((pages || 1) * pageModifier); - }, - - value: function(newVal) { - if (!arguments.length) { - return this._parse(this.element.val()); - } - this.option('value', newVal); - }, - - widget: function() { - return this.uiSpinner; - } -}); - -})(jQuery); +/* + * jQuery UI Spinner @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Spinner + * + * Depends: + * jquery.ui.core.js + * jquery.ui.widget.js + */ +(function($) { + +// shortcut constants +var pageModifier = 10; + +$.widget('ui.spinner', { + options: { + incremental: true, + max: null, + min: null, + numberformat: null, + step: null, + value: null + }, + + _create: function() { + this._draw(); + this._markupOptions(); + this._mousewheel(); + this._aria(); + }, + + _markupOptions: function() { + var _this = this; + $.each({ + min: -Number.MAX_VALUE, + max: Number.MAX_VALUE, + step: 1 + }, function(attr, defaultValue) { + if (_this.options[attr] === null) { + var value = _this.element.attr(attr); + _this.options[attr] = typeof value == "string" && value.length > 0 ? _this._parse(value) : defaultValue; + } + }); + this.value(this.options.value !== null ? this.options.value : this.element.val() || 0); + }, + + _draw: function() { + var self = this, + options = self.options; + + var uiSpinner = this.uiSpinner = self.element + .addClass('ui-spinner-input') + .attr('autocomplete', 'off') + .wrap(self._uiSpinnerHtml()) + .parent() + // add buttons + .append(self._buttonHtml()) + // add behaviours + .hover(function() { + if (!options.disabled) { + $(this).addClass('ui-state-hover'); + } + self.hovered = true; + }, function() { + $(this).removeClass('ui-state-hover'); + self.hovered = false; + }); + + this.element + .bind('keydown.spinner', function(event) { + if (self.options.disabled) { + return; + } + if (self._start(event)) { + return self._keydown(event); + } + return true; + }) + .bind('keyup.spinner', function(event) { + if (self.options.disabled) { + return; + } + if (self.spinning) { + self._stop(event); + self._change(event); + } + }) + .bind('focus.spinner', function() { + uiSpinner.addClass('ui-state-active'); + self.focused = true; + }) + .bind('blur.spinner', function(event) { + self.value(self.element.val()); + if (!self.hovered) { + uiSpinner.removeClass('ui-state-active'); + } + self.focused = false; + }); + + // button bindings + this.buttons = uiSpinner.find('.ui-spinner-button') + .attr("tabIndex", -1) + .button() + .removeClass("ui-corner-all") + .bind('mousedown', function(event) { + if (self.options.disabled) { + return; + } + if (self._start(event) === false) { + return false; + } + self._repeat(null, $(this).hasClass('ui-spinner-up') ? 1 : -1, event); + }) + .bind('mouseup', function(event) { + if (self.options.disabled) { + return; + } + if (self.spinning) { + self._stop(event); + self._change(event); + } + }) + .bind("mouseenter", function() { + if (self.options.disabled) { + return; + } + // 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); + } + }) + .bind("mouseleave", function() { + if (self.spinning) { + self._stop(event); + self._change(event); + } + }); + + // disable spinner if element was already disabled + if (options.disabled) { + this.disable(); + } + }, + + _keydown: function(event) { + var o = this.options, + KEYS = $.ui.keyCode; + + switch (event.keyCode) { + case KEYS.UP: + this._repeat(null, 1, event); + return false; + case KEYS.DOWN: + this._repeat(null, -1, event); + return false; + case KEYS.PAGE_UP: + this._repeat(null, pageModifier, event); + return false; + case KEYS.PAGE_DOWN: + this._repeat(null, -pageModifier, event); + return false; + + case KEYS.ENTER: + this.value(this.element.val()); + } + + return true; + }, + + _mousewheel: function() { + // need the delta normalization that mousewheel plugin provides + if (!$.fn.mousewheel) { + return; + } + var self = this; + this.element.bind("mousewheel.spinner", function(event, delta) { + if (self.options.disabled) { + return; + } + if (!self.spinning && !self._start(event)) { + return false; + } + self._spin((delta > 0 ? 1 : -1) * self.options.step, event); + clearTimeout(self.timeout); + self.timeout = setTimeout(function() { + if (self.spinning) { + self._stop(event); + self._change(event); + } + }, 100); + event.preventDefault(); + }); + }, + + _uiSpinnerHtml: function() { + return ''; + }, + + _buttonHtml: function() { + return '' + + ''; + }, + + _start: function(event) { + if (!this.spinning && this._trigger('start', event) !== false) { + if (!this.counter) { + this.counter = 1; + } + this.spinning = true; + return true; + } + return false; + }, + + _repeat: function(i, steps, event) { + var self = this; + i = i || 500; + + clearTimeout(this.timer); + this.timer = setTimeout(function() { + self._repeat(40, steps, event); + }, i); + + self._spin(steps * self.options.step, event); + }, + + _spin: function(step, event) { + if (!this.counter) { + this.counter = 1; + } + + // TODO refactor, maybe figure out some non-linear math + var newVal = this.value() + step * (this.options.incremental && + this.counter > 20 + ? this.counter > 100 + ? this.counter > 200 + ? 100 + : 10 + : 2 + : 1); + + if (this._trigger('spin', event, { value: newVal }) !== false) { + this.value(newVal); + this.counter++; + } + }, + + _stop: function(event) { + this.counter = 0; + if (this.timer) { + window.clearTimeout(this.timer); + } + this.element[0].focus(); + this.spinning = false; + this._trigger('stop', event); + }, + + _change: function(event) { + this._trigger('change', event); + }, + + _setOption: function(key, value) { + if (key == 'value') { + value = this._parse(value); + if (value < this.options.min) { + value = this.options.min; + } + if (value > this.options.max) { + value = this.options.max; + } + } + if (key == 'disabled') { + if (value) { + this.element.attr("disabled", true); + this.buttons.button("disable"); + } else { + this.element.removeAttr("disabled"); + this.buttons.button("enable"); + } + } + $.Widget.prototype._setOption.call( this, key, value ); + }, + + _setOptions: function( options ) { + $.Widget.prototype._setOptions.call( this, options ); + if ( "value" in options ) { + this._format( this.options.value ); + } + this._aria(); + }, + + _aria: function() { + this.uiSpinner + .attr('aria-valuemin', this.options.min) + .attr('aria-valuemax', this.options.max) + .attr('aria-valuenow', this.options.value); + }, + + _parse: function(val) { + var input = val; + if (typeof val == 'string') { + // special case for currency formatting until Globalization handles currencies + if (this.options.numberformat == "C" && window.Globalization) { + // parseFloat should accept number format, including currency + var culture = Globalization.culture || Globalization.cultures['default']; + val = val.replace(culture.numberFormat.currency.symbol, ""); + } + val = window.Globalization && this.options.numberformat ? Globalization.parseFloat(val) : +val; + } + return isNaN(val) ? null : val; + }, + + _format: function(num) { + var num = this.options.value; + this.element.val( window.Globalization && this.options.numberformat ? Globalization.format(num, this.options.numberformat) : num ); + }, + + destroy: function() { + this.element + .removeClass('ui-spinner-input') + .removeAttr('disabled') + .removeAttr('autocomplete'); + $.Widget.prototype.destroy.call( this ); + this.uiSpinner.replaceWith(this.element); + }, + + stepUp: function(steps) { + this._spin((steps || 1) * this.options.step); + }, + + stepDown: function(steps) { + this._spin((steps || 1) * -this.options.step); + }, + + pageUp: function(pages) { + this.stepUp((pages || 1) * pageModifier); + }, + + pageDown: function(pages) { + this.stepDown((pages || 1) * pageModifier); + }, + + value: function(newVal) { + if (!arguments.length) { + return this._parse(this.element.val()); + } + this.option('value', newVal); + }, + + widget: function() { + return this.uiSpinner; + } +}); + +})(jQuery); -- cgit v1.2.3 From 7a85cbe5a17d8c58e3071ba50a78c2c2a66a8bb1 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Wed, 1 Dec 2010 22:57:20 +0100 Subject: Spinner: CSS improvements - remove fixed height from wrapper; temp. override icon style to fix off-by-one positioning --- themes/base/jquery.ui.spinner.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css index 77be36847..cd195ee47 100644 --- a/themes/base/jquery.ui.spinner.css +++ b/themes/base/jquery.ui.spinner.css @@ -1,6 +1,6 @@ /* Spinner ----------------------------------*/ -.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; height: 1.8em; } +.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; } .ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } .ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center; vertical-align: middle; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } .ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ @@ -10,3 +10,7 @@ /* TR overrides */ span.ui-spinner { background: none; } +.ui-spinner .ui-icon-triangle-1-s { + /* need to fix icons sprite */ + background-position:-65px -16px; +} -- cgit v1.2.3