r2118 - trunk/ui

r2118 - trunk/ui


Author: rdworth
Date: Sat Feb 21 03:40:05 2009
New Revision: 2118
Modified:
trunk/ui/ui.slider.js
Log:
Slider: Fixed min and max range sliders to add ui-slider-range-min or
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)
Modified: trunk/ui/ui.slider.js
==============================================================================
--- trunk/ui/ui.slider.js    (original)
+++ trunk/ui/ui.slider.js    Sat Feb 21 03:40:05 2009
@@ -46,13 +46,15 @@
            this.range
                .appendTo(this.element)
-                .addClass("ui-slider-range"
-                    + " ui-widget-header");
+                .addClass("ui-slider-range");
-            (o.range == "min") && (this.orientation == "horizontal") &&
this.range.css({ left : 0 });
-            (o.range == "max") && (this.orientation == "horizontal") &&
this.range.css({ right : 0 });
-            (o.range == "min") && (this.orientation == "vertical") &&
this.range.css({ bottom : 0 });
-            (o.range == "max") && (this.orientation == "vertical") &&
this.range.css({ top : 0 });
+            if (o.range == "min" || o.range == "max") {
+                this.range.addClass("ui-slider-range-" + o.range);
+            }
+
+            // 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");
        }
@@ -464,10 +466,10 @@
            var _set = {}; _set[self.orientation
== 'horizontal' ? 'left' : 'bottom'] = valPercent + '%';
            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 == "max") && (this.orientation == "horizontal") &&
this.range[animate ? 'animate' : 'css']({ left: valPercent + '%', 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 == "max") && (this.orientation == "vertical") &&
this.range[animate ? 'animate' : 'css']({ bottom: valPercent + '%', height:
(100 - valPercent) + '%' }, { queue: false, duration: 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']({ width: (100 - valPercent) + '%'
}, { queue: false, duration: 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']({ height: (100 - valPercent) + '%'
}, { queue: false, duration: o.animate });
        }
    },