From: Matteo Nastasi (mop) <nastasi@alternativeoutput.com>
Date: Wed, 7 Dec 2011 07:39:47 +0000 (+0100)
Subject: Drag class renamed to xynt_dd and inherit from xynt_connect class
X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=xynt.git;a=commitdiff_plain;h=64ddd66d9f8fb0906630c6a9fa7d961866f3e1cf

Drag class renamed to xynt_dd and inherit from xynt_connect class
---

diff --git a/xynt-dd.js b/xynt-dd.js
index ca20b6d..0444a5c 100644
--- a/xynt-dd.js
+++ b/xynt-dd.js
@@ -30,29 +30,23 @@
  * sometimes fired off the handle, not the root.
  **************************************************/
 
-function Drag(mouseup_cb, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fXMapper, fYMapper)
+function xynt_dd(mouseup_cb, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fXMapper, fYMapper)
 {
-    console.log("xx"+this);
-    this.onmousedown   = Drag.prototype.start;
+    xynt_connect.call(this);
+
+    this.onmousedown   = xynt_dd.prototype.start;
     this.mouseup_cb    = mouseup_cb;
-    this.connect       = function(conn)
-    {
-        this.parentNode.connected[this.parentNode.connected.length] = conn;
-    }
-    
-    this.connected     = new Array();
-    /*  		alert("agnulla"+this.style.left); */
-    
-    this.hmode			= bSwapHorzRef ? false : true ;
-    this.vmode			= bSwapVertRef ? false : true ;
+
+    this.hmode = bSwapHorzRef ? false : true ;
+    this.vmode = bSwapVertRef ? false : true ;
     
-    this.root = this.xynt_dom_el && this.xynt_dom_el != null ? this.xynt_dom_el : this ;
+    this.root = (this.xynt_dom_el && this.xynt_dom_el != null) ? this.xynt_dom_el : this ;
     
-    if (this.hmode && isNaN(parseInt(this.root.style.left  ))) {
+    if (this.hmode && isNaN(parseInt(this.root.style.left))) {
         var res = parseInt(getStyle(o, "left", "left"));
-		    if (isNaN(res)) {
-			this.root.style.left   = "0px";
-		    }
+	if (isNaN(res)) {
+	    this.root.style.left   = "0px";
+	}
 	else {
 	    this.root.style.left   = res;
 	}
@@ -77,131 +71,132 @@ function Drag(mouseup_cb, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fX
     this.xMapper = fXMapper ? fXMapper : null;
     this.yMapper = fYMapper ? fYMapper : null;
     
-    this.root.onDragStart	= new Function();
+    this.root.onDragStart = new Function();
     this.root.onDragEnd	= new Function();
-    this.root.onDrag		= new Function();
+    this.root.onDrag = new Function();
 }
 
-Drag.prototype = {
-
-	obj : null,
-
-	start : function(e)
-	{
-            console.log("Drag.start");
-		var o = Drag.obj = this;
-		e = Drag.prototype.fixE(e);
-
-               if (!e) 
-                   var e = window.event
-	       // handle event
-	       e.cancelBubble = true;
-	       if (e.stopPropagation) 
-                   e.stopPropagation();
-
-	        o.oldzidx = o.style.zIndex;
-		o.style.zIndex = 10;
-
-		// alert("start");
-
-		var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
-		var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
-		o.root.onDragStart(x, y);
-
-		o.lastMouseX	= e.clientX;
-		o.lastMouseY	= e.clientY;
-
-		if (o.hmode) {
-			if (o.minX != null)	o.minMouseX	= e.clientX - x + o.minX;
-			if (o.maxX != null)	o.maxMouseX	= o.minMouseX + o.maxX - o.minX;
-		} else {
-			if (o.minX != null) o.maxMouseX = -o.minX + e.clientX + x;
-			if (o.maxX != null) o.minMouseX = -o.maxX + e.clientX + x;
-		}
-
-		if (o.vmode) {
-			if (o.minY != null)	o.minMouseY	= e.clientY - y + o.minY;
-			if (o.maxY != null)	o.maxMouseY	= o.minMouseY + o.maxY - o.minY;
-		} else {
-			if (o.minY != null) o.maxMouseY = -o.minY + e.clientY + y;
-			if (o.maxY != null) o.minMouseY = -o.maxY + e.clientY + y;
-		}
-
-		document.onmousemove	= Drag.prototype.drag;
-		document.onmouseup	= Drag.prototype.end;
-
-            for(var i = 0 ; i < o.connected.length ; i++) {
-                o.connected[i].update('start', o);
-            }
-
-		return false;
-	},
-
-	drag : function(e)
-	{
-		e = Drag.prototype.fixE(e);
-		var o = Drag.obj;
-
-		var ey	= e.clientY;
-		var ex	= e.clientX;
-		var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
-		var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
-		var nx, ny;
-
-		if (o.minX != null) ex = o.hmode ? Math.max(ex, o.minMouseX) : Math.min(ex, o.maxMouseX);
-		if (o.maxX != null) ex = o.hmode ? Math.min(ex, o.maxMouseX) : Math.max(ex, o.minMouseX);
-		if (o.minY != null) ey = o.vmode ? Math.max(ey, o.minMouseY) : Math.min(ey, o.maxMouseY);
-		if (o.maxY != null) ey = o.vmode ? Math.min(ey, o.maxMouseY) : Math.max(ey, o.minMouseY);
-
-		nx = x + ((ex - o.lastMouseX) * (o.hmode ? 1 : -1));
-		ny = y + ((ey - o.lastMouseY) * (o.vmode ? 1 : -1));
-
-		if (o.xMapper)		nx = o.xMapper(y)
-		else if (o.yMapper)	ny = o.yMapper(x)
-
-		Drag.obj.root.style[o.hmode ? "left" : "right"] = nx + "px";
-		Drag.obj.root.style[o.vmode ? "top" : "bottom"] = ny + "px";
-		Drag.obj.lastMouseX	= ex;
-		Drag.obj.lastMouseY	= ey;
-
-		Drag.obj.root.onDrag(nx, ny);
-
-            for(var i = 0 ; i < o.connected.length ; i++) {
-                o.connected[i].update('drag', o);
-            }
-
-		return false;
-	},
-
-	end : function(e)
-	{
-		e = Drag.prototype.fixE(e);
-		var o = Drag.obj;
-
-		o.style.zIndex = o.oldzidx;
-		// alert("END");
-		if (o.mouseup_cb != null) {
-		    if (o.mouseup_cb(o) == 1) {
-			o.onmousedown = null;
-		    }
-		}
-
-		document.onmousemove = null;
-		document.onmouseup   = null;
-		Drag.obj.root.onDragEnd(	parseInt(Drag.obj.root.style[Drag.obj.hmode ? "left" : "right"]), 
-									parseInt(Drag.obj.root.style[Drag.obj.vmode ? "top" : "bottom"]));
-            for(var i = 0 ; i < o.connected.length ; i++) {
-                o.connected[i].update('end', o);
-            }
-
-		Drag.obj = null;
-	},
-
-	fixE : function(e)
-	{
-		if (typeof e == 'undefined') e = window.event;
-		if (typeof e.layerX == 'undefined') e.layerX = e.offsetX;
-		if (typeof e.layerY == 'undefined') e.layerY = e.offsetY;
-		return e;
+xynt_dd.prototype = {
+
+    obj : null,
+
+    start : function(e)
+    {
+	var o = xynt_dd.obj = this;
+	e = xynt_dd.prototype.fixE(e);
+
+        if (!e) 
+            var e = window.event
+	// handle event
+	e.cancelBubble = true;
+	if (e.stopPropagation) 
+            e.stopPropagation();
+
+	o.oldzidx = o.style.zIndex;
+	o.style.zIndex = 10;
+
+	var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
+	var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
+	o.root.onDragStart(x, y);
+
+	o.lastMouseX	= e.clientX;
+	o.lastMouseY	= e.clientY;
+
+	if (o.hmode) {
+	    if (o.minX != null)	o.minMouseX	= e.clientX - x + o.minX;
+	    if (o.maxX != null)	o.maxMouseX	= o.minMouseX + o.maxX - o.minX;
+	} else {
+	    if (o.minX != null) o.maxMouseX = -o.minX + e.clientX + x;
+	    if (o.maxX != null) o.minMouseX = -o.maxX + e.clientX + x;
+	}
+
+	if (o.vmode) {
+	    if (o.minY != null)	o.minMouseY	= e.clientY - y + o.minY;
+	    if (o.maxY != null)	o.maxMouseY	= o.minMouseY + o.maxY - o.minY;
+	} else {
+	    if (o.minY != null) o.maxMouseY = -o.minY + e.clientY + y;
+	    if (o.maxY != null) o.minMouseY = -o.maxY + e.clientY + y;
 	}
+
+        // console.log("assign");
+	document.onmousemove	= xynt_dd.prototype.drag;
+	document.onmouseup	= xynt_dd.prototype.end;
+
+        for(var i = 0 ; i < o.xynt_conn_ected.length ; i++) {
+            o.xynt_conn_ected[i].xynt_conn_update('start', o);
+        }
+
+	return false;
+    },
+
+    drag : function(e)
+    {
+        e = xynt_dd.prototype.fixE(e);
+	var o = xynt_dd.obj;
+        
+	var ey	= e.clientY;
+	var ex	= e.clientX;
+	var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
+	var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
+	var nx, ny;
+
+	if (o.minX != null) ex = o.hmode ? Math.max(ex, o.minMouseX) : Math.min(ex, o.maxMouseX);
+	if (o.maxX != null) ex = o.hmode ? Math.min(ex, o.maxMouseX) : Math.max(ex, o.minMouseX);
+	if (o.minY != null) ey = o.vmode ? Math.max(ey, o.minMouseY) : Math.min(ey, o.maxMouseY);
+	if (o.maxY != null) ey = o.vmode ? Math.min(ey, o.maxMouseY) : Math.max(ey, o.minMouseY);
+        
+	nx = x + ((ex - o.lastMouseX) * (o.hmode ? 1 : -1));
+	ny = y + ((ey - o.lastMouseY) * (o.vmode ? 1 : -1));
+
+	if (o.xMapper)		nx = o.xMapper(y)
+	else if (o.yMapper)	ny = o.yMapper(x)
+
+	xynt_dd.obj.root.style[o.hmode ? "left" : "right"] = nx + "px";
+	xynt_dd.obj.root.style[o.vmode ? "top" : "bottom"] = ny + "px";
+	xynt_dd.obj.lastMouseX	= ex;
+	xynt_dd.obj.lastMouseY	= ey;
+
+	xynt_dd.obj.root.onDrag(nx, ny);
+        
+        console.log("pre call it"+o.xynt_conn_ected.length);
+        for(var i = 0 ; i < o.xynt_conn_ected.length ; i++) {
+            console.log("call it");
+            o.xynt_conn_ected[i].xynt_conn_update('drag', o);
+        }
+        
+	return false;
+    },
+
+    end : function(e)
+    {
+	e = xynt_dd.prototype.fixE(e);
+	var o = xynt_dd.obj;
+
+	o.style.zIndex = o.oldzidx;
+	if (o.mouseup_cb != null) {
+	    if (o.mouseup_cb(o) == 1) {
+		o.onmousedown = null;
+	    }
+	}
+
+	document.onmousemove = null;
+	document.onmouseup   = null;
+	xynt_dd.obj.root.onDragEnd(	parseInt(xynt_dd.obj.root.style[xynt_dd.obj.hmode ? "left" : "right"]), 
+					parseInt(xynt_dd.obj.root.style[xynt_dd.obj.vmode ? "top" : "bottom"]));
+        for(var i = 0 ; i < o.xynt_conn_ected.length ; i++) {
+            o.xynt_conn_ected[i].xynt_conn_update('end', o);
+        }
+
+	xynt_dd.obj = null;
+    },
+
+    fixE : function(e)
+    {
+	if (typeof e == 'undefined') e = window.event;
+	if (typeof e.layerX == 'undefined') e.layerX = e.offsetX;
+	if (typeof e.layerY == 'undefined') e.layerY = e.offsetY;
+	return e;
+    }
 };
+
+Extends(xynt_dd, xynt_connect);
\ No newline at end of file