diff options
author | jzaefferer <joern.zaefferer@gmail.com> | 2010-11-30 13:41:54 +0100 |
---|---|---|
committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-11-30 13:41:54 +0100 |
commit | 9ef5cd02fa17e81d28e91b8a51f590148aa15949 (patch) | |
tree | 8a46eee00dcc0a5c65a1e77232a35e49128188ea | |
parent | 970befceb4b782181fdca990971334a021000afb (diff) | |
download | jquery-ui-9ef5cd02fa17e81d28e91b8a51f590148aa15949.tar.gz jquery-ui-9ef5cd02fa17e81d28e91b8a51f590148aa15949.zip |
Spinner: Use inline-element for better inline-block support. Removed float:left from input to fix input focussing in IE6.
-rw-r--r-- | themes/base/jquery.ui.spinner.css | 4 | ||||
-rw-r--r-- | ui/jquery.ui.spinner.js | 8 |
2 files changed, 3 insertions, 9 deletions
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 '<div role="spinbutton" class="ui-spinner ui-state-default ui-widget ui-widget-content ui-corner-all"></div>';
+ return '<span role="spinbutton" class="ui-spinner ui-state-default ui-widget ui-widget-content ui-corner-all"></span>';
},
_buttonHtml: function() {
|