Changeset 5136

Timestamp:

03/28/08 11:51:31 (10 months ago)

Author:

paul.bakaus

Message:

ui-slider: made improvements to mousedown/mouseup logics (fixes #2596)
ui-base: improved the start of mouseInteraction: You don't have to drag one px to start the interaction now (if the old behaviour is desired, set distance to 1)

Location:

trunk/ui

Files:

• ui.base.js (modified) (4 diffs)
• ui.slider.js (modified) (6 diffs)

trunk/ui/ui.base.js

@@ -132 +132 @@
                 || (this.options.condition && !this.options.condition.apply(this.options.executor || this, [e, this.element])) //Prevent execution on condition
             ) return true;
-            
+                
             var self = this;
             var initialize = function() {
@@ -138 +138 @@
                 $(document).bind('mouseup.draggable', function() { return self.stop.apply(self, arguments); });
                 $(document).bind('mousemove.draggable', function() { return self.drag.apply(self, arguments); });
+                
+                if(!self.initalized && Math.abs(self._MP.left-e.pageX) >= self.options.distance || Math.abs(self._MP.top-e.pageY) >= self.options.distance) {               
+                    if(self.options.start) self.options.start.call(self.options.executor || self, e, self.element);
+                    self.initialized = true;
+                }
             };
 
@@ -146 +151 @@
                 initialize();
             }
-            
+                
             return false;
             
@@ -166 +171 @@
             if ($.browser.msie && !e.button) return this.stop.apply(this, [e]); // IE mouseup check
             
-            if(!this.initialized && (Math.abs(this._MP.left-e.pageX) >= o.distance || Math.abs(this._MP.top-e.pageY) >= o.distance)) {
+            if(!this.initialized && (Math.abs(this._MP.left-e.pageX) >= o.distance || Math.abs(this._MP.top-e.pageY) >= o.distance)) {              
                 if(this.options.start) this.options.start.call(this.options.executor || this, e, this.element);
                 this.initialized = true;

trunk/ui/ui.slider.js

@@ -76 +76 @@
                 }
             })
-            .wrap('<a href="javascript:void(0)"></a>')
+            .wrap('<a href="javascript:void(0)" style="cursor:default;"></a>')
             .parent()
                 .bind('focus', function(e) { self.focus(this.firstChild); })
@@ -87 +87 @@
         ;
         
-        //Position the node
-        if(o.helper == 'original' && (this.element.css('position') == 'static' || this.element.css('position') == '')) this.element.css('position', 'relative');
-        
         //Prepare dynamic properties for later use
         if(o.axis == 'horizontal') {
@@ -100 +97 @@
         
         //Bind the click to the slider itself
-        this.element.bind('click.slider', function(e) { self.click.apply(self, [e]); });
+        this.element.bind('mousedown.slider', function(e) {
+            self.click.apply(self, [e]);
+            self.currentHandle.data("ui-mouse").trigger(e);
+        });
         
         //Move the first handle to the startValue
@@ -207 +207 @@
             //Move focussed handle to the clicked position
             this.offset = this.element.offset();
-            this.moveTo(this.convertValue(e[this.properties[0] == 'top' ? 'pageY' : 'pageX'] - this.offset[this.properties[0]] - this.handleSize()/2));
+            this.moveTo(this.convertValue(e[this.properties[0] == 'top' ? 'pageY' : 'pageX'] - this.offset[this.properties[0]] - this.handleSize()/2), null, true);
         },
         start: function(e, handle) {
-            
+        
             var o = this.options;
-            
+            if(!this.currentHandle) this.currentHandle = this.previousHandle; //This is a especially ugly fix for strange blur events happening on mousemove events
+
             this.offset = this.element.offset();
             this.handleOffset = this.currentHandle.offset();
@@ -266 +267 @@
             var o = this.options;
             var position = { top: e.pageY - this.offset.top - this.clickOffset.top, left: e.pageX - this.offset.left - this.clickOffset.left};
+            if(!this.currentHandle) this.currentHandle = this.previousHandle; //This is a especially ugly fix for strange blur events happening on mousemove events
 
             var modifier = position[this.properties[0]];
@@ -278 +280 @@
             
             modifier = this.translateRange(modifier);
-            
+
             this.currentHandle.css(this.properties[0], modifier);
             if (this.rangeElement)