dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/geo/charting/resources/markers/USStates.json

@@ -0,0 +1 @@
+{"AK":"Alaska","AZ":"Arizona","AR":"Arkansas","AL":"Alabama","CA":"California","CO":"Colorado","CT":"Connecticut","DE":"Delaware","FL":"Florida","GA":"Georgia","HI":"Hawaii","ID":"Idaho","IL":"Illinois","IN":"Indiana","IA":"Iowa","KS":"Kansas","KY":"Kentucky","LA":"Louisiana","ME":"Maine","MD":"Maryland","MA":"Massachusetts","MI":"Michigan","MN":"Minnesota","MS":"Mississippi","MO":"Missouri","MT":"Montana","NE":"Nebraska","NV":"Nevada","NH":"New Hampshire","NJ":"New Jersey","NM":"New Mexico","NY":"New York","NC":"North Carolina","ND":"North Dakota","OH":"Ohio","OK":"Oklahoma","OR":"Oregon","PA":"Pennsylvania","RI":"Rhode Island","SC":"South Carolina","SD":"South Dakota","TN":"Tennessee","TX":"Texas","UT":"Utah","VT":"Vermont","VA":"Virginia","WA":"Washington","WV":"West Virginia","WI":"Wisconsin","WY":"Wyoming"}

data/dojo/dojox/geo/charting/tests/datastore/dataStore.json

