Changeset 4897

Timestamp:

03/14/08 11:20:46 (9 months ago)

Author:

joern.zaefferer

Message:

ui.slider: Added testsuite and a first bunch of tests; fixes for #2496, #2053, #2500

Location:

trunk/ui

Files:

• tests/slider_test.html (added)
• tests/slider_test.js (added)
• ui.slider.js (modified) (6 diffs)

trunk/ui/ui.slider.js

@@ -33 +33 @@
             axis: o.axis || (element.offsetWidth < element.offsetHeight ? 'vertical' : 'horizontal'),
             maxValue: !isNaN(parseInt(o.maxValue,10)) ? parseInt(o.maxValue,10) :  100,
-            minValue: parseInt(o.minValue,10) || 0,
-            startValue: parseInt(o.startValue,10) || 'none'     
+            minValue: parseInt(o.minValue,10) || 0
         });
         
@@ -73 +72 @@
                 .bind('blur', function(e) { self.blur(this.firstChild); })
                 .bind('keydown', function(e) {
-                    if(/(37|39)/.test(e.keyCode))
+                    if(/(37|39)/.test(e.keyCode)) {
                         self.moveTo((e.keyCode == 37 ? '-' : '+')+'='+(self.options.stepping ? self.options.stepping : (self.options.realMaxValue / self.size)*5),this.firstChild);
+                    }
                 })
         ;
@@ -94 +94 @@
         
         //Move the first handle to the startValue
-        if(!isNaN(o.startValue)) this.moveTo(o.startValue, 0);
+        if (o.startValue && o.startValue.length) {
+            $.each(o.startValue, function(index, value) {
+                self.moveTo(value, index, true);
+            });
+        } else if (!isNaN(o.startValue))
+            this.moveTo(o.startValue, 0, true);
         
         //If we only have one handle, set the previous handle to this one to allow clicking before selecting the handle
@@ -137 +142 @@
             this.element
                 .removeClass("ui-slider ui-slider-disabled")
-                .removeData("ul-slider")
+                .removeData("ui-slider")
                 .unbind(".slider");
-            this.handles.removeMouseInteraction();
+            this.handle.removeMouseInteraction();
         },
         enable: function() {
@@ -232 +237 @@
             
         },
-        moveTo: function(value, handle) {
-
+        moveTo: function(value, handle, noPropagation) {
             var o = this.options;
             if(handle == undefined && !this.currentHandle && this.handle.length != 1) return false; //If no handle has been passed, no current handle is available and we have multiple handles, return false
             if(handle == undefined && !this.currentHandle) handle = 0; //If only one handle is available, use it
             if(handle != undefined) this.currentHandle = this.previousHandle = $(this.handle[handle] || handle);
-
-            if(value.constructor == String) value = /\-\=/.test(value) ? this.value() - parseInt(value.replace('-=', ''),10) : this.value() + parseInt(value.replace('+=', ''),10);
+    
+            if(value.constructor == String) {
+                if (/^\-\=/.test(value) ) {
+                    value = this.value() - parseInt(value.replace('-=', ''), 10)
+                } else if (/^\+\=/.test(value) ) {
+                    value = this.value() + parseInt(value.replace('+=', ''), 10)
+                }
+            }
+            
             if(o.stepping) value = Math.round(value / o.stepping) * o.stepping;
             value = this.translateValue(value);
@@ -253 +264 @@
             if(this.rangeElement) this.updateRange();
             
-            this.propagate('start', null);
-            this.propagate('stop', null);
-            this.propagate('change', null);
-
+            if (!noPropagation) {
+                this.propagate('start', null);
+                this.propagate('stop', null);
+                this.propagate('change', null);
+            }
         }
     });