diff options
| -rw-r--r-- | tests/visual/spinner.html | 12 | ||||
| -rw-r--r-- | ui/ui.spinner.js | 28 |
2 files changed, 19 insertions, 21 deletions
diff --git a/tests/visual/spinner.html b/tests/visual/spinner.html index af8d8a8ad..9a1478ea5 100644 --- a/tests/visual/spinner.html +++ b/tests/visual/spinner.html @@ -10,7 +10,7 @@ <script type="text/javascript">
$(function(){
-
+
var opts = {
's1': {},
's2': {stepping: 0.25},
@@ -31,6 +31,7 @@ $(function(){ </script>
<style type="text/css">
+
body
{
background: #fff;
@@ -96,13 +97,7 @@ label { background: #FEFEFE;
}
-.ui-spinner-list {
- height: 1.2em;
- line-height: 1.2em;
- margin: 0;
- padding: 0;
-}
-
+.ui-spinner-list,
.ui-spinner-listitem {
margin: 0;
padding: 0;
@@ -186,6 +181,5 @@ label { <hr />
-
</body>
</html>
\ No newline at end of file diff --git a/ui/ui.spinner.js b/ui/ui.spinner.js index 2abba1495..b3453a64a 100644 --- a/ui/ui.spinner.js +++ b/ui/ui.spinner.js @@ -24,15 +24,6 @@ $.widget('ui.spinner', { this._decimals = s.slice(s.indexOf('.')+1, s.length).length;
}
- // data list: set contraints to object length and step size
- if (this.element.children().length > 1) {
- this.element.addClass('ui-spinner-list');
- $('>*', this.element).addClass('ui-spinner-listitem');
- this.options.stepping = 1;
- this.options.min = 0;
- this.options.max = $('>*', this.element).length-1;
- }
-
//Initialize needed constants
var self = this;
this.element
@@ -122,9 +113,22 @@ $.widget('ui.spinner', { })
.end();
- // data list: fix height of data list spinner
- if (this.element.hasClass('ui-spinner-list')) {
- this.element.parent().css('height', this.element.outerHeight());
+ // DataList: Set contraints for object length and step size.
+ // Manipulate height of spinner.
+ this._items = this.element.children().length;
+ if (this._items > 1) {
+ this.element
+ .addClass('ui-spinner-list')
+ .css('height', this.element.outerHeight()/this._items)
+ .children()
+ .addClass('ui-spinner-listitem')
+ .end()
+ .parent()
+ .css('height', this.element.outerHeight())
+ .end();
+ this.options.stepping = 1;
+ this.options.min = 0;
+ this.options.max = this._items-1;
}
this.element
|