@@ -0,0 +1 @@
+{"identifier":"product","idAttribute":"product","label":"product","items":[{"product":"A","RI":7.462633468705088,"VT":1.0747727711335298,"HI":5.799375636164497,"ME":1.451271727380056,"VA":2.829702713495596,"MI":5.642995600110112,"DE":2.739617463034918,"ID":2.363980549092777,"IA":7.431769770088566,"MD":3.0785135982470684,"MA":1.7526041060228308,"AR":3.8586965961630613,"IL":4.429268677942292,"UT":1.4132568641617622,"IN":4.278380121077843,"MN":1.7667677604047078,"AZ":3.1685622594553893,"MO":6.40609207972046,"MT":5.036396102947595,"MS":7.920510625004066,"NH":2.977852992201954,"NJ":2.461430896784907,"NM":3.4306577337265605,"AK":6.688941531884205,"TX":5.202925634638534,"AL":7.692293063159184,"NC":6.924791303917299,"ND":1.3405635123946729,"NE":7.346943668465221,"NY":1.2935641800689404,"GA":4.08670296798054,"NV":2.8711180855710277,"TN":1.3416175015158607,"CA":4.015213261575018,"OK":3.02496714656207,"OH":1.792609232572866,"WY":7.608889913812648,"FL":4.368006518751536,"SD":7.930294486276574,"SC":7.957055984959735,"CT":2.6728763876167614,"WV":4.255780823208815,"DC":5.395387240579556,"WI":4.784326367416636,"KY":3.651129497372101,"KS":3.0086097641736007,"OR":2.115203819157518,"LA":3.2780569441206597,"WA":3.9923853883717664,"CO":5.290220660909711,"PA":1.4671113212813398},{"product":"B","RI":2.9470583970267237,"VT":4.334786112963775,"HI":6.070796173591671,"ME":4.336621288458207,"VA":6.20175696720986,"MI":6.334154324461775,"DE":4.792811239106538,"ID":4.389359239090331,"IA":1.9661184800870801,"MD":5.756236356602298,"MA":4.012839038832301,"AR":2.793633122789072,"IL":6.135154709428018,"UT":6.03991623542826,"IN":5.176274161542879,"MN":5.170425364287389,"AZ":2.1165017165467477,"MO":7.920233551635202,"MT":1.774699183123111,"MS":1.2888449581107675,"NH":7.0217192826995785,"NJ":3.5506307229226706,"NM":6.947144396128179,"AK":2.7350354314410747,"TX":7.118848432784549,"AL":4.883187571500635,"NC":7.6167614725529,"ND":3.4612463164213474,"NE":7.922420589885434,"NY":2.8536865787421837,"GA":5.503458985754056,"NV":2.7692396472696212,"TN":4.7805039330413175,"CA":4.175191074281502,"OK":6.820814993149591,"OH":2.8984064050213147,"WY":7.020527487890209,"FL":2.2694006441255095,"SD":7.152114115436704,"SC":3.973937476383212,"CT":5.636515493115627,"WV":7.059387909024763,"DC":6.9056205706417835,"WI":5.6240988021597635,"KY":4.140016811323386,"KS":7.010403822988033,"OR":4.873229897102414,"LA":6.098124121408968,"WA":3.5554133439593727,"CO":1.937275724779035,"PA":4.75940985758743},{"product":"C","RI":1.2074466753785296,"VT":6.617436105834342,"HI":4.697509161561487,"ME":3.1088686222060367,"VA":5.872957606269008,"MI":4.024618246561426,"DE":3.9585379686245434,"ID":7.8416585697000425,"IA":3.489682499727144,"MD":3.1170657626377682,"MA":7.76565599420723,"AR":7.603449650746078,"IL":4.717735592494929,"UT":1.5803175554277038,"IN":7.643998085959517,"MN":5.356478878366911,"AZ":3.67461626909839,"MO":4.72922293396299,"MT":2.4435229295517003,"MS":3.0732051743984057,"NH":4.83887817749178,"NJ":6.596657639606401,"NM":1.0802902226979874,"AK":4.049974323500716,"TX":2.278906950168228,"AL":2.4415509912432922,"NC":2.7404045633321967,"ND":6.23201986587007,"NE":7.093010342038451,"NY":6.399092420250069,"GA":2.9948404421865757,"NV":7.033900428326745,"TN":1.1882280951000983,"CA":6.823138626862854,"OK":3.62394474425563,"OH":3.450998704349269,"WY":4.735236071458369,"FL":6.416733546730404,"SD":1.769750409562307,"SC":4.7879756840987255,"CT":6.815425126662755,"WV":1.511312413431492,"DC":7.322320914179946,"WI":4.079106562847658,"KY":3.923700373296553,"KS":4.838546507701023,"OR":6.203180320524466,"LA":7.243185616958894,"WA":6.106754429610711,"CO":7.840946973558862,"PA":4.4344721924586725},{"product":"D","RI":1.2022236908488764,"VT":5.601530537934105,"HI":7.98823439187739,"ME":6.576821723390931,"VA":7.598424970013759,"MI":4.892301292589833,"DE":4.706134644397956,"ID":3.2819669253017585,"IA":4.367959478515982,"MD":4.1272524998977165,"MA":6.382656672018984,"AR":3.338056333409133,"IL":1.2728200348383516,"UT":2.8266674081118937,"IN":2.4940612411705545,"MN":6.686100127368409,"AZ":2.5535707741883105,"MO":3.7747742199899834,"MT":1.1886214411767826,"MS":3.455393209276231,"NH":3.146077573640159,"NJ":4.916023983933398,"NM":4.680929334557893,"AK":5.1038191963023625,"TX":4.404324898795686,"AL":6.9740316852277955,"NC":4.542900404391572,"ND":5.255778252522007,"NE":7.989200540903272,"NY":3.3776231030828607,"GA":5.429773507852569,"NV":7.80606629341678,"TN":3.5196556629290066,"CA":6.913388977328004,"OK":1.950306463065874,"OH":1.302371163874461,"WY":1.7379167849736277,"FL":5.327861664787736,"SD":5.280011877228484,"SC":2.5321366578583206,"CT":5.3144515392679255,"WV":4.874888789038608,"DC":6.724679387948305,"WI":2.621380948788093,"KY":7.011165058576961,"KS":1.5449902827748572,"OR":7.768577037173249,"LA":1.8036415082278823,"WA":1.732823409485524,"CO":4.423444682592455,"PA":2.18762312089173},{"product":"E","RI":5.336555888565814,"VT":1.0269790425535916,"HI":4.302563298587832,"ME":3.5724702450532466,"VA":6.831672869287192,"MI":5.841692237874203,"DE":6.3210708958870025,"ID":3.0898380630073805,"IA":4.5199219377280055,"MD":7.8181166845833205,"MA":4.019721504084284,"AR":6.512583206399277,"IL":1.7007627849754259,"UT":1.0815447688155322,"IN":1.787241877286224,"MN":7.469892254454771,"AZ":7.817360613731682,"MO":3.3997756093386364,"MT":4.224401905364161,"MS":4.508629658106982,"NH":1.2632305524264855,"NJ":4.701696505102892,"NM":5.47647625941286,"AK":3.9152756901086487,"TX":3.1576233124749526,"AL":2.2917408066041483,"NC":2.0755691993817473,"ND":5.325032727915971,"NE":2.927511429138325,"NY":5.657408134539319,"GA":3.294238443754315,"NV":4.940580685415601,"TN":4.603374210925091,"CA":2.5473065533439243,"OK":7.440561470100394,"OH":1.697609380742739,"WY":2.274061647528429,"FL":7.996199616455465,"SD":6.922252245680076,"SC":1.9476523802193761,"CT":1.1528556132155998,"WV":7.191316742246152,"DC":6.273644618980395,"WI":4.180898503926013,"KY":3.182432928256528,"KS":6.5107035581665,"OR":2.674319719539893,"LA":4.982553911643511,"WA":6.050769205402196,"CO":5.719668858432843,"PA":6.791868818969979},{"product":"F","RI":4.805973785497435,"VT":3.9031095011563894,"HI":3.1854036054807247,"ME":4.053738413897133,"VA":3.2541882054937004,"MI":6.916968066150325,"DE":4.062622282541687,"ID":7.694321141711409,"IA":2.3885853819870526,"MD":5.2577028591662796,"MA":6.71460109405472,"AR":6.133412627807536,"IL":6.12942242973636,"UT":3.751551803308776,"IN":4.164258613108823,"MN":2.4208680122106023,"AZ":5.0774775275939295,"MO":4.901096158864598,"MT":1.1189525043098927,"MS":5.629751031578719,"NH":4.069556903053635,"NJ":1.6249601330285928,"NM":4.080433278299856,"AK":2.1964811712956833,"TX":4.482720292130193,"AL":6.329134692543736,"NC":4.237923730870627,"ND":7.291443563063384,"NE":5.722982572330906,"NY":1.6116565933790064,"GA":7.2475665993045,"NV":6.357239913493795,"TN":1.4739041520367284,"CA":3.0654523114201715,"OK":2.625502092462915,"OH":1.974214187400741,"WY":1.1388727636318952,"FL":7.275998491430551,"SD":3.32461508791004,"SC":4.204106357741368,"CT":4.488038450352336,"WV":5.211032258922352,"DC":6.126512771236528,"WI":1.5226396670937468,"KY":3.816749617578834,"KS":2.768884723603035,"OR":3.7605674376303915,"LA":3.380563337159254,"WA":6.936998185455377,"CO":2.2900916156515403,"PA":5.160881598376808}]}

