diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.accordion.js | 5 | ||||
| -rw-r--r-- | ui/jquery.ui.position.js | 4 | ||||
| -rw-r--r-- | ui/jquery.ui.slider.js | 22 |
3 files changed, 13 insertions, 18 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index d1a7abd6d..bce78231b 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -74,11 +74,6 @@ $.widget("ui.accordion", { //Append icon elements this._createIcons(); - // IE7-/Win - Extra vertical space in lists fixed - if ($.browser.msie) { - this.element.find('a').css('zoom', '1'); - } - this.resize(); //ARIA diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index f01640e18..11f8baa06 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -113,6 +113,10 @@ $.fn.position = function( options ) { position.top -= elemHeight / 2; } + // prevent fractions (see #5280) + position.left = parseInt( position.left ); + position.top = parseInt( position.top ); + $.each( [ "left", "top" ], function( i, dir ) { if ( $.ui.position[ collision[i] ] ) { $.ui.position[ collision[i] ][ dir ]( position, { diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index c392facd7..185fe809c 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -152,7 +152,7 @@ $.widget("ui.slider", $.ui.mouse, { break; } - var curVal, newVal, step = self._step(); + var curVal, newVal, step = self.options.step; if (self.options.values && self.options.values.length) { curVal = newVal = self.values(index); } else { @@ -526,11 +526,6 @@ $.widget("ui.slider", $.ui.mouse, { }, - _step: function() { - var step = this.options.step; - return step; - }, - _value: function() { //internal value getter // _value() returns value trimmed by min and max @@ -564,20 +559,21 @@ $.widget("ui.slider", $.ui.mouse, { }, _trimValue: function(val) { - if (val < this._valueMin()) val = this._valueMin(); - if (val > this._valueMax()) val = this._valueMax(); - + if (val < this._valueMin()) { + return this._valueMin(); + } + if (val > this._valueMax()) { + return this._valueMax(); + } return val; }, _valueMin: function() { - var valueMin = this.options.min; - return valueMin; + return this.options.min; }, _valueMax: function() { - var valueMax = this.options.max; - return valueMax; + return this.options.max; }, _refreshValue: function() { |