r2540 - spinner: fixed IE6 issues and added support for inline spinners in IE.
Author: pazu2k@gmail.com
Date: Wed May 13 00:07:32 2009
New Revision: 2540
Modified:
branches/dev/spinner/themes/base/ui.spinner.css
branches/dev/spinner/ui/ui.spinner.js
Log:
spinner: fixed IE6 issues and added support for inline spinners in IE.
Modified: branches/dev/spinner/themes/base/ui.spinner.css
==============================================================================
--- branches/dev/spinner/themes/base/ui.spinner.css (original)
+++ branches/dev/spinner/themes/base/ui.spinner.css Wed May 13 00:07:32 2009
@@ -1,9 +1,9 @@
/* Spinner
----------------------------------*/
-.ui-spinner { position:relative; display: inline-block; overflow: hidden;
padding: 0; margin: .4em 0; vertical-align: middle; }
-.ui-spinner-box { width: 95%; height: 100%; float: left; border: none;
background: none; padding: 0; margin: .2em .4em; }
-.ui-spinner-up, .ui-spinner-down { width: 22px; height: 50%;
font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center;
vertical-align: middle; position: absolute; right: 0; cursor: default; }
+.ui-spinner { position:relative; display: inline-block; overflow: hidden;
padding: 0; vertical-align: middle; height: 1.8em; }
+.ui-spinner-box { float: left; border: none; background: none; padding: 0;
margin: .2em 22px .2em .4em; vertical-align: middle; }
+.ui-spinner-up, .ui-spinner-down { width: 22px; height: 50%;
font-size: .5em; padding: 0; margin: 0; z-index: 100; text-align: center;
vertical-align: middle; position: absolute; right: 0; cursor: default;
display: block; }
.ui-spinner-down { bottom: 0; border-bottom: 0; }
.ui-spinner .ui-icon { margin: -50% auto; }
-.ui-spinner-list, .ui-spinner-listitem { margin: 0; padding: 0; display:
block; }
-.ui-spinner-list { padding: .4em; }
+.ui-spinner-list, .ui-spinner-listitem { display: block; }
+.ui-spinner-list { margin: 0; padding: .4em; height: 1.8em; }
\ No newline at end of file
Modified: branches/dev/spinner/ui/ui.spinner.js
==============================================================================
--- branches/dev/spinner/ui/ui.spinner.js (original)
+++ branches/dev/spinner/ui/ui.spinner.js Wed May 13 00:07:32 2009
@@ -35,16 +35,19 @@
var self = this;
this.element
.addClass('ui-spinner-box')
- .attr('autocomplete', 'off'); // switch off autocomplete in opera
+ .attr('autocomplete', 'off') // switch off autocomplete in opera
+ .width(this.options.width);
this._setValue( isNaN(this._getValue()) ? this.options.start :
this._getValue() );
-
+
this.element
.wrap('<div>')
.parent()
.addClass('ui-spinner ui-widget ui-widget-content ui-corner-all')
- .width(this.options.width)
- .height(this.options.height)
+ // check for IE
+ .css({
+ display: !$.support.opacity &&
$(this).css('display', 'inline-block') ? 'inline' : false
+ })
.append('<button class="ui-spinner-up ui-state-default ui-corner-tr"
type="button"><span class="ui-icon
ui-icon-triangle-1-n">▲</span></button>')
.find('.ui-spinner-up')
.bind('mouseover', function(event) {
@@ -419,8 +422,7 @@
items: null,
max: null,
min: null,
- width: false,
- height: false
+ width: 'auto'
},
format: {
currency: function(num, sym, group, pt) {