data/dojo/dojox/geo/charting/tests/test_mapWithCharting.html

@@ -0,0 +1,72 @@
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Chart: Map&Chart</title>
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/tests/css/dijitTests.css";
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../resources/Map.css";
+			.mapContainer {
+				display: none;
+				width: 810px;
+				height: 400px;
+				border: solid 1px;
+			}
+			
+			.mapVerticalContainer {
+				display: none;
+				width: 405px;
+				height: 500px;
+				border: solid 1px;
+			}
+		</style>
+		<script type="text/javascript" djConfig="parseOnLoad:true,gfxRenderer:'svg,vml,silverlight'" src="../../../../dojo/dojo.js"></script>
+		<script type="text/javascript">
+			dojo.require("dojox.geo.charting.Map");
+			dojo.require("dojox.charting.DataChart");
+			dojo.require("dojo.data.ItemFileReadStore");
+			var chartStore = new dojo.data.ItemFileReadStore({
+				url: "datastore/dataStore.json"
+			});
+			var chart;
+			dojo.addOnLoad(function(){
+				chart = new dojox.charting.DataChart("chartDiv", {
+					displayRange: 8,
+					yaxis: {
+						max: 8,
+						min: 1,
+						majorTickStep: 1,
+						labelFunc: "seriesLabels",
+						maxLabelSize: 30
+					},
+					scroll: false
+				});
+				chart.addPlot("default", {
+					type: "Bars",
+					gap: 2,
+					animate: {
+						duration: 1000
+					}
+				});
+				
+				var map = new dojox.geo.charting.Map("map", "../resources/data/USStates.json");
+				map.setMarkerData("../resources/markers/USStates.json");
+				map.onFeatureClick = function(feature){
+					if (!feature._isFocused) {
+						chart.setStore(chartStore, {
+							product: "*"
+						}, feature.id);
+					}
+				};
+			});
+		</script>
+	</head>
+	<body class="tundra">
+		<h1>Map connect with DataChart(Click on map)</h1>
+		<div style="width:610px;height:400px;border:solid 1px;background:#f5f5f5;" id="map">
+		</div>
+		<div id="chartDiv" style="width: 400px; height: 150px;">
+		</div>
+	</body>
+</html>

