Skip to content

Commit

Permalink
Slider: Fixed min and max range sliders to add ui-slider-range-min or…
Browse files Browse the repository at this point in the history
… ui-slider-range-max class and not set corresponding left/right/top/bottom inline, only width/height

(fixes #4182 - slider min/max classes aren't being added to range div)
(fixes #3850 - Slider Range With Fixed Max Demo Bug in Opera)
  • Loading branch information
rdworth committed Feb 21, 2009
1 parent bf43ab6 commit 3342fb8
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions ui/ui.slider.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {


this.range this.range
.appendTo(this.element) .appendTo(this.element)
.addClass("ui-slider-range" .addClass("ui-slider-range");
+ " ui-widget-header");


(o.range == "min") && (this.orientation == "horizontal") && this.range.css({ left : 0 }); if (o.range == "min" || o.range == "max") {
(o.range == "max") && (this.orientation == "horizontal") && this.range.css({ right : 0 }); this.range.addClass("ui-slider-range-" + o.range);
(o.range == "min") && (this.orientation == "vertical") && this.range.css({ bottom : 0 }); }
(o.range == "max") && (this.orientation == "vertical") && this.range.css({ top : 0 });
// note: this isn't the most fittingly semantic framework class for this element,
// but worked best visually with a variety of themes
this.range.addClass("ui-widget-header");


} }


Expand Down Expand Up @@ -464,10 +466,10 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
var _set = {}; _set[self.orientation == 'horizontal' ? 'left' : 'bottom'] = valPercent + '%'; var _set = {}; _set[self.orientation == 'horizontal' ? 'left' : 'bottom'] = valPercent + '%';
this.handle.stop(1,1)[animate ? 'animate' : 'css'](_set, o.animate); this.handle.stop(1,1)[animate ? 'animate' : 'css'](_set, o.animate);


(oRange == "min") && (this.orientation == "horizontal") && this.range.stop(1,1)[animate ? 'animate' : 'css']({ left: 0, width: valPercent + '%' }, o.animate); (oRange == "min") && (this.orientation == "horizontal") && this.range.stop(1,1)[animate ? 'animate' : 'css']({ width: valPercent + '%' }, o.animate);
(oRange == "max") && (this.orientation == "horizontal") && this.range[animate ? 'animate' : 'css']({ left: valPercent + '%', width: (100 - valPercent) + '%' }, { queue: false, duration: o.animate }); (oRange == "max") && (this.orientation == "horizontal") && this.range[animate ? 'animate' : 'css']({ width: (100 - valPercent) + '%' }, { queue: false, duration: o.animate });
(oRange == "min") && (this.orientation == "vertical") && this.range.stop(1,1)[animate ? 'animate' : 'css']({ top: (100 - valPercent) + '%', height: valPercent + '%' }, o.animate); (oRange == "min") && (this.orientation == "vertical") && this.range.stop(1,1)[animate ? 'animate' : 'css']({ height: valPercent + '%' }, o.animate);
(oRange == "max") && (this.orientation == "vertical") && this.range[animate ? 'animate' : 'css']({ bottom: valPercent + '%', height: (100 - valPercent) + '%' }, { queue: false, duration: o.animate }); (oRange == "max") && (this.orientation == "vertical") && this.range[animate ? 'animate' : 'css']({ height: (100 - valPercent) + '%' }, { queue: false, duration: o.animate });
} }


}, },
Expand Down

0 comments on commit 3342fb8

Please sign in to comment.