dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/drawing/manager/Stencil.js

@@ -45,11 +45,11 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				//		them to this, but they won't have selection
 				//		or drag ability.
 				//
-				console.log("Selection.register ::::::", stencil.id)
+				console.log("Selection.register ::::::", stencil.id);
 				if(stencil.isText && !stencil.editMode && stencil.deleteEmptyCreate && !stencil.getText()){
 					// created empty text field
 					// defaults say to delete
-					console.warn("EMPTY CREATE DELETE", stencil)
+					console.warn("EMPTY CREATE DELETE", stencil);
 					stencil.destroy();
 					return false;
 				}
@@ -58,12 +58,12 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				
 				if(stencil.execText){
 					if(stencil._text && !stencil.editMode){
-						console.log("select text")
+						console.log("select text");
 						this.selectItem(stencil);
 					}
 					stencil.connect("execText", this, function(){
 						if(stencil.isText && stencil.deleteEmptyModify && !stencil.getText()){
-							console.warn("EMPTY MOD DELETE", stencil)
+							console.warn("EMPTY MOD DELETE", stencil);
 							// text deleted
 							// defaults say to delete
 							this.deleteItem(stencil);
@@ -95,7 +95,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				//		This doesn't delete them, only removes them from
 				// 		the list.
 				//
-				console.log("Selection.unregister ::::::", stencil.id, "sel:", stencil.selected)
+				console.log("Selection.unregister ::::::", stencil.id, "sel:", stencil.selected);
 				if(stencil){
 					stencil.selected && this.onDeselect(stencil);
 					delete this.stencils[stencil.id];
@@ -144,7 +144,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				this._throttleVrl = setTimeout(dojo.hitch(this, function(){
 					this._throttle = false;
 					this.saveMoveState();
-				}), this.throttleTime)
+				}), this.throttleTime);
 				if(this._throttle){ return; }
 				this._throttle = true;
 				
@@ -165,7 +165,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				// summary:
 				//		Event fired on deletion of a stencil
 				//
-				console.log("onDelete", noundo)
+				console.log("onDelete", noundo);
 				if(noundo!==true){
 					this.undo.add({
 						before:dojo.hitch(this, "unDelete", this.selectedStencils),
@@ -175,7 +175,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				this.withSelected(function(m){
 					this.anchors.remove(m);
 					var id = m.id;
-					console.log("delete:", m)
+					console.log("delete:", m);
 					m.destroy();
 					delete this.stencils[id];
 				});
@@ -256,7 +256,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				//		and determines how far left and up the selection
 				//		can go without going below zero
 				//
-				var t = Infinity; l = Infinity;
+				var t = Infinity, l = Infinity;
 				this.withSelected(function(m){
 					var o = m.getBounds();
 					t = Math.min(o.y1, t);
@@ -347,7 +347,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				// summary:
 				//		Event fired on the double-click of a stencil
 				//
-				console.info("mgr.onStencilDoubleClick:", obj)
+				console.info("mgr.onStencilDoubleClick:", obj);
 				if(this.selectedStencils[obj.id]){
 					if(this.selectedStencils[obj.id].edit){
 						console.info("Mgr Stencil Edit -> ", this.selectedStencils[obj.id]);
@@ -372,7 +372,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				// summary:
 				//		Event fired on mousedown on a stencil
 				//
-				console.info(" >>> onStencilDown:", obj.id, this.keys.meta)
+				console.info(" >>> onStencilDown:", obj.id, this.keys.meta);
 				if(!this.stencils[obj.id]){ return; }
 				this._isBusy = true;
 				
@@ -394,7 +394,7 @@ dojo.provide("dojox.drawing.manager.Stencil");
 					return;
 				
 				}else if(this.selectedStencils[obj.id]){
-					console.log("    clicked on selected")
+					console.log("    clicked on selected");
 					// clicking on same selected item(s)
 					// RESET OFFSETS
 					var mx = this.group.getTransform();
@@ -411,11 +411,11 @@ dojo.provide("dojox.drawing.manager.Stencil");
 					// meta-key add
 					//console.log("reset sel and add stencil")
 				}
-				console.log("    add stencil to selection")
+				console.log("    add stencil to selection");
 				// add a stencil
 				this.selectItem(obj.id);
 				
-				var mx = this.group.getTransform();
+				mx = this.group.getTransform();
 				this._offx = obj.x - mx.dx; 
 				this._offy = obj.y - mx.dx;
 				
@@ -458,7 +458,6 @@ dojo.provide("dojox.drawing.manager.Stencil");
 					
 					var x = obj.x - obj.last.x,
 						y = obj.y - obj.last.y,
-						mx = this.group.getTransform(),
 						c = this.constrain,
 						mz = this.defaults.anchors.marginZero;
 					
@@ -501,22 +500,22 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				//
 				this.deselect();
 			},
+						
 			
-			/*
-			onStencilOver: function(evt, stencil){
+			onStencilOver: function(obj){
 				// summary:
-				//		TODO: This is currently not supported.
-				console.log("OVER", surface)
-				dojo.style(surfaceNode, "cursor", "move");
+				//		This changes the cursor when hovering over
+				//		a selectable stencil.
+				//console.log("OVER")
+				dojo.style(obj.id, "cursor", "move");
 			},
-			
-			onStencilOut: function(evt, stencil){
+
+			onStencilOut: function(obj){
 				// summary:
-				//		TODO: This is currently not supported.
-				console.log("OUT")
-				dojo.style(surfaceNode, "cursor", "crosshair");
+				//		This restores the cursor.
+				//console.log("OUT")
+				dojo.style(obj.id, "cursor", "crosshair");
 			},
-			*/
 			
 			exporter: function(){
 				// summary:
@@ -529,6 +528,10 @@ dojo.provide("dojox.drawing.manager.Stencil");
 				return items; // Array
 			},
 			
+			listStencils: function(){
+				return this.stencils;
+			},
+			
 			toSelected: function(/*String*/func){
 				// summary:
 				//		Convenience function calls function *within*

data/dojo/dojox/drawing/manager/_registry.js

@@ -6,7 +6,8 @@ dojo.provide("dojox.drawing.manager._registry");
 		tool:{},
 		stencil:{},
 		drawing:{},
-		plugin:{}
+		plugin:{},
+		button:{}
 	};
 	
 	dojox.drawing.register = function(item, type){
@@ -18,6 +19,8 @@ dojo.provide("dojox.drawing.manager._registry");
 			_registered.stencil[item.name] = item;	
 		}else if(type=="plugin"){
 			_registered.plugin[item.name] = item;	
+		}else if(type=="button"){
+			_registered.button[item.toolType] = item;
 		}
 	};
 	

data/dojo/dojox/drawing/manager/keys.js

@@ -210,7 +210,7 @@ dojo.provide("dojox.drawing.manager.keys");
 				!isEdit && this.onKeyUp(this._mixin(evt));
 				
 				if(evt.keyCode==13){
-					console.warn("KEY ENTER")
+					console.warn("KEY ENTER");
 					this.onEnter(evt);
 					_stop = true;
 				}

data/dojo/dojox/drawing/plugins/_Plugin.js

@@ -31,7 +31,7 @@ dojox.drawing.plugins._Plugin = dojox.drawing.util.oo.declare(
 			// summary:
 			//		Removes connections based on passed
 			//		handles arguments
-			if(!handles) { return };
+			if(!handles){ return };
 			if(!dojo.isArray(handles)){ handles=[handles]; }
 			dojo.forEach(handles, dojo.disconnect, dojo);
 		}

data/dojo/dojox/drawing/plugins/drawing/Grid.js

@@ -14,6 +14,9 @@ dojox.drawing.plugins.drawing.Grid = dojox.drawing.util.oo.declare(
 		if(options.gap){
 			this.major = options.gap;
 		}
+		this.majorColor = options.majorColor || this.majorColor;
+		this.minorColor = options.minorColor || this.minorColor;
+
 		this.setGrid();
 		dojo.connect(this.canvas, "setZoom", this, "setZoom");
 	},
@@ -26,6 +29,14 @@ dojox.drawing.plugins.drawing.Grid = dojox.drawing.util.oo.declare(
 		major:100,
 		minor:0,
 		//
+		// majorColor: String
+		//		Major lines color
+		majorColor: "#00ffff",
+		//
+		// minorColor: String
+		//		Minor lines color
+		minorColor: "#d7ffff",
+		//
 		// zoom: [readonly] Number
 		//		The current zoom of the grid
 		zoom:1,
@@ -49,17 +60,17 @@ dojox.drawing.plugins.drawing.Grid = dojox.drawing.util.oo.declare(
 			
 			this.grid && this.grid.removeShape();
 			
-			var x1,x2,y1,y2,i,clr;
+			var x1,x2,y1,y2,i,clr,len;
 			var s = this.canvas.underlay.createGroup();
 			var w = 2000;//this.canvas.width;
 			var h = 1000;//this.canvas.height;
 			var b = 1;
-			var mj = "#00ffff";
-			var mn = "#d7ffff";
+			var mj = this.majorColor;
+			var mn = this.minorColor;
 			
 			var createGridLine = function(x1,y1,x2,y2, c){
 				s.createLine({x1: x1, y1: y1, x2: x2, y2: y2}).setStroke({style: "Solid", width: b, cap: "round", color:c});
-			}
+			};
 			
 			// horz
 			for(i=1,len = h/mnr; i<len; i++){

data/dojo/dojox/drawing/plugins/drawing/Silverlight.js

@@ -147,7 +147,7 @@ dojox.drawing.plugins.drawing.Silverlight = dojox.drawing.util.oo.declare(
 		}
 		
 		this.util.attr = function(/* Object */ elem, /* property */ prop, /* ? value */ value, squelchErrors){
-			if(!elem) { return false; }
+			if(!elem){ return false; }
 			try{
 				
 				var t;

data/dojo/dojox/drawing/plugins/tools/Pan.js

@@ -16,16 +16,15 @@ dojox.drawing.plugins.tools.Pan = dojox.drawing.util.oo.declare(
 	//
 	dojox.drawing.plugins._Plugin,
 	function(options){
-		
 		this.domNode = options.node;
 		var _scrollTimeout;
 		this.toolbar = options.scope;
 		this.connect(this.toolbar, "onToolClick", this, function(){
 			this.onSetPan(false)
 		});
-		this.connect(this.button, "onClick", this, "onSetPan");
 		this.connect(this.keys, "onKeyUp", this, "onKeyUp");
 		this.connect(this.keys, "onKeyDown", this, "onKeyDown");
+		this.connect(this.keys, "onArrow", this, "onArrow");
 		this.connect(this.anchors, "onAnchorUp", this, "checkBounds");
 		this.connect(this.stencils, "register", this, "checkBounds");
 		this.connect(this.canvas, "resize", this, "checkBounds");
@@ -44,6 +43,7 @@ dojox.drawing.plugins.tools.Pan = dojox.drawing.util.oo.declare(
 		
 	},{
 		selected:false,
+		keyScroll:false,
 		type:"dojox.drawing.plugins.tools.Pan",
 		
 		onPanUp: function(obj){
@@ -53,8 +53,13 @@ dojox.drawing.plugins.tools.Pan = dojox.drawing.util.oo.declare(
 		},
 		
 		onKeyUp: function(evt){
-			if(evt.keyCode == 32){
-				this.onSetPan(false);
+			switch(evt.keyCode){
+				case 32:
+					this.onSetPan(false);
+					break;
+				case 39: case 37: case 38: case 40:
+					clearInterval(this._timer);
+					break;
 			}
 		},
 		
@@ -64,6 +69,16 @@ dojox.drawing.plugins.tools.Pan = dojox.drawing.util.oo.declare(
 			}
 		},
 		
+		interval: 20,
+		
+		onArrow: function(evt){
+			if(this._timer){ clearInterval(this._timer); }
+			this._timer = setInterval(dojo.hitch(this,function(evt){
+				this.canvas.domNode.parentNode.scrollLeft += evt.x*10;
+				this.canvas.domNode.parentNode.scrollTop += evt.y*10;
+			},evt), this.interval);
+		},
+		
 		onSetPan: function(/*Boolean | Event*/ bool){
 			if(bool === true || bool === false){
 				this.selected = !bool;
@@ -87,6 +102,14 @@ dojox.drawing.plugins.tools.Pan = dojox.drawing.util.oo.declare(
 			this.canvas.onScroll();
 		},
 		
+		onUp: function(obj){
+			if(obj.withinCanvas){
+				this.keyScroll = true;
+			}else{
+				this.keyScroll = false;
+			}
+		},
+		
 		onStencilUp: function(obj){
 			// this gets called even on click-off because of the
 			// issues with TextBlock deselection
@@ -212,7 +235,8 @@ dojox.drawing.plugins.tools.Pan = dojox.drawing.util.oo.declare(
 dojox.drawing.plugins.tools.Pan.setup = {
 	name:"dojox.drawing.plugins.tools.Pan",
 	tooltip:"Pan Tool",
-	iconClass:"iconPan"
+	iconClass:"iconPan",
+	button:false
 };
 
 dojox.drawing.register(dojox.drawing.plugins.tools.Pan.setup, "plugin");

data/dojo/dojox/drawing/plugins/tools/Zoom.js

@@ -5,7 +5,7 @@ dojo.require("dojox.drawing.plugins._Plugin");
 	//
 	// 	zoomInc: Float
 	//		The amount of zoom that will occur upon each click.
-	var zoomInc = .1,
+	var zoomInc = Math.pow(2.0,0.25),
 	//
 	//	maxZoom: Number
 	//		The maximum the canvas can be zoomed in. 10 = 1000%
@@ -13,7 +13,7 @@ dojo.require("dojox.drawing.plugins._Plugin");
 	//
 	//	minZoom: Float
 	//		The most the canvas can be zoomed out. .1 = 10%
-	minZoom = .1,
+	minZoom = 0.1,
 	//
 	//	zoomFactor: [readonly] Float
 	//		The current zoom amount
@@ -47,7 +47,7 @@ dojo.require("dojox.drawing.plugins._Plugin");
 				// summary:
 				//		Handles zoom in.
 				//
-				zoomFactor += zoomInc;
+				zoomFactor *= zoomInc;
 				zoomFactor = Math.min(zoomFactor, maxZoom);
 				this.canvas.setZoom(zoomFactor);
 				this.mouse.setZoom(zoomFactor);
@@ -92,7 +92,7 @@ dojo.require("dojox.drawing.plugins._Plugin");
 				// summary:
 				//		Handles zoom out.
 				//
-				zoomFactor -= zoomInc;
+				zoomFactor /= zoomInc;
 				zoomFactor = Math.max(zoomFactor, minZoom);
 				this.canvas.setZoom(zoomFactor);
 				this.mouse.setZoom(zoomFactor);

data/dojo/dojox/drawing/stencil/Ellipse.js

@@ -78,7 +78,7 @@ dojox.drawing.stencil.Ellipse = dojox.drawing.util.oo.declare(
 			this[shp] = this.container.createEllipse(d)
 				.setStroke(sty)
 				.setFill(sty.fill);
-			this.util.attr(this[shp], "drawingType", "stencil");
+			this._setNodeAtts(this[shp]);
 		},
 		
 		render: function(){

data/dojo/dojox/drawing/stencil/Line.js

@@ -57,23 +57,6 @@ StencilPoints: [
 				// instead of using x1,x2,y1,y1,
 				// it's been set as x,y,angle,radius
 				
-				// forward angle:
-				// 90 -> 90
-				// 180 -> 0
-				// 0 -> 180
-				// 270 -> 270
-				// 120 -> 60
-				// 40 -> 140
-				// 315 -> 220
-				// 200 -> 340
-				
-				// reversing the angle for display: 0 -> 180, 90 -> 270
-				//angle = 180 - angle; angle = angle==360 ? 0 : angle;
-				
-				var was = o.angle
-				o.angle = (180-o.angle)<0 ? 180-o.angle+360 : 180-o.angle;
-				
-				//console.log(" ---- angle:", was, "to:", o.angle)
 				var pt = this.util.pointOnCircle(o.x,o.y,o.radius,o.angle);
 				//console.log(" ---- pts:", pt.x, pt.y);
 				this.data = o = {

data/dojo/dojox/drawing/stencil/Path.js

@@ -45,14 +45,16 @@ StencilPoints: [
 				// we'll need to build a string and set that.
 				var strAr = [];
 				dojo.forEach(this.points, function(o, i){
-					if(i==0){
-						strAr.push("M " + o.x +" "+ o.y);
-					}else{
-						var cmd = (o.t || "") + " ";
-						if(o.x===undefined){// Z + undefined works here, but checking anyway
-							strAr.push(cmd);
+					if(!o.skip){
+						if(i==0){
+							strAr.push("M " + o.x +" "+ o.y);
 						}else{
-							strAr.push(cmd + o.x +" "+ o.y); 
+							var cmd = (o.t || "") + " ";
+							if(o.x===undefined){// Z + undefined works here, but checking anyway
+								strAr.push(cmd);
+							}else{
+								strAr.push(cmd + o.x +" "+ o.y); 
+							}
 						}
 					}
 				}, this);
@@ -72,12 +74,14 @@ StencilPoints: [
 				this.closePath && this[shp].setFill(sty.fill);
 				
 				dojo.forEach(this.points, function(o, i){
-					if(i==0 || o.t=="M"){
-						this[shp].moveTo(o.x, o.y);
-					}else if(o.t=="Z"){
-						this.closePath && this[shp].closePath();
-					}else{
-						this[shp].lineTo(o.x, o.y);
+					if(!o.skip){
+						if(i==0 || o.t=="M"){
+							this[shp].moveTo(o.x, o.y);
+						}else if(o.t=="Z"){
+							this.closePath && this[shp].closePath();
+						}else{
+							this[shp].lineTo(o.x, o.y);
+						}
 					}
 				}, this);