data/dojo/dojox/geo/charting/tests/test_mapWithLegend.html

@@ -0,0 +1,63 @@
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title>Chart: Map&Legend</title>
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/tests/css/dijitTests.css";
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../resources/Map.css";
+		</style>
+		<script type="text/javascript" djConfig="parseOnLoad:true,gfxRenderer:'svg,vml,silverlight'" src="../../../../dojo/dojo.js"></script>
+		<script type="text/javascript">
+			dojo.require("dojox.geo.charting.Map");
+			dojo.require("dojox.geo.charting.widget.Legend");
+			dojo.require("dojo.data.ItemFileReadStore");
+			dojo.addOnLoad(function(){
+				//create new map
+				var map = new dojox.geo.charting.Map("USStates", "../resources/data/USStates.json");
+				//add outside map marker file
+				map.setMarkerData("../resources/markers/USStates.json");
+				//set data store to map
+				var dataStore = new dojo.data.ItemFileReadStore({
+					url: "datastore/dataStore.json"
+				});
+				map.setDataStore(dataStore, {
+					product: "A"
+				});
+				//add series to map 
+				map.addSeries([{
+					name: "Low sales state(0~$3.0M)",
+					min: "0.0",
+					max: "3.0",
+					color: "#FFCE52"
+				}, {
+					name: "Normal sales state($3.0M~$6.0M)",
+					min: "3.0",
+					max: "6.0",
+					color: "#63A584"
+				}, {
+					name: "High sales state($6.0M~$10.0M)",
+					min: "6.0",
+					max: "9.0",
+					color: "#CE6342"
+				}]);
+				//declare associated legend
+				var legend = new dojox.geo.charting.widget.Legend({
+					map: map
+				});
+				//map marker customization
+				map.onFeatureOver = function(feature){
+					if(!feature.markerText){
+						feature.markerText = map.mapObj.marker.markerData[feature.id] + ": $" + feature.value.toFixed(3) + "M";
+					}
+				};
+			});
+		</script>
+	</head>
+	<body class="tundra">
+		<h1>Map with series, data, legend</h1>
+		<div id="USStates" style="width:900px;height:500px;border:1px solid;">
+		</div>
+	</body>
+</html>

data/dojo/dojox/geo/charting/tests/test_maps.html

@@ -0,0 +1,37 @@
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Chart: Map</title>
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/tests/css/dijitTests.css";
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../resources/Map.css";
+			.mapContainer {
+				display: none;
+				width: 810px;
+				height: 400px;
+				border: solid 1px;
+			}
+			
+			.mapVerticalContainer {
+				display: none;
+				width: 405px;
+				height: 500px;
+				border: solid 1px;
+			}
+		</style>
+		<script type="text/javascript" djConfig="parseOnLoad:true,gfxRenderer:'svg,vml,silverlight'" src="../../../../dojo/dojo.js"></script>
+		<script type="text/javascript">
+			dojo.require("dojox.geo.charting.Map");
+			dojo.addOnLoad(function(){
+				var USStates = new dojox.geo.charting.Map("USStates", "../resources/data/USStates.json");
+				USStates.setMarkerData("../resources/markers/USStates.json");
+			});
+		</script>
+	</head>
+	<body class="tundra">
+		<h1>Simple Maps,support zoom in and zoom out.</h1>
+		<div class="mapContainer" style="display:block;" id="USStates"></div>
+	</body>
+</html>

