Include updates from dojo in files that overlap with

dojotoolkit repository.

web-UI/dojotoolkit/dojox/sketch/Anchor.js

@@ -25,7 +25,8 @@ dojo.require("dojox.gfx");
 		this.zoom=function(pct){
 			if(this.shape){
 				var rs=Math.floor(size/pct);
-				this.shape.setShape({ x:an[id].x-rs, y:an[id].y-rs, width:rs*2, height:rs*2 }).setStroke({ color:"black", width:1/pct }); //For IE, maybe we need Math.ceil(1/pct)||1
+				var width=dojox.gfx.renderer=='vml'?1:1/pct
+				this.shape.setShape({ x:an[id].x-rs, y:an[id].y-rs, width:rs*2, height:rs*2 }).setStroke({ color:"black", width:width }); //For IE, maybe we need Math.ceil(1/pct)||1
 			}
 		}
 		/*this.doChange=function(pt){

web-UI/dojotoolkit/dojox/sketch/Annotation.js

@@ -210,19 +210,26 @@ dojo.require("dojox.sketch._Plugin");
 	};
 	p.zoom=function(pct){
 		pct = pct || this.figure.zoomFactor;
-		if(this.pathShape){
-			var s=dojo.clone(this.property('stroke'));
-			s.width=pct>1?s.width:Math.ceil(s.width/pct)+"px";
-			this.pathShape.setStroke(s);
-		}
 		if(this.labelShape){
 			var f=dojo.clone(this.property('font'));
 			f.size=Math.ceil(f.size/pct)+"px";
 			this.labelShape.setFont(f);
 		}
+
 		for(var n in this.anchors){
 			this.anchors[n].zoom(pct);
 		}
+
+		//In VML, path are always the same width no matter scaling factors,
+		//so aways use 1 for VML
+		if(dojox.gfx.renderer=='vml'){
+        	pct=1;
+        }
+		if(this.pathShape){
+			var s=dojo.clone(this.property('stroke'));
+			s.width=pct>1?s.width:Math.ceil(s.width/pct)+"px";
+			this.pathShape.setStroke(s);
+		}
 	};
 	p.writeCommonAttrs=function(){
 		return 'id="' + this.id + '" dojoxsketch:type="' + this.type() + '"'

web-UI/dojotoolkit/dojox/sketch/DoubleArrowAnnotation.js

@@ -193,13 +193,12 @@ dojo.require("dojox.sketch.Anchor");
 	p.zoom=function(pct){
 		if(this.startArrow){
 			pct = pct || this.figure.zoomFactor;
-			if(this._curPct!==pct){
-				this._curPct=pct;
-				var l=pct>1?20:Math.floor(20/pct), w=pct>1?5:Math.floor(5/pct),h=pct>1?3:Math.floor(3/pct);
-				this.startArrow.setShape("M0,0 l"+l+",-"+w+" -"+h+","+w+" "+h+","+w+" Z");//.setFill(this.property('fill'));
-				this.endArrow.setShape("M" + this.end.x + "," + this.end.y + " l-"+l+",-"+w+" "+h+","+w+" -"+h+","+w+" Z");
-			}
 			ta.Annotation.prototype.zoom.call(this,pct);
+
+			var l=pct>1?20:Math.floor(20/pct), w=pct>1?5:Math.floor(5/pct),h=pct>1?3:Math.floor(3/pct);
+			this.startArrow.setShape("M0,0 l"+l+",-"+w+" -"+h+","+w+" "+h+","+w+" Z");//.setFill(this.property('fill'));
+
+			this.endArrow.setShape("M" + this.end.x + "," + this.end.y + " l-"+l+",-"+w+" "+h+","+w+" -"+h+","+w+" Z");
 		}
 	};
 

web-UI/dojotoolkit/dojox/sketch/PreexistingAnnotation.js

@@ -137,8 +137,9 @@ dojo.require("dojox.sketch.Anchor");
 	p.zoom=function(pct){
 		if(this.rectShape){
 			pct = pct || this.figure.zoomFactor;
-			this.rectShape.setStroke({color:this.property('fill'), width:1/pct});
 			ta.Annotation.prototype.zoom.call(this,pct);
+			pct = dojox.gfx.renderer=='vml'?1:pct;
+			this.rectShape.setStroke({color:this.property('fill'), width:1/pct});
 		}
 	};
 	p.serialize=function(){

web-UI/dojotoolkit/dojox/sketch/SingleArrowAnnotation.js

@@ -184,12 +184,13 @@ dojo.require("dojox.sketch.Anchor");
 	p.zoom=function(pct){
 		if(this.arrowhead){
 			pct = pct || this.figure.zoomFactor;
+			ta.Annotation.prototype.zoom.call(this,pct);
+			//pct = dojox.gfx.renderer=='vml'?1:pct;
 			if(this._curPct!==pct){
 				this._curPct=pct;
 				var l=pct>1?20:Math.floor(20/pct), w=pct>1?5:Math.floor(5/pct),h=pct>1?3:Math.floor(3/pct);
 				this.arrowhead.setShape("M0,0 l"+l+",-"+w+" -"+h+","+w+" "+h+","+w+" Z");
 			}
-			ta.Annotation.prototype.zoom.call(this,pct);
 		}
 	};
 

web-UI/dojotoolkit/dojox/sketch/Slider.js

@@ -4,6 +4,7 @@ dojo.require("dijit.form.Slider");
 dojo.declare("dojox.sketch.Slider",dojox.sketch._Plugin,{
 	_initButton: function(){
 		this.slider=new dijit.form.HorizontalSlider({minimum:20,maximum:200,value:20,style:"width:200px;float:right"});
+		this.slider._movable.node.title='Double Click to "Zoom to Fit"'; //I18N
 		this.connect(this.slider,'onChange','_setZoom');
 		this.connect(this.slider.sliderHandle,'ondblclick','_zoomToFit');
 	},

web-UI/dojotoolkit/dojox/sketch/UnderlineAnnotation.js

@@ -67,6 +67,7 @@ dojo.require("dojox.sketch.Anchor");
 				x:0, 
 				y:0, 
 				text:this.property('label'), 
+				decoration:"underline",
 				align:"start"
 			})
 			//.setFont(font)
@@ -92,8 +93,9 @@ dojo.require("dojox.sketch.Anchor");
 	};
 	p.getBBox=function(){
 		var b=this.getTextBox();
-//		console.log('getBBox',b,this.getLabel());
-		return { x:0, y:(b.h*-1+4)/this.figure.zoomFactor, width:(b.w+2)/this.figure.zoomFactor, height:b.h/this.figure.zoomFactor };
+		var z=this.figure.zoomFactor;
+
+		return { x:0, y:(b.h*-1+4)/z, width:(b.w+2)/z, height:b.h/z };
 	};
 	p.draw=function(obj){
 		this.apply(obj);
@@ -103,10 +105,12 @@ dojo.require("dojox.sketch.Anchor");
 		this.zoom();
 	};
 	p.zoom=function(pct){
-		if(this.lineShape){
+		if(this.labelShape){
 			pct = pct || this.figure.zoomFactor;
+			var textwidthadj=dojox.gfx.renderer=='vml'?0:2/pct;
 			ta.Annotation.prototype.zoom.call(this,pct);
-			this.lineShape.setShape({ x1:1, x2:this.labelShape.getTextWidth()+1, y1:2, y2:2 })
+			pct = dojox.gfx.renderer=='vml'?1:pct;
+			this.lineShape.setShape({ x1:0, x2:this.getBBox().width-textwidthadj, y1:2, y2:2 })
 				.setStroke({ color:this.property('fill'), width:1/pct });
 			if(this.mode==ta.Annotation.Modes.Edit){
 				this.drawBBox(); //the bbox is dependent on the size of the text, so need to update it here

web-UI/dojotoolkit/dojox/sketch/_Plugin.js

@@ -28,7 +28,7 @@ dojo.declare("dojox.sketch._Plugin", null, {
 			var className = this.iconClassPrefix+" "+this.iconClassPrefix + this.shape.charAt(0).toUpperCase() + this.shape.substr(1);
 			if(!this.button){
 				var props = {
-					label: this.shape,
+					label: this.shape, //I18N
 					showLabel: false,
 					iconClass: className,
 					dropDown: this.dropDown,