Changeset 5666

Timestamp:

05/22/08 12:11:15 (3 months ago)

Author:

rdworth

Message:

ui experimental mouse - migrated resizable. Still a couple issues with draggable+resizable

Location:

branches/ui-experimental/mouse

Files:

• ui.core.js (modified) (1 diff)
• ui.resizable.js (modified) (7 diffs)

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

@@ -258 +258 @@
     
     $.ui.mouse.defaults = {
-        cancel: "",
+        cancel: null,
         distance: 0,
         delay: 0

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

@@ -15 +15 @@
 ;(function($) {
     
-    $.widget("ui.resizable", {
+    $.widget("ui.resizable", $.extend($.ui.mouse, {
         init: function() {
 
             var self = this, o = this.options;
-            
+
             var elpos = this.element.css('position');
             
@@ -210 +210 @@
             }
         
-            //Initialize mouse events for interaction
-            this.element.mouse({
-                executor: this,
-                delay: 0,
-                distance: 0,
-                dragPrevention: ['input','textarea','button','select','option'],
-                start: this.start,
-                stop: this.stop,
-                drag: this.drag,
-                condition: function(e) {
-                    if(this.disabled) return false;
-                    for(var i in this.options.handles) {
-                        if($(this.options.handles[i])[0] == e.target) return true;
-                    }
-                    return false;
-                }
-            });
+            this.mouseInit();
             
         },
@@ -242 +226 @@
         },
         destroy: function() {
-            var el = this.element, wrapped = el.children(".ui-resizable").get(0),
-            
-            _destroy = function(exp) {
+            var el = this.element, wrapped = el.children(".ui-resizable").get(0);
+            
+            this.mouseDestroy();
+
+            var _destroy = function(exp) {
                 $(exp).removeClass("ui-resizable ui-resizable-disabled")
-                    .mouse("destroy").removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
+                    .removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
+
             };
             
@@ -273 +260 @@
             this.disabled = true;
         },
-        start: function(e) {
+        mouseStart: function(e) {
+            if(this.disabled) return false;
+
             var o = this.options, iniPos = this.element.position(), el = this.element, 
                 num = function(v) { return parseInt(v, 10) || 0; }, ie6 = $.browser.msie && $.browser.version < 7;
@@ -313 +302 @@
                 
             this.propagate("start", e);
+            for(var i in this.options.handles) {
+                if($(this.options.handles[i])[0] == e.target) return true;
+            }
             return false;
         },
-        stop: function(e) {
+        mouseDrag: function(e) {
+            //Increase performance, avoid regex
+            var el = this.helper, o = this.options, props = {},
+                self = this, smp = this.originalMousePosition, a = this.axis;
+
+            var dx = (e.pageX-smp.left)||0, dy = (e.pageY-smp.top)||0;
+            var trigger = this._change[a];
+            if (!trigger) return false;
+            
+            // Calculate the attrs that will be change
+            var data = trigger.apply(this, [e, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
+            
+            if (o._aspectRatio || e.shiftKey)
+                data = this._updateRatio(data, e);
+            
+            data = this._respectSize(data, e);
+            
+            this.propagate("resize", e);
+            
+            el.css({
+                top: this.position.top + "px", left: this.position.left + "px", 
+                width: this.size.width + "px", height: this.size.height + "px"
+            });
+            
+            if (!o.proxy && o.proportionallyResize)
+                this._proportionallyResize();
+            
+            this._updateCache(data);
+            
+            return false;
+        },
+        mouseStop: function(e) {
             this.options.resizing = false;
             var o = this.options, num = function(v) { return parseInt(v, 10) || 0; }, self = this;
@@ -339 +362 @@
     
             this.propagate("stop", e);  
-            return false;
-        },
-        drag: function(e) {
-            //Increase performance, avoid regex
-            var el = this.helper, o = this.options, props = {},
-                self = this, smp = this.originalMousePosition, a = this.axis;
-
-            var dx = (e.pageX-smp.left)||0, dy = (e.pageY-smp.top)||0;
-            var trigger = this._change[a];
-            if (!trigger) return false;
-            
-            // Calculate the attrs that will be change
-            var data = trigger.apply(this, [e, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
-            
-            if (o._aspectRatio || e.shiftKey)
-                data = this._updateRatio(data, e);
-            
-            data = this._respectSize(data, e);
-            
-            this.propagate("resize", e);
-            
-            el.css({
-                top: this.position.top + "px", left: this.position.left + "px", 
-                width: this.size.width + "px", height: this.size.height + "px"
-            });
-            
-            if (!o.proxy && o.proportionallyResize)
-                this._proportionallyResize();
-            
-            this._updateCache(data);
-            
             return false;
         },
@@ -499 +491 @@
             }
         }
-    });
+    }));
     
     $.extend($.ui.resizable, {
         defaults: {
+            cancel: ":input,button",
+            distance: 0,
+            delay: 0,
+
             preventDefault: true,
             transparent: false,