data/dojo/dojox/geo/charting/widget/Legend.js

@@ -0,0 +1,62 @@
+dojo.provide("dojox.geo.charting.widget.Legend");
+
+dojo.require("dijit._Widget");
+dojo.require("dijit._Templated");
+dojo.require("dojox.lang.functional.array");
+dojo.require("dojox.lang.functional.fold");
+
+dojo.declare("dojox.geo.charting.widget.Legend",[dijit._Widget, dijit._Templated], {
+	templateString: "<table dojoAttachPoint='legendNode' class='dojoxLegendNode'><tbody dojoAttachPoint='legendBody'></tbody></table>",
+	horizontal:true,
+	legendNode:null,
+	legendBody:null,
+	swatchSize:18,
+	postCreate: function(){
+		if(!this.map){return;}
+		this.series = this.map.series;
+		dojo.byId(this.map.container).appendChild(this.domNode);
+		this.refresh();
+	},
+	refresh:function(){
+		// cleanup
+		while(this.legendBody.lastChild){
+			dojo.destroy(this.legendBody.lastChild);
+		}
+		
+		if(this.horizontal){
+			dojo.addClass(this.legendNode,"dojoxLegendHorizontal");
+			this._tr = dojo.doc.createElement("tr");
+			this.legendBody.appendChild(this._tr);
+		}
+		
+		var s = this.series;
+		if(s.length == 0){return;}
+		
+		dojo.forEach(s,function(x){
+			this._addLabel(x.color, x.name);
+		},this);
+	},
+	_addLabel:function(color,label){
+		var icon = dojo.doc.createElement("td");
+		var text = dojo.doc.createElement("td");
+		var div = dojo.doc.createElement("div");
+		dojo.addClass(icon, "dojoxLegendIcon");
+		dojo.addClass(text, "dojoxLegendText");
+		div.style.width  = this.swatchSize + "px";
+		div.style.height = this.swatchSize + "px";
+		icon.appendChild(div);
+		
+		if(this.horizontal){
+			this._tr.appendChild(icon);
+			this._tr.appendChild(text);
+		}else{
+			var tr = dojo.doc.createElement("tr");
+			this.legendBody.appendChild(tr);
+			tr.appendChild(icon);
+			tr.appendChild(text);
+		}
+		
+		div.style.background = color;
+		text.innerHTML = String(label);
+	}
+});

data/dojo/dojox/gfx/README

@@ -5,13 +5,17 @@ Version 1.100
 Release date: 08/01/2006
 -------------------------------------------------------------------------------
 Project state:
-beta
-HTMLCanvas renderer: experimental
+SVG renderer: production
+VML renderer: production
+Silverlight renderer: beta
+HTMLCanvas renderer: beta
+SVGWeb integration: experimental
 -------------------------------------------------------------------------------
 Credits
 	Eugene Lazutkin (eugene.lazutkin@gmail.com)
 	Kun Xi (bookstack@gmail.com)
 	Chris Mitchell (ccmitchellusa@gmail.com) HTML Canvas
+	Yang Li () SVGWeb integration
 -------------------------------------------------------------------------------
 Project description
 
@@ -87,6 +91,9 @@ Known Bugs:
    track skew matrix with Shape, and perform other trans/rot/scale transformations without
    using canvas transform functions.
 
+SVGWeb Integration Status
+
+See README-svgweb.
 
 -------------------------------------------------------------------------------
 Installation instructions

data/dojo/dojox/gfx/README-svgweb

