jQuery UI Development

Timestamp:

08/17/08 01:15:49 (19 months ago)

Author:

cloudream@…

Message:

internal methods: mouse*

Location:

trunk/ui

Files:

• ui.core.js (modified) (10 diffs)
• ui.draggable.js (modified) (9 diffs)
• ui.resizable.js (modified) (5 diffs)
• ui.selectable.js (modified) (4 diffs)
• ui.sortable.js (modified) (7 diffs)

trunk/ui/ui.core.js

@@ -203 +203 @@
 
 $.ui.mouse = {
-        mouseInit: function() {
+        _mouseInit: function() {
                 var self = this;
         
                 this.element.bind('mousedown.'+this.widgetName, function(e) {
-                        return self.mouseDown(e);
+                        return self._mouseDown(e);
                 });
                 
@@ -221 +221 @@
         // TODO: make sure destroying one instance of mouse doesn't mess with
         // other instances of mouse
-        mouseDestroy: function() {
+        _mouseDestroy: function() {
                 this.element.unbind('.'+this.widgetName);
                 
@@ -229 +229 @@
         },
         
-        mouseDown: function(e) {
+        _mouseDown: function(e) {
                 // we may have missed mouseup (out of window)
-                (this._mouseStarted && this.mouseUp(e));
+                (this._mouseStarted && this._mouseUp(e));
                 
                 this._mouseDownEvent = e;
@@ -238 +238 @@
                         btnIsLeft = (e.which == 1),
                         elIsCancel = (typeof this.options.cancel == "string" ? $(e.target).parents().add(e.target).filter(this.options.cancel).length : false);
-                if (!btnIsLeft || elIsCancel || !this.mouseCapture(e)) {
+                if (!btnIsLeft || elIsCancel || !this._mouseCapture(e)) {
                         return true;
                 }
                 
-                this._mouseDelayMet = !this.options.delay;
-                if (!this._mouseDelayMet) {
+                this.mouseDelayMet = !this.options.delay;
+                if (!this.mouseDelayMet) {
                         this._mouseDelayTimer = setTimeout(function() {
-                                self._mouseDelayMet = true;
+                                self.mouseDelayMet = true;
                         }, this.options.delay);
                 }
                 
-                if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
-                        this._mouseStarted = (this.mouseStart(e) !== false);
+                if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) {
+                        this._mouseStarted = (this._mouseStart(e) !== false);
                         if (!this._mouseStarted) {
                                 e.preventDefault();
@@ -259 +259 @@
                 // these delegates are required to keep context
                 this._mouseMoveDelegate = function(e) {
-                        return self.mouseMove(e);
+                        return self._mouseMove(e);
                 };
                 this._mouseUpDelegate = function(e) {
-                        return self.mouseUp(e);
+                        return self._mouseUp(e);
                 };
                 $(document)
@@ -271 +271 @@
         },
         
-        mouseMove: function(e) {
+        _mouseMove: function(e) {
                 // IE mouseup check - mouseup happened when mouse was out of window
                 if ($.browser.msie && !e.button) {
-                        return this.mouseUp(e);
+                        return this._mouseUp(e);
                 }
                 
                 if (this._mouseStarted) {
-                        this.mouseDrag(e);
+                        this._mouseDrag(e);
                         return false;
                 }
                 
-                if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
+                if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) {
                         this._mouseStarted =
-                                (this.mouseStart(this._mouseDownEvent, e) !== false);
-                        (this._mouseStarted ? this.mouseDrag(e) : this.mouseUp(e));
+                                (this._mouseStart(this._mouseDownEvent, e) !== false);
+                        (this._mouseStarted ? this._mouseDrag(e) : this._mouseUp(e));
                 }
                 
@@ -291 +291 @@
         },
         
-        mouseUp: function(e) {
+        _mouseUp: function(e) {
                 $(document)
                         .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
@@ -298 +298 @@
                 if (this._mouseStarted) {
                         this._mouseStarted = false;
-                        this.mouseStop(e);
+                        this._mouseStop(e);
                 }
                 
@@ -304 +304 @@
         },
         
-        mouseDistanceMet: function(e) {
+        _mouseDistanceMet: function(e) {
                 return (Math.max(
                                 Math.abs(this._mouseDownEvent.pageX - e.pageX),
@@ -312 +312 @@
         },
         
-        mouseDelayMet: function(e) {
-                return this._mouseDelayMet;
+        _mouseDelayMet: function(e) {
+                return this.mouseDelayMet;
         },
         
         // These are placeholder methods, to be overriden by extending plugin
-        mouseStart: function(e) {},
-        mouseDrag: function(e) {},
-        mouseStop: function(e) {},
-        mouseCapture: function(e) { return true; }
+        _mouseStart: function(e) {},
+        _mouseDrag: function(e) {},
+        _mouseStop: function(e) {},
+        _mouseCapture: function(e) { return true; }
 };
 

trunk/ui/ui.draggable.js

@@ -22 +22 @@
                 (this.options.disabled && this.element.addClass('ui-draggable-disabled'));
                 
-                this.mouseInit();
-                
-        },
-        mouseStart: function(e) {
+                this._mouseInit();
+                
+        },
+        _mouseStart: function(e) {
                 
                 var o = this.options;
@@ -136 +136 @@
                 
                 this.helper.addClass("ui-draggable-dragging");
-                this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+                this._mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
                 return true;
         },
@@ -208 +208 @@
                 return position;
         },
-        mouseDrag: function(e) {
+        _mouseDrag: function(e) {
         
                 //Compute the helpers position
@@ -223 +223 @@
                 return false;
         },
-        mouseStop: function(e) {
+        _mouseStop: function(e) {
                 
                 //If we are using droppables, inform the manager about the drop
@@ -269 +269 @@
                 if(!this.element.data('draggable')) return;
                 this.element.removeData("draggable").unbind(".draggable").removeClass('ui-draggable-dragging ui-draggable-disabled');
-                this.mouseDestroy();
+                this._mouseDestroy();
         }
 }));
@@ -493 +493 @@
                                 this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
                                 if(this.shouldRevert) this.instance.options.revert = true; //revert here
-                                this.instance.mouseStop(e);
+                                this.instance._mouseStop(e);
                                 
                                 //Also propagate receive event, since the sortable is actually receiving a element
@@ -535 +535 @@
                                 
                                         e.target = this.instance.currentItem[0];
-                                        this.instance.mouseCapture(e, true);
-                                        this.instance.mouseStart(e, true, true);
+                                        this.instance._mouseCapture(e, true);
+                                        this.instance._mouseStart(e, true, true);
 
                                         //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
@@ -549 +549 @@
                                 
                                 //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
-                                if(this.instance.currentItem) this.instance.mouseDrag(e);
+                                if(this.instance.currentItem) this.instance._mouseDrag(e);
                                 
                         } else {
@@ -559 +559 @@
                                         this.instance.cancelHelperRemoval = true;
                                         this.instance.options.revert = false; //No revert here
-                                        this.instance.mouseStop(e, true);
+                                        this.instance._mouseStop(e, true);
                                         this.instance.options.helper = this.instance.options._helper;
                                         

trunk/ui/ui.resizable.js

@@ -213 +213 @@
                 }
                 
-                this.mouseInit();
+                this._mouseInit();
         },
         plugins: {},
@@ -235 +235 @@
                 var el = this.element, wrapped = el.children(".ui-resizable").get(0);
                 
-                this.mouseDestroy();
+                this._mouseDestroy();
                 
                 var _destroy = function(exp) {
@@ -258 +258 @@
                 }
         },
-        mouseStart: function(e) {
+        _mouseStart: function(e) {
                 if(this.options.disabled) return false;
                 
@@ -313 +313 @@
                 return true;
         },
-        mouseDrag: function(e) {
+        _mouseDrag: function(e) {
                 
                 //Increase performance, avoid regex
@@ -349 +349 @@
                 return false;
         },
-        mouseStop: function(e) {
+        _mouseStop: function(e) {
                 
                 this.options.resizing = false;

trunk/ui/ui.selectable.js

@@ -46 +46 @@
                 this.selectees = selectees.addClass("ui-selectee");
                 
-                this.mouseInit();
+                this._mouseInit();
                 
                 this.helper = $(document.createElement('div'))
@@ -64 +64 @@
                         .removeData("selectable")
                         .unbind(".selectable");
-                this.mouseDestroy();
-        },
-        mouseStart: function(e) {
+                this._mouseDestroy();
+        },
+        _mouseStart: function(e) {
                 var self = this;
                 
@@ -122 +122 @@
                 return this.options.keyboard ? !isSelectee : true;
         },
-        mouseDrag: function(e) {
+        _mouseDrag: function(e) {
                 var self = this;
                 this.dragged = true;
@@ -211 +211 @@
                 return false;
         },
-        mouseStop: function(e) {
+        _mouseStop: function(e) {
                 var self = this;
                 

trunk/ui/ui.sortable.js

@@ -42 +42 @@
 
                 //Initialize mouse events for interaction
-                this.mouseInit();
+                this._mouseInit();
                 
         },
@@ -284 +284 @@
                         .removeData("sortable")
                         .unbind(".sortable");
-                this.mouseDestroy();
+                this._mouseDestroy();
                 
                 for ( var i = this.items.length - 1; i >= 0; i-- )
@@ -361 +361 @@
         },
         
-        mouseCapture: function(e, overrideHandle) {
+        _mouseCapture: function(e, overrideHandle) {
         
                 if(this.options.disabled || this.options.type == 'static') return false;
@@ -391 +391 @@
         },
         
-        mouseStart: function(e, overrideHandle, noActivation) {
+        _mouseStart: function(e, overrideHandle, noActivation) {
 
                 var o = this.options;
@@ -500 +500 @@
                 this.dragging = true;
 
-                this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+                this._mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
                 return true;
 
@@ -567 +567 @@
         },
         
-        mouseDrag: function(e) {
+        _mouseDrag: function(e) {
 
                 //Compute the helpers position
@@ -634 +634 @@
         },
         
-        mouseStop: function(e, noPropagation) {
+        _mouseStop: function(e, noPropagation) {
 
                 //If we are using droppables, inform the manager about the drop