Changeset 5539

Timestamp:

05/09/08 16:48:33 (4 days ago)

Author:

paul.bakaus

Message:

ui-slider: fixed calculation issues (fixes #2677, #2438, #2813)

Location:

trunk/ui

Files:

• tests/automated/slider.js (modified) (2 diffs)
• ui.slider.js (modified) (7 diffs)

trunk/ui/tests/automated/slider.js

@@ -9 +9 @@
             stepping: stepping,
             startValue: start,
+            min: 0,
+            max: 1000,
             change: function(e, ui) {
                 equals(ui.value, result, "changed to " + ui.value);
@@ -45 +47 @@
 }))
 
-test("moveTo, relative positive value, above max", assertChange(1, 10, 100, function() {
-    this.slider("moveTo", "+=200");
+test("moveTo, relative positive value, above max", assertChange(1, 10, 1000, function() {
+    this.slider("moveTo", "+=2000");
 }))
 

trunk/ui/ui.slider.js

@@ -184 +184 @@
             // propagate only for distance > 0, otherwise propagation is done my drag
             this.offset = this.element.offset();
+
             this.moveTo({
                 y: this.convertValue(e.pageY - this.offset.top - this.currentHandle[0].offsetHeight/2, "y"),
@@ -206 +207 @@
         },
         getRange: function() {
-            return this.rangeElement ? this.convertValue(parseInt(this.rangeElement.css(this.options.axis == "vertical" ? "height" : "width"),10)) : null;
+            return this.rangeElement ? this.convertValue(parseInt(this.rangeElement.css(this.options.axis == "vertical" ? "height" : "width"),10), this.options.axis == "vertical" ? "y" : "x") : null;
         },
 
@@ -215 +216 @@
             if(this.handle.length == 1) this.currentHandle = this.handle;
             if(!axis) axis = this.options.axis == "vertical" ? "y" : "x";
-            
-            var value = ((parseInt($(handle != undefined && handle !== null ? this.handle[handle] || handle : this.currentHandle).css(axis == "x" ? "left" : "top"),10) / (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(handle,axis))) * this.options.realMax[axis]) + this.options.min[axis];
-            
-            var o = this.options;
-            if (o.stepping[axis]) {
-                value = Math.round(value / o.stepping[axis]) * o.stepping[axis];
-            }
-            return value;
+
+            var curHandle = $(handle != undefined && handle !== null ? this.handle[handle] || handle : this.currentHandle);
+            
+            if(curHandle.data("mouse").sliderValue) {
+                return parseInt(curHandle.data("mouse").sliderValue[axis],10);
+            } else {
+                return parseInt(((parseInt(curHandle.css(axis == "x" ? "left" : "top"),10) / (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(handle,axis))) * this.options.realMax[axis]) + this.options.min[axis],10);
+            }
+
         },
         convertValue: function(value,axis) {
@@ -263 +265 @@
 
 
-
-
-
-
         start: function(e, handle) {
         
@@ -321 +319 @@
             if(o.axis != "horizontal") this.currentHandle.css({ top: position.top });
             
+            //Store the slider's value
+            this.currentHandle.data("mouse").sliderValue = {
+                x: this.convertValue(position.left, "x"),
+                y: this.convertValue(position.top, "y")
+            };
+            
             if (this.rangeElement)
                 this.updateRange();
@@ -354 +358 @@
             if(x !== undefined && x.constructor != Number) {
                 var me = /^\-\=/.test(x), pe = /^\+\=/.test(x);
-                x = this.value(null, "x") + parseInt(x.replace(me ? '=' : '+=', ''), 10);
+                if(me || pe) {
+                    x = this.value(null, "x") + parseInt(x.replace(me ? '=' : '+=', ''), 10);
+                } else {
+                    x = isNaN(parseInt(x, 10)) ? undefined : parseInt(x, 10);
+                }
             }
             
             if(y !== undefined && y.constructor != Number) {
                 var me = /^\-\=/.test(y), pe = /^\+\=/.test(y);
-                y = this.value(null, "y") + parseInt(y.replace(me ? '=' : '+=', ''), 10);
+                if(me || pe) {
+                    y = this.value(null, "y") + parseInt(y.replace(me ? '=' : '+=', ''), 10);
+                } else {
+                    y = isNaN(parseInt(y, 10)) ? undefined : parseInt(y, 10);
+                }
             }
 
@@ -380 +392 @@
             if (this.rangeElement)
                 this.updateRange();
+                
+            //Store the slider's value
+            this.currentHandle.data("mouse").sliderValue = {
+                x: this.convertValue(x, "x"),
+                y: this.convertValue(y, "y")
+            };
             
             if (!noPropagation) {