@@ -0,0 +1,98 @@
+NOTICE of 3rd party code included
+=================================
+For ease of testing, latest SVGWeb release is included, see
+dojox/gfx/tests/svgweb/README for details.
+
+
+============================================================
+Enable or disable the SVGWeb with dojo gfx
+------------------------------------------------------------
+
+The function is only enabled when SVGWeb JS is included and the gfx renderer is
+'svg'. If either SVGWeb is not available or the renderer is not 'svg', dojox.gfx
+works as usual.
+
+To enable SVGWeb with dojo gfx:
+
+1. Include SVGWeb JS at the FIRST of all your javascripts
+
+	<meta name="svg.render.forceflash" content="true"/>
+	<script src="<path>/svgweb/src/svg.js" data-path="<path>/svgweb/src"></script>
+
+2. Force 'svg' renderer with the 'forceGfxRenderer' config
+
+	<script src="<path>/dojo/dojo.js" djConfig="forceGfxRenderer:'svg'"></script>
+
+
+============================================================
+Test dojo gfx + SVGWeb
+------------------------------------------------------------
+
+All SVGWeb-specific tests are in dojox/gfx/tests/svgweb.
+
+============================================================
+GFX Performance Test Status
+------------------------------------------------------------
+
+Runs dojo gfx performance tests on IE7 with different renderers, compare their
+performance. The result so far is
+
+    * Silverlight is the fastest: 27,546 ms;
+    * Tuned SVGWeb is the 2nd place: 38,690 ms, almost 3 times faster than
+	  before
+    * VML is the slowest: 50,250 ms
+
+
+============================================================
+GFX Functional Test Status
+------------------------------------------------------------
+
+Summary / General findings
+
+    * Pass rate 83%, 25 out of 30 pass
+    * The behavior is very consistent on IE & FF
+    * Transformation of Text is not working
+    * Line style is not working
+    * getTextWidth() does not work, see svgweb bug 417
+    * IE7 has memory issue, see svgweb bug 418 (IE8 seems fine)
+
+PASS test.roundrect.html
+PASS test_arc.html
+PASS test_bezier.html
+PASS test_decompose.html
+PASS test_destroy.html
+PASS test_fill.html
+
+FAIL test_fx.html: mostly works, except for the transformation of text (svgweb bug 158)
+
+PASS test_fx_shapes.html
+PASS test_gfx.html
+PASS test_gradient.html: works, but performance is slow due to the creation of a lot of shapes; using suspendRedraw() helps, but not much; current time is 8.5 seconds on IE7, 3 seconds on FF 3.5
+PASS test_group1.html: partly works, but rect highlight change has problem (svgweb bug 296)
+PASS test_group2.html: works, with source changed from 'dijit.byId()' to 'dojo.byId()'
+PASS test_image1.html
+PASS test_image2.html: picture shows, but move and transform has serious problem (svgweb bug 296)
+
+FAIL test_image3.html: picture shows, but move and transform has serious problem (svgweb bug 427, 436)
+
+PASS test_image4.html
+PASS test_image5.html: still image gets cropped after dragging, but mostly it's working (svgweb bug 244)
+PASS test_linearGradient.html
+
+FAIL test_linestyle.html: not work (svgweb bug 65)
+
+PASS test_pattern.html
+PASS test_poly.html
+PASS test_resize.html
+PASS test_setPath.html
+PASS test_tbbox.html: output drawing is incorrect (svgweb bug 296)
+
+FAIL test_text.html: text shows, but the rotation still fails (svgweb bug 158)
+
+FAIL test_textpath.html: not work (svgweb bug 169)
+
+PASS test_transform.html: output drawing is incorrect (svgweb bug 296)
+PASS test_utils.html
+PASS test_vectortext_draw.html
+PASS test_vectortext_load.html: functionally, this works, but very very slow; Reduced the test case to print just 26 chars, in FF it takes 30+ seconds, in IE7 it's more than a minute...
+

data/dojo/dojox/gfx/VectorText.js

