dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/drawing/tools/TextBlock.js

@@ -44,11 +44,15 @@ dojo.require("dojox.drawing.stencil.Text");
 			//
 			if(options.data){
 				var d = options.data;
+				var text = d.text;
 				var w = !d.width ? this.style.text.minWidth : d.width=="auto" ? "auto" : Math.max(d.width, this.style.text.minWidth)
 				var h = this._lineHeight;
 				
-				if(d.text && w=="auto"){
-					var o = this.measureText(this.cleanText(d.text, false), w);
+				// need to typeset before measuring width
+				text = this.typesetter(text);
+				
+				if(text && w=="auto"){
+					var o = this.measureText(this.cleanText(text, false), w);
 					w = o.w;
 					h = o.h;
 				}else{
@@ -63,7 +67,7 @@ dojo.require("dojox.drawing.stencil.Text");
 					{x:d.x, y:d.y+h}
 				];
 				
-				if(d.showEmpty || d.text){
+				if(d.showEmpty || text){
 					this.editMode = true;
 					
 				
@@ -72,13 +76,13 @@ dojo.require("dojox.drawing.stencil.Text");
 					this.connect(this, "render", this, "onRender", true);
 					
 					if(d.showEmpty){
-						this._text = d.text || "";
+						this._text = text || "";
 						this.edit();
-					}else if(d.text && d.editMode){
+					}else if(text && d.editMode){
 						this._text = "";
 						this.edit();
-					}else if(d.text){
-						this.render(d.text);
+					}else if(text){
+						this.render(text);
 					}
 					setTimeout(dojo.hitch(this, function(){
 						this.editMode = false;	
@@ -232,7 +236,7 @@ StencilData: {
 						self.keys.editMode(false);
 						self.mouse.setEventMode();
 						self.execText();
-					}
+					};
 					
 				kc1 = dojo.connect(conEdit, "keyup", this, function(evt){
 					// 	if text is empty, we need a height so the field's height
@@ -280,10 +284,9 @@ StencilData: {
 				
 				conEdit.focus();
 				
-				this.onDown = function(){}
-				this.onDrag = function(){}
+				this.onDown = function(){};
+				this.onDrag = function(){};
 				
-				var self = this;
 				setTimeout(dojo.hitch(this, function(){
 					// once again for Silverlight:
 					conEdit.focus();
@@ -314,6 +317,9 @@ StencilData: {
 				conEdit.innerHTML = "";
 				conEdit.blur();
 				this.destroyAnchors();
+
+				// need to convert characters before measuring width.
+				txt = this.typesetter(txt);
 				
 				var o = this.measureText(txt, w);
 				var sc = this.mouse.scrollOffset();
@@ -344,16 +350,18 @@ StencilData: {
 					this._textArray = [];
 				}
 				this.render(o.text);
-				this.onChangeText(txt);
+				// Only for Combo objects (vectors, rectangle, or ellipse).
+				this.onChangeText(this.getText());
 			},
 			
 			edit: function(){
 				// summary:
 				//		Internal?
-				//		Method used to instanciate the contenteditable HTML node.
+				//		Method used to instantiate the contenteditable HTML node.
 				//
 				this.editMode = true;
-				console.log("EDIT TEXT:", this._text, " ", this._text.replace("/n", " "));
+				var text = this.getText() || "";
+				console.log("EDIT TEXT:",text, " ",text.replace("/n", " "));
 				// NOTE: no mouse obj
 				if(this.parentNode || !this.points){ return; }
 				var d = this.pointsToData();
@@ -366,15 +374,15 @@ StencilData: {
 					pageY: (d.y  ) / this.mouse.zoom- sc.top + org.y,
 					width:d.width / this.mouse.zoom,
 					height:d.height / this.mouse.zoom
-				}
+				};
 				
 				this.remove(this.shape, this.hit);
 				this.showParent(obj);
-				this.createTextField(this._text.replace("/n", " "));
+				this.createTextField(text.replace("/n", " "));
 				this.connectTextField();
-				if(this._text){
+				if(text){
 					//setTimeout(dojo.hitch(this, function(){
-					this.setSelection(conEdit, "end")
+					this.setSelection(conEdit, "end");
 					//}), 500)
 				}
 			},
@@ -392,7 +400,7 @@ StencilData: {
 						str = str.replace(new RegExp(nm, "gi"), chars[nm])
 					}
 					return str
-				}
+				};
 
 				if(removeBreaks){
 					dojo.forEach(['<br>', '<br/>', '<br />', '\\n', '\\r'], function(br){
@@ -514,7 +522,7 @@ StencilData: {
 					height:h+"px",
 					backgroundColor:d.fill,
 					border:b+"px " + d.style + " "+d.color
-				}
+				};
 				if(dojo.isIE){
 					s.paddingLeft = w + "px";
 					s.fontSize = w + "px"
@@ -580,17 +588,17 @@ StencilData: {
 			},
 			setSelection: function(node, what){
 				// summary:
-				//		Used for placing teh cursor at the end of the
+				//		Used for placing the cursor at the end of the
 				//		text on edit.
 				//
 				console.warn("setSelection:");
-				if (dojo.doc.selection) { // IE
+				if(dojo.doc.selection){ // IE
 					var r = dojo.body().createTextRange();
 					r.moveToElementText(node);
 					r.collapse(false);
 					r.select();
 					
-				} else {
+				}else{
 					var getAllChildren = function(node, children){
 						children = children || [];
 						for(var i=0;i<node.childNodes.length; i++){
@@ -611,14 +619,14 @@ StencilData: {
 					node.focus();
 					var selection = dojo.global.getSelection();
 					selection.removeAllRanges();
-					console.log(1)
-					var r = dojo.doc.createRange();
+					console.log(1);
+					r = dojo.doc.createRange();
 					r.selectNodeContents(node);
-					console.log(2)
+					console.log(2);
 					var nodes = getAllChildren(node);
-					console.log(3)
-					if (what == "end") {
-						console.log("len:", nodes[nodes.length - 1].textContent.length)
+					console.log(3);
+					if(what == "end"){
+						console.log("len:", nodes[nodes.length - 1].textContent.length);
 						r.setStart(nodes[nodes.length - 1], nodes[nodes.length - 1].textContent.length);
 						r.setEnd(nodes[nodes.length - 1], nodes[nodes.length - 1].textContent.length);
 					}else if(what=="beg" || what == "start"){

data/dojo/dojox/drawing/tools/custom/Axes.js

@@ -14,19 +14,55 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 	dojox.drawing.stencil.Path,
 	function(options){
 		this.closePath = false;
-		
+
 		this.xArrow = new dojox.drawing.annotations.Arrow({stencil:this, idx1:0, idx2:1});
 		this.yArrow = new dojox.drawing.annotations.Arrow({stencil:this, idx1:2, idx2:1});
-		
+		if(options.data){
+			//Allows import of z-axis in non-enabled canvas and xy-axis in
+			//enabled canvas
+			this.style.zAxisEnabled = options.data.cosphi == 1 ? true : false;
+			this.setData(options.data);
+		}
+		if(this.style.zAxisEnabled){
+			// If the z-axis is enabled, all axes will be created with a z-axis on the canvas.
+			// there is no switching back and forth for the axis, only for vectors.
+			this.data.cosphi = 1;
+			var ops = {};
+			dojo.mixin(ops,options);
+			dojo.mixin(ops,{
+				container:this.container.createGroup(),
+				style: this.style,
+				showAngle: false,
+				label: null
+			});
+			if(options.data && (!ops.data.radius || !ops.data.angle)){
+				ops.data.x2 = ops.data.x4;
+				ops.data.y2 = ops.data.y4;
+			}
+			ops.style.zAxis = true;
+			this.zAxis = new dojox.drawing.tools.custom.Vector(ops);
+			this.zAxis.minimumSize = 5;
+			//console.log("-----constructing axes: ",this.zAxis);
+			this.connectMult([
+				[this, "onChangeStyle", this.zAxis, "onChangeStyle"],
+				[this, "select", this.zAxis, "select"],
+				[this, "deselect", this.zAxis, "deselect"],
+				[this, "onDelete", this.zAxis, "destroy"],
+				[this, "onDrag", this, "zSet"],
+				[this, "onTransform", this, "zSet"],
+				[this.zAxis, "onBeforeRender", this, "zSet"],
+				[this, "_onPostRender", this.zAxis, "render"]
+			]);
+			
+		}
+
 		if(this.points && this.points.length){
 			this.setPoints = this._postSetPoints;
-			// need to call render again. It's already been called in the _Base
-			// constructor by the time we get to this constructor
+			// render isn't called yet because baseRender is false
+			// instead it is called here
 			this.render();
-			// 	I don't know why Axes is different, but post-render calls won't
-			// 	happen with pre-data unless we call this here. It *should* happen
-			//	on first render.
-			this.onRender();
+			options.label && this.setLabel(options.label);
+			options.shadow && this.addShadow(options.shadow);
 		}
 	},
 	{
@@ -36,7 +72,29 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 		showAngle:true,
 		closePath:false,
 		baseRender:false,
-
+		zScale:.5,
+		
+		zPoint: function(obj){
+			// summary:
+			//		Finds the point for the z axis.
+			obj.radius = this.util.length(obj);
+			var pt = this.util.pointOnCircle(obj.start.x, obj.start.y, obj.radius*this.zScale, this.style.zAngle);
+			return {x:pt.x, y:pt.y, skip:true, noAnchor:true};
+		},
+		
+		zSet: function(){
+			if(!this.zAxis){ return; };
+			var c = this.points[1];
+			var z = this.points[3];
+			var p = [
+				{x:c.x, y:c.y},
+				{x:z.x, y:z.y}
+			];
+			var len = this.util.length({start:{x:c.x, y:c.y}, x:z.x, y:z.y});
+			len > this.zAxis.minimumSize ? this.zAxis.setPoints(p) : false; 
+			this.zAxis.cosphi = 1; 
+		},
+		
 		createLabels: function(){
 			// summary:
 			//		Creates the label for each axis.
@@ -49,25 +107,30 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			this.labelY = new dojox.drawing.annotations.Label(dojo.mixin(props,{
 				labelPosition:this.setLabelY
 			}));
+			if(this.style.zAxisEnabled){
+				this.labelZ = new dojox.drawing.annotations.Label(dojo.mixin(props,{
+					labelPosition:this.setLabelZ
+				}));
+			}
+
 		},
-		
+
 		setLabelX: function(){
 			// summary:
 			//		Custom placement for x-axis label
 			//
 			var ax = this.points[0];
 			var c =  this.points[1];
-			var ay = this.points[2];
-			
+
 			var dist = 40;
 			var offdist = 20;
 			var pt, px, py, pt2;
-			
+
 			pt = this.util.lineSub(c.x, c.y, ax.x, ax.y, dist);
 			px = pt.x + (pt.y -ax.y);
 			py = pt.y + (ax.x - pt.x);
 			pt2 = this.util.lineSub(pt.x, pt.y, px, py, (dist-offdist));
-			
+
 			return {
 				x:  pt2.x,
 				y:  pt2.y,
@@ -78,17 +141,15 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			// summary:
 			//		Custom placement for y-axis label
 			//
-			var ax = this.points[0];
 			var c =  this.points[1];
 			var ay = this.points[2];
-			
+
 			var dist = 40;
 			var offdist = 20;
 			var pt, px, py, pt2;
 			pt = this.util.lineSub(c.x, c.y, ay.x, ay.y, dist);
-			px = pt.x + ( ay.y-pt.y);
-			py = pt.y + (pt.x - ay.x );
-			pt2 = this.util.lineSub(pt.x, pt.y, px, py, (dist-offdist));
+			px = pt.x + (ay.y - pt.y);
+			py = pt.y + (pt.x - ay.x);
 			pt2 = this.util.lineSub(pt.x, pt.y, px, py, (dist-offdist));
 			return {
 				x:  pt2.x,
@@ -96,6 +157,27 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 				width:20
 			};
 		},
+		setLabelZ: function(){
+			// summary:
+			//		Custom placement for z-axis label
+			//
+			var c = this.points[1];
+			var z = this.points[3];
+			
+			var dist = 40;
+			var offdist = 20;
+			var pt, px, py, pt2;
+			pt = this.util.lineSub(c.x, c.y, z.x, z.y, dist);
+			px = pt.x + (pt.y - z.y);
+			py = pt.y + (z.x - pt.x);
+			pt2 = this.util.lineSub(pt.x, pt.y, px, py, (dist-offdist));
+			
+			return {
+				x:pt2.x,
+				y:pt2.y,
+				width:20
+			}
+		},
 		setLabel: function(/* ? String*/value){
 			// summary:
 			//		Set the text of the labels. The text would be
@@ -111,38 +193,46 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			!this.labelX && this.createLabels();
 			var x = "x";
 			var y = "y";
+			var z = "z";
 			if(value){
 				// match first "and" or "&" and trim whitespace.
 				// Non-greedy matches are not supported in older
 				// browsers such as Netscape Navigator 4 or
 				// Microsoft Internet Explorer 5.0.
-				value.replace(/^\s+/,"");
-				value.replace(/\s+$/,"");
-				var lbls = value.match(/(.*?)(and|&)(.*)/i);
-				if(lbls.length>2){
-					x = lbls[1].replace(/\s+$/,"");
-					y = lbls[3].replace(/^\s+/,"");
+				if(this.labelZ){
+					var lbls = value.match(/(.*?)(and|&)(.*?)(and|&)(.*)/i);
+					if(lbls.length>4){
+						x = lbls[1].replace(/^\s+/,"").replace(/\s+$/,"");
+						y = lbls[3].replace(/^\s+/,"").replace(/\s+$/,"");
+						z = lbls[5].replace(/^\s+/,"").replace(/\s+$/,"");
+					}
+				}else{
+					var lbls = value.match(/(.*?)(and|&)(.*)/i);
+					if(lbls.length>2){
+						x = lbls[1].replace(/^\s+/,"").replace(/\s+$/,"");
+						y = lbls[3].replace(/^\s+/,"").replace(/\s+$/,"");
+					}
 				}
 			}
 			this.labelX.setLabel(x);
 			this.labelY.setLabel(y);
+			if(this.labelZ){
+				this.labelZ.setLabel(z);
+			}
 			this._labelsCreated = true;
-			
-			
-
-
 		},
 		getLabel: function(){
 			// summary:
 			//		Getter for the labels. returns an object.
 			//
-			if(!this.labelX){ return {}; }
+			if(!this.labelX){ return null; }
 			return {
-				x:this.labelX._text,
-				y:this.labelY._text
+				x:this.labelX.getText(),
+				y:this.labelY.getText(),
+				z:this.labelZ?this.labelZ.getText():null
 			}; // Object
 		},
-		
+
 		anchorPositionCheck: function(/*Number*/x, /*Number*/y, /*manager.Anchor*/anchor){
 			// summary:
 			//		Gets called from anchor to check if its current
@@ -151,21 +241,21 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			//
 			var pm = this.container.getParent().getTransform();
 			var am = anchor.shape.getTransform();
-			
+
 			// the xaxis point has changed and is not yet set as a point
 			//	- but the center should be good (except for the transform).
 			// Now check the yaxis point.
-			
+
 			var p = this.points;
 			var o = {x:am.dx+anchor.org.x+pm.dx, y:am.dy+anchor.org.y+pm.dy};
 			var c = {x:p[1].x+pm.dx, y:p[1].y+pm.dy};
 			var ox = c.x - (c.y - o.y);
 			var oy = c.y - (o.x - c.x);
-			
+
 			return {x:ox, y:oy};
-			
+
 		},
-		
+
 		onTransformBegin: function(/*manager.Anchor*/anchor){
 			// summary:
 			//		Overwrites _Base.onTransformBegin
@@ -173,7 +263,7 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			// called from anchor point up mouse down
 			this._isBeingModified = true;
 		},
-		
+
 		onTransformEnd: function(/*manager.Anchor*/anchor){
 			// summary:
 			//		Overwrites _Base.onTransformEnd
@@ -181,74 +271,81 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			// Gets called on anchor mouseup
 			//	also gets called by checkBounds - we don't want that.
 			if(!anchor){ return; }
-			
+
 			//	tell anchor to go to prev point if wrong
 			// called from anchor point up mouse up
-			
+
 			this._isBeingModified = false;
 			//this.deselect();
 			this._toggleSelected();
 			console.log("before:", Math.ceil(this.points[1].x), " x ", Math.ceil(this.points[1].y))
-			
+
 			var o = this.points[0];
 			var c = this.points[1];
-			var pt = this.util.constrainAngle({start:{x:c.x, y:c.y}, x:o.x, y:o.y}, 91, 180);
-			
+			var obj = {start:{x:c.x,y:c.y},x:o.x, y:o.y};
+			var pt = this.util.constrainAngle(obj, 0, 89);
+			var zpt = this.style.zAxisEnabled ? this.zPoint(obj) : null;
+
 			if(pt.x==o.x && pt.y == o.y){
 				// we're within the constraint, so now we snap
-				var obj = {start:{x:c.x,y:c.y},x:o.x, y:o.y};
 				pt = this.util.snapAngle(obj, this.angleSnap/180);
-				
+
 				obj.x = pt.x;
 				obj.y = pt.y;
 				var ox = obj.start.x - (obj.start.y - obj.y);
 				var oy = obj.start.y - (obj.x - obj.start.x);
-				
+
 				if(ox<0 || oy<0){
 					console.warn("AXES ERROR LESS THAN ZERO - ABORT");
 					return;
 				}
 				this.points = [{x:obj.x, y:obj.y}, {x:obj.start.x, y:obj.start.y, noAnchor:true}];
 				this.points.push({x:ox, y:oy, noAnchor:true});
+				if(zpt){ this.points.push(zpt);}
 				this.setPoints(this.points);
-				
+
 				//this.select();
 				this.onModify(this);
 				return;
 			}
-			
+
 			// we're outside of the constraint. Set to the low or high.
 			this.points[0].x = pt.x
 			this.points[0].y = pt.y;
 			o = this.points[0];
-			
+
 			var ox = c.x - (c.y - o.y);
 			var oy = c.y - (o.x - c.x);
-			
+
 			this.points[2] = {x:ox, y:oy, noAnchor:true};
+			if(zpt){ this.points.push(zpt); }
 			this.setPoints(this.points);
-			
+
 			// reset handles render
 			//anchor.reset(this);
-			
+
 			this.labelX.setLabel();
 			this.labelY.setLabel();
-			
+			if(this.labelZ){
+				this.labelZ.setLabel();
+			}
+
 			//this.select();
 			this.onModify(this);
-				
+
 		},
-		
+
 		getBounds: function(/*Boolean*/absolute){
 			// summary:
 			//		Custom getBounds overwrites _Base.getBounds
 			//
 			var px = this.points[0],
-				pc = this.points[1],
-				py = this.points[2];
-				
+			    pc = this.points[1],
+			    py = this.points[2];
+			if(this.style.zAxisEnabled){ var pz = this.points[3]; }
+
 			if(absolute){
-				return {
+				var bounds = {
 					x:pc.x,
 					y:pc.y,
 					x1:pc.x,
@@ -258,13 +355,18 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 					x3:py.x,
 					y3:py.y
 				};
+				if(this.style.zAxisEnabled){
+					bounds.x4 = pz.x;
+					bounds.y4 = pz.y;
+				}
+				return bounds;
 			}
-			
-			var	x1 = py.x,
-				y1 = py.y < px.y ? py.y : px.y,
-				x2 = px.x,
-				y2 = pc.y;
-			
+
+			var x1 = this.style.zAxisEnabled ? (py.x < pz.x ? py.x : pz.x) : py.x;
+			    y1 = py.y < px.y ? py.y : px.y,
+			    x2 = px.x,
+			    y2 = this.style.zAxisEnabled ? pz.y : pc.y;
+
 			return {
 				x1:x1,
 				y1:y1,
@@ -276,7 +378,7 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 				h:y2-y1
 			};
 		},
-		
+
 		_postSetPoints: function(/*Array*/pts){
 			// summary:
 			// 		Because Axes only has one anchor,
@@ -287,97 +389,144 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 				this.data = this.pointsToData();
 			}
 		},
-		
+
 		onTransform: function(/*Number*/anchor){
 			// summary:
 			//		Overwrites _Base.onTransform
 			//
 			// the xaxis point has changed - the center will not.
 			// need to find the yaxis point.
-			
 			var o = this.points[0];
 			var c = this.points[1];
 			var ox = c.x - (c.y - o.y);
 			var oy = c.y - (o.x - c.x);
-			
+
 			// 'noAnchor' on a point indicates an anchor should
 			// not be rendered. This is the Y point being set.
 			this.points[2] = {x:ox, y:oy, noAnchor:true};
+			if(this.style.zAxisEnabled){
+				this.points[3] = this.zPoint({start:{x:c.x, y:c.y}, x:o.x, y:o.y});
+			}
 			this.setPoints(this.points);
 			if(!this._isBeingModified){
 				this.onTransformBegin();
 			}
-			this.render();	
+			this.render();
 		},
-		
+
 		pointsToData: function(){
 			//summary:
-			//		Converts points to data. 
+			//		Converts points to data.
 			var p = this.points;
-			return {
+			var d = {
 				x1:p[1].x,
 				y1:p[1].y,
 				x2:p[0].x,
 				y2:p[0].y,
 				x3:p[2].x,
 				y3:p[2].y
-			};
+			}
+			if(this.style.zAxisEnabled){
+				d.x4 = p[3].x;
+				d.y4 = p[3].y;
+				d.cosphi = 1;
+			}
+			return d;
+			
 		},
 		
+		getRadius: function(){
+			//summary:
+			//		Possibility of z-axis makes bounds unreliable.
+			//		Use these points instead.
+			var p = this.points;
+			var line = {start:{x:p[1].x, y:p[1].y}, x:p[0].x, y:p[0].y};
+			return this.util.length(line);
+		},
+
 		dataToPoints: function(/* ? Object*/o){
 			//summary:
-			//		Converts data to points. 
+			//		Converts data to points.
 			o = o || this.data;
 			if(o.radius || o.angle){
 				// instead of using x1,x2,y1,y1,
 				// it's been set as x,y,angle,radius
-				
-				o.angle = (180-o.angle)<0 ? 180-o.angle+360 : 180-o.angle;
-				var pt = this.util.pointOnCircle(o.x,o.y,o.radius,o.angle);
+				var pt = this.util.pointOnCircle(o.x,o.y,o.radius,o.angle), zpt;
 				var ox = o.x - (o.y - pt.y);
 				var oy = o.y - (pt.x - o.x);
-				
+				if((o.cosphi && o.cosphi==1) || this.style.zAxisEnabled){
+					this.style.zAxisEnabled = true;
+					zpt = this.util.pointOnCircle(o.x, o.y, o.radius*this.zScale, this.style.zAngle);
+				}
 				this.data = o = {
-					x2:o.x,
-					y2:o.y,
-					x1:pt.x,
-					y1:pt.y,
+					x1:o.x,
+					y1:o.y,
+					x2:pt.x,
+					y2:pt.y,
 					x3:ox,
 					y3:oy
 				}
-				
+				if(this.style.zAxisEnabled){
+					this.data.x4 = o.x4 = zpt.x;
+					this.data.y4 = o.y4 = zpt.y;
+					this.data.cosphi = 1;
+				}
+
 			}
 			this.points = [
-				{x:o.x1, y:o.y1},
-				{x:o.x2, y:o.y2, noAnchor:true},
+				{x:o.x2, y:o.y2},
+				{x:o.x1, y:o.y1, noAnchor:true},
 				{x:o.x3, y:o.y3, noAnchor:true}
 			];
+			if(this.style.zAxisEnabled){ this.points.push({x:o.x4, y:o.y4, skip:true, noAnchor:true}); }
 			return this.points;
 		},
-		
+
 		onDrag: function(/*EventObject*/obj){
 			// summary: See stencil._Base.onDrag
 			//
-			var pt = this.util.constrainAngle(obj, 91, 180);
+			var pt = this.util.constrainAngle(obj, 0, 89);
 			obj.x = pt.x;
 			obj.y = pt.y;
 			var ox = obj.start.x - (obj.start.y - obj.y);
 			var oy = obj.start.y - (obj.x - obj.start.x);
-			
+
 			if(ox<0 || oy<0){
 				return;
 			}
 			this.points = [{x:obj.x, y:obj.y}, {x:obj.start.x, y:obj.start.y, noAnchor:true}];
-			
+
 			this.points.push({x:ox, y:oy, noAnchor:true});
+			if(this.style.zAxisEnabled){
+				var zpt = this.zPoint(obj);
+				this.points.push(zpt);
+			}
 			this.render();
 		},
-		
+
 		onUp: function(/*EventObject*/obj){
 			// summary: See stencil._Base.onUp
 			//
+			if(!this._downOnCanvas){ return; }
+			this._downOnCanvas = false;
 			var p = this.points;
-			if(!p.length){ return; }
+			if(!p.length){
+				var s = obj.start, d = 100;
+				this.points = [
+					{x:s.x+d, y:s.y+d},
+					{x:s.x, y:s.y+d, noAnchor:true},
+					{x:s.x, y:s.y, noAnchor:true}
+				];
+				if(this.style.zAxisEnabled){
+					var zpt = this.zPoint({start:{x:s.x, y:s.y+d}, x:s.x+d, y:s.y+d});
+					this.points.push(zpt);
+				}
+				this.setPoints = this._postSetPoints;
+				this.pointsToData();
+				this.render();
+				this.onRender(this);
+				return;
+			}
 
 			var len = this.util.distance(p[1].x ,p[1].y ,p[0].x ,p[0].y );
 			if(!p || !p.length){
@@ -386,9 +535,12 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 				this.remove(this.shape, this.hit);
 				this.xArrow.remove(this.xArrow.shape, this.xArrow.hit);
 				this.yArrow.remove(this.yArrow.shape, this.yArrow.hit);
+				if(this.zArrow){
+				  this.zArrow.remove(this.zArrow.shape, this.zArrow.hit);
+				}
 				return;
 			}
-			
+
 			var o = p[0];
 			var c = p[1];
 			obj = {start:{x:c.x,y:c.y},x:o.x,y:o.y};
@@ -397,14 +549,14 @@ dojox.drawing.tools.custom.Axes = dojox.drawing.util.oo.declare(
 			obj.y = pt.y;
 			var ox = obj.start.x - (obj.start.y - obj.y);
 			var oy = obj.start.y - (obj.x - obj.start.x);
-			
+
 			if(ox<0 || oy<0){
 				return;
 			}
 			this.points = [{x:obj.x, y:obj.y}, {x:obj.start.x, y:obj.start.y, noAnchor:true}];
-			
-			this.points.push({x:ox, y:oy, noAnchor:true});
 
+			this.points.push({x:ox, y:oy, noAnchor:true});
+			if(this.style.zAxisEnabled){ this.points.push(this.zPoint(obj)); }
 			this.onRender(this);
 			this.setPoints = this._postSetPoints;
 		}