Changeset 5643

Timestamp:

05/20/08 18:32:45 (3 months ago)

Author:

rdworth

Message:

ui experimental mouse - added mouse prefix to method names. Switched some apply calls to straight method calls.

Files:

• branches/ui-experimental/mouse/ui.core.js (modified) (5 diffs)

branches/ui-experimental/mouse/ui.core.js

@@ -162 +162 @@
 
             this.element
-                .bind('mousedown.mouse', function() {
-                    return self.down.apply(self, arguments);
+                .bind('mousedown.mouse', function(e) {
+                    return self.mouseDown(e);
                 });
 
@@ -183 +183 @@
         },
 
-        down: function(e) {
-console.log('down');
+        mouseDown: function(e) {
+console.log('mouse.mouseDown');
             var self = this;
             self._downEvent = e;
@@ -201 +201 @@
 
                 $(document)
-                    .bind('mousemove.mouse', function() {
-                        return self.move.apply(self, arguments);
+                    .bind('mousemove.mouse', function(e) {
+                        return self.mouseMove(e);
                     })
-                    .bind('mouseup.mouse', function() {
-                        return self.up.apply(self, arguments);
+                    .bind('mouseup.mouse', function(e) {
+                        return self.mouseUp(e);
                     });
 
@@ -211 +211 @@
         },
 
-        move: function(e) {
-console.log('move');
+        mouseMove: function(e) {
+console.log('mouse.mouseMove');
             var self = this;
             self._moveEvent = e;
@@ -224 +224 @@
                         Math.abs(this._downEvent.pageY - e.pageY)
                     ) >= this.options.mouseDistance
-                )
-                    this.start.apply(this, arguments);
+                ) {
+                    this.started = true;
+                    this.mouseStart(e);
+                }
             } else {
                 // IE mouseup check
                 if ($.browser.msie && !e.button) {
-                    return this.up(e);
-                }
-                this.drag.apply(this, arguments);
-
-            }
-        },
-        start: function(e) {
-console.log('start');
-            this.started = true;
-        },
-        drag: function(e) {
-console.log('drag');
-        },
-
-        up: function(e) {
-console.log('up');
+                    return this.mouseUp(e);
+                }
+                this.mouseDrag(e);
+
+            }
+        },
+        mouseStart: function(e) {
+console.log('mouse.mouseStart: override me');
+        },
+        mouseDrag: function(e) {
+console.log('mouse.mouseDrag: override me');
+        },
+
+        mouseUp: function(e) {
+console.log('mouse.mouseUp: override me');
             $(document).unbind('.mouse');
-            this.stop.apply(this, arguments);
-        },
-        stop: function(e) {
-console.log('stop');
-            this.started = false;
+            if (this.started) {
+                this.started = false;
+                this.mouseStop(e);
+            }
+        },
+        mouseStop: function(e) {
+console.log('mouse.mouseStop');
         }
     }