@@ -71,13 +71,13 @@ dojo.require("dojox.html.metrics");
 			var r, tmp="";
 			while((r=this._entityRe.exec(str))!==null){
 				if(r[1].charAt(1)=="x"){
-					tmp+=String.fromCharCode(r[1].slice(2), 16);
+					tmp += String.fromCharCode(parseInt(r[1].slice(2), 16));
 				}
 				else if(!isNaN(parseInt(r[1].slice(1),10))){
-					tmp+=String.fromCharCode(r[1].slice(1));
+					tmp += String.fromCharCode(parseInt(r[1].slice(1), 10));
 				}
 				else {
-					tmp+=xmlEntityMap(r[1]);
+					tmp += xmlEntityMap[r[1]] || "";
 				}
 			}
 			return tmp;	//	String

data/dojo/dojox/gfx/_base.js

@@ -59,7 +59,7 @@ dojo.provide("dojox.gfx._base");
 		s.top = "0px";
 		s.width = "30px";
 		s.height = "1000em";
-		s.border = "0px";
+		s.borderWidth = "0px";
 		s.margin = "0px";
 		s.padding = "0px";
 		s.outline = "none";
@@ -107,7 +107,7 @@ dojo.provide("dojox.gfx._base");
 		}
 		// reset styles
 		m.className = "";
-		s.border = "0";
+		s.borderWidth = "0";
 		s.margin = "0";
 		s.padding = "0";
 		s.outline = "0";

data/dojo/dojox/gfx/arc.js

@@ -112,7 +112,7 @@ dojo.require("dojox.gfx.matrix");
 				result.push([c1.x, c1.y, c2.x, c2.y, e.x, e.y]);
 				startAngle += 2 * step;
 			}
-			return result;	// Object
+			return result;	// Array
 		}
 	});
 })();

data/dojo/dojox/gfx/gradient.js

@@ -0,0 +1,160 @@
+dojo.provide("dojox.gfx.gradient");
+
+dojo.require("dojox.gfx.matrix");
+
+// Various utilities to deal with a linear gradient (mostly VML-specific)
+
+(function(){
+	var d = dojo, m = dojox.gfx.matrix, C = d.Color;
+	
+	dojox.gfx.gradient.rescale = function(stops, from, to){
+		// summary:
+		//		recalculates a gradient from 0-1 window to
+		//		"from"-"to" window blending and replicating colors,
+		//		if necessary
+		// stops: Array:
+		//		input gradient as a list of colors with offsets
+		//		(see dojox.gfx.defaultLinearGradient and dojox.gfx.defaultRadialGradient)
+		// from: Number:
+		//		the beginning of the window, should be less than "to"
+		// to: Number:
+		//		the end of the window, should be more than "from"
+
+		var len = stops.length, reverseFlag = (to < from), newStops;
+
+		// do we need to reverse the color table?
+		if(reverseFlag){
+			var tmp = from;
+			from = to;
+			to = tmp;
+		}
+		
+		// various edge cases
+		if(!len){
+			// no colors
+			return [];
+		}
+		if(to <= stops[0].offset){
+			// all colors are before the color table
+			newStops = [
+				{offset: 0, color: stops[0].color},
+				{offset: 1, color: stops[0].color}
+			];
+		}else if(from >= stops[len - 1].offset){
+			// all colors are after the color table
+			newStops = [
+				{offset: 0, color: stops[len - 1].color},
+				{offset: 1, color: stops[len - 1].color}
+			];
+		}else{
+			// main scanning algorithm
+			var span = to - from, stop, prev, i;
+			newStops = [];
+			if(from < 0){
+				newStops.push({offset: 0, color: new C(stops[0].color)});
+			}
+			for(i = 0; i < len; ++i){
+				stop = stops[i];
+				if(stop.offset >= from){
+					break;
+				}
+				// skip this color
+			}
+			if(i){
+				prev = stops[i - 1];
+				newStops.push({
+					offset: 0,
+					color: d.blendColors(new C(prev.color), new C(stop.color), (from - prev.offset) / (stop.offset - prev.offset))
+				});
+			}else{
+				newStops.push({offset: 0, color: new C(stop.color)});
+			}
+			for(; i < len; ++i){
+				stop = stops[i];
+				if(stop.offset >= to){
+					break;
+				}
+				newStops.push({offset: (stop.offset - from) / span, color: new C(stop.color)});
+			}
+			if(i < len){
+				prev = stops[i - 1];
+				newStops.push({
+					offset: 1,
+					color: d.blendColors(new C(prev.color), new C(stop.color), (to - prev.offset) / (stop.offset - prev.offset))
+				});
+			}else{
+				newStops.push({offset: 1, color: new C(stops[len - 1].color)});
+			}
+		}
+		
+		// reverse the color table, if needed
+		if(reverseFlag){
+			newStops.reverse();
+			for(i = 0, len = newStops.length; i < len; ++i){
+				stop = newStops[i];
+				stop.offset = 1 - stop.offset;
+			}
+		}
+		
+		return newStops;
+	};
+	
+	function getPoint(x, y, matrix, project, shiftAndRotate, scale){
+		var r = m.multiplyPoint(matrix, x, y),
+			p = m.multiplyPoint(project, r);
+		return {r: r, p: p, o: m.multiplyPoint(shiftAndRotate, p).x / scale};
+	}
+	
+	function sortPoints(a, b){
+		return a.o - b.o;
+	}
+	
+	dojox.gfx.gradient.project = function(matrix, grad, tl, rb, ttl, trb){
+		// summary:
+		//		return a new gradient using the "VML algorithm" and suitable for VML
+		// matrix: dojox.gfx.Matrix2D|Null:
+		//		matrix to apply to a shape and its gradient
+		// grad: Object:
+		//		a linear gradient object to be transformed
+		// tl: dojox.gfx.Point:
+		//		top-left corner of shape's bounding box
+		// rb: dojox.gfx.Point:
+		//		right-bottom corner of shape's bounding box
+		// ttl: dojox.gfx.Point:
+		//		top-left corner of shape's transformed bounding box
+		// trb: dojox.gfx.Point:
+		//		right-bottom corner of shape's transformed bounding box
+		
+		matrix = matrix || m.identity;
+
+		var f1 = m.multiplyPoint(matrix, grad.x1, grad.y1),
+			f2 = m.multiplyPoint(matrix, grad.x2, grad.y2),
+			angle = Math.atan2(f2.y - f1.y, f2.x - f1.x),
+			project = m.project(f2.x - f1.x, f2.y - f1.y),
+			pf1 = m.multiplyPoint(project, f1),
+			pf2 = m.multiplyPoint(project, f2),
+			shiftAndRotate = new m.Matrix2D([m.rotate(-angle), {dx: -pf1.x, dy: -pf1.y}]),
+			scale = m.multiplyPoint(shiftAndRotate, pf2).x,
+			//comboMatrix = new m.Matrix2D([shiftAndRotate, project, matrix]),
+			// bbox-specific calculations
+			points = [
+					getPoint(tl.x, tl.y, matrix, project, shiftAndRotate, scale),
+					getPoint(rb.x, rb.y, matrix, project, shiftAndRotate, scale),
+					getPoint(tl.x, rb.y, matrix, project, shiftAndRotate, scale),
+					getPoint(rb.x, tl.y, matrix, project, shiftAndRotate, scale)
+				].sort(sortPoints),
+			from = points[0].o,
+			to   = points[3].o,
+			stops = dojox.gfx.gradient.rescale(grad.colors, from, to),
+			//angle2 = Math.atan2(Math.abs(points[3].r.y - points[0].r.y) * (f2.y - f1.y), Math.abs(points[3].r.x - points[0].r.x) * (f2.x - f1.x));
+			angle2 = Math.atan2(points[3].r.y - points[0].r.y, points[3].r.x - points[0].r.x);
+
+		return {
+			type: "linear",
+			x1: points[0].p.x, y1: points[0].p.y, x2: points[3].p.x, y2: points[3].p.y,
+			colors: stops,
+			// additional helpers (for VML)
+			angle: angle
+		};
+	};
+})();