dojo_src 1.4.102 → 1.5.0

data/dojo/dijit/templates/MenuSeparator.html

@@ -1,6 +1,10 @@
 <tr class="dijitMenuSeparator">
-	<td colspan="4">
+	<td class="dijitMenuSeparatorIconCell">
 		<div class="dijitMenuSeparatorTop"></div>
 		<div class="dijitMenuSeparatorBottom"></div>
 	</td>
-</tr>
+	<td colspan="3" class="dijitMenuSeparatorLabelCell">
+		<div class="dijitMenuSeparatorTop dijitMenuSeparatorLabel"></div>
+		<div class="dijitMenuSeparatorBottom"></div>
+	</td>
+</tr>

data/dojo/dijit/templates/ProgressBar.html

@@ -5,5 +5,4 @@
 	></div
 	><div dojoAttachPoint="label" class="dijitProgressBarLabel" id="${id}_label">&nbsp;</div
 	><img dojoAttachPoint="indeterminateHighContrastImage" class="dijitProgressBarIndeterminateHighContrastImage" alt=""
-	></img
-></div>
+/></div>

data/dojo/dijit/templates/TimePicker.html

@@ -1,4 +1,4 @@
-<div id="widget_${id}" class="dijitMenu ${baseClass}"
+<div id="widget_${id}" class="dijitMenu"
     ><div dojoAttachPoint="upArrow" class="dijitButtonNode dijitUpArrowButton" dojoAttachEvent="onmouseenter:_buttonMouse,onmouseleave:_buttonMouse"
 		><div class="dijitReset dijitInline dijitArrowButtonInner" wairole="presentation" role="presentation">&nbsp;</div
 		><div class="dijitArrowButtonChar">&#9650;</div></div

data/dojo/dijit/templates/TitlePane.html

@@ -1,9 +1,11 @@
-<div class="${baseClass}">
-	<div dojoAttachEvent="onclick:_onTitleClick, onkeypress:_onTitleKey, onfocus:_handleFocus, onblur:_handleFocus, onmouseenter:_onTitleEnter, onmouseleave:_onTitleLeave"
-			class="dijitTitlePaneTitle" dojoAttachPoint="titleBarNode,focusNode">
-		<img src="${_blankGif}" alt="" dojoAttachPoint="arrowNode" class="dijitArrowNode" waiRole="presentation"
-		><span dojoAttachPoint="arrowNodeInner" class="dijitArrowNodeInner"></span
-		><span dojoAttachPoint="titleNode" class="dijitTitlePaneTextNode"></span>
+<div>
+	<div dojoAttachEvent="onclick:_onTitleClick, onkeypress:_onTitleKey"
+			class="dijitTitlePaneTitle" dojoAttachPoint="titleBarNode">
+		<div class="dijitTitlePaneTitleFocus" dojoAttachPoint="focusNode">
+			<img src="${_blankGif}" alt="" dojoAttachPoint="arrowNode" class="dijitArrowNode" waiRole="presentation"
+			/><span dojoAttachPoint="arrowNodeInner" class="dijitArrowNodeInner"></span
+			><span dojoAttachPoint="titleNode" class="dijitTitlePaneTextNode"></span>
+		</div>
 	</div>
 	<div class="dijitTitlePaneContentOuter" dojoAttachPoint="hideNode" waiRole="presentation">
 		<div class="dijitReset" dojoAttachPoint="wipeNode" waiRole="presentation">

data/dojo/dijit/templates/TreeNode.html

@@ -1,12 +1,12 @@
 <div class="dijitTreeNode" waiRole="presentation"
 	><div dojoAttachPoint="rowNode" class="dijitTreeRow" waiRole="presentation" dojoAttachEvent="onmouseenter:_onMouseEnter, onmouseleave:_onMouseLeave, onclick:_onClick, ondblclick:_onDblClick"
 		><img src="${_blankGif}" alt="" dojoAttachPoint="expandoNode" class="dijitTreeExpando" waiRole="presentation"
-		><span dojoAttachPoint="expandoNodeText" class="dijitExpandoText" waiRole="presentation"
+		/><span dojoAttachPoint="expandoNodeText" class="dijitExpandoText" waiRole="presentation"
 		></span
 		><span dojoAttachPoint="contentNode"
 			class="dijitTreeContent" waiRole="presentation">
-			<img src="${_blankGif}" alt="" dojoAttachPoint="iconNode" class="dijitTreeIcon" waiRole="presentation"
-			><span dojoAttachPoint="labelNode" class="dijitTreeLabel" wairole="treeitem" tabindex="-1" waiState="selected-false" dojoAttachEvent="onfocus:_onLabelFocus, onblur:_onLabelBlur"></span>
+			<img src="${_blankGif}" alt="" dojoAttachPoint="iconNode" class="dijitIcon dijitTreeIcon" waiRole="presentation"
+			/><span dojoAttachPoint="labelNode" class="dijitTreeLabel" wairole="treeitem" tabindex="-1" waiState="selected-false" dojoAttachEvent="onfocus:_onLabelFocus"></span>
 		</span
 	></div>
 	<div dojoAttachPoint="containerNode" class="dijitTreeContainer" waiRole="presentation" style="display: none;"></div>

data/dojo/dijit/tests/Tree.html

@@ -12,7 +12,7 @@
 	</style>
 
 	<!-- required: a default dijit theme: -->
-	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/tundra/tundra.css">
+	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/claro/claro.css">
 
 	<!-- required: dojo.js -->
 	<script type="text/javascript" src="../../dojo/dojo.js"
@@ -99,7 +99,7 @@
 							doh.t(myTree2.rootNode, "root node exists");
 							doh.t(myTree2.rootNode.isExpanded, "root node is expanded");
 							doh.t(myTree2.rootNode.getChildren()[3].isExpanded, "europe node is expanded");
-							doh.is(myTree2.rootNode.getChildren()[3].getChildren()[3], myTree2.lastFocused, "focused correct node");
+							doh.is(myTree2.rootNode.getChildren()[3].getChildren()[3], myTree2.selectedNode, "selected correct node");
 						}), 750);
 						return d;
 					},
@@ -107,13 +107,11 @@
 					function copyPath(){
 						var d = new doh.Deferred;
 
-						myTree.attr("path", myTree2.attr("path"));
-
-						setTimeout(d.getTestCallback(function(){
+						myTree.set("path", myTree2.get("path")).then(d.getTestCallback(function(){
 							doh.t(myTree.rootNode.isExpanded, "root node is expanded");
 							doh.t(myTree.rootNode.getChildren()[3].isExpanded, "europe node is expanded");
-							doh.is(myTree.rootNode.getChildren()[3].getChildren()[3], myTree.lastFocused, "focused correct node");
-						}), 500);
+							doh.is(myTree.rootNode.getChildren()[3].getChildren()[3], myTree.selectedNode, "selected correct node");
+						}));
 
 						return d;
 					},
@@ -124,20 +122,17 @@
 						runTest: function(){
 							var d = new doh.Deferred;
 
-							myTree.attr("path", ["earth", "NA", "CA", "Ottawa"]);
-
-							setTimeout(d.getTestErrback(function(){
-								var path = dojo.map(myTree.attr("path"), function(item){ return myTree.model.getIdentity(item); });
-								doh.is(["earth", "NA", "CA", "Ottawa"], path, "path got set on myTree")
-								myTree2.attr("path", path);
+							myTree.set("path", ["earth", "NA", "CA", "Ottawa"]).then(d.getTestErrback(function(){
+								var path = dojo.map(myTree.get("path"), function(item){ return myTree.model.getIdentity(item); });
+								doh.is(["earth", "NA", "CA", "Ottawa"], path, "path got set on myTree");
 
-								setTimeout(d.getTestCallback(function(){
+								myTree2.set("path", path).then(d.getTestCallback(function(){
 									doh.t(myTree2.rootNode.isExpanded, "root node is expanded");
 									doh.t(myTree2.rootNode.getChildren()[4].isExpanded, "north america node is expanded");
 									doh.t(myTree2.rootNode.getChildren()[4].getChildren()[1].isExpanded, "canada node is expanded");
-									doh.is(myTree2.rootNode.getChildren()[4].getChildren()[1].getChildren()[0], myTree2.lastFocused, "focused correct node");
-								}), 500);
-							}), 500);
+									doh.is(myTree2.rootNode.getChildren()[4].getChildren()[1].getChildren()[0], myTree2.selectedNode, "selected correct node");
+								}));
+							}));
 
 							return d;
 						}
@@ -188,18 +183,9 @@
 						return d;
 					},
 
-					function selectANode(){
-						var d = new doh.Deferred;
-
-						myTree.attr('selectedItem','CN');
-
-						// On IE it takes a little time for the attr('selectedItem', ...) to
-						// take effect because it calls node.focus() which takes time.
-						setTimeout(d.getTestCallback(function(){
-							doh.is('CN',myTree.model.getIdentity(myTree.attr('selectedItem')));
-						}), 250);
-
-						return d;
+					function selectAnItem(){
+						myTree.set('selectedItem','CN');
+						doh.is('CN',myTree.model.getIdentity(myTree.get('selectedItem')));
 					},
 
 					function nestedItemDelete(){
@@ -250,7 +236,7 @@
 	</script>
 
 </head>
-<body class="tundra">
+<body class="claro">
 
 	<h1 class="testTitle">Dijit.Tree automated tests</h1>
 	<div id="container"> <!--  tree will go here --></div>

data/dojo/dijit/tests/Tree_with_JRS.html

@@ -12,12 +12,12 @@
 	</style>
 
 	<!-- required: a default dijit theme: -->
-	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/tundra/tundra.css">
-
+	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/claro/claro.css">
+	
 	<!-- required: dojo.js -->
 	<script type="text/javascript" src="../../dojo/dojo.js"
 		djConfig="parseOnLoad: true, isDebug: true"></script>
-
+	
 	<!-- not needed, for testing alternate themes -->
 	<script type="text/javascript" src="_testCommon.js"></script>
 
@@ -51,8 +51,9 @@
 						myTree = new dijit.Tree({
 							id: "myTree",
 							model: myModel,
+							"label": "Example",
 							persist: false,		// persist==true is too hard to test
-							dndController: "dijit.tree.dndSource"
+							dndController: "dijit.tree.dndSource" 
 						});
 						doh.t(myTree, "tree created");
 
@@ -73,24 +74,33 @@
 						return d;
 					},
 
-					function openANode(){
-						var d = new doh.Deferred;
-
-						var first = myTree.rootNode.getChildren()[0];
-
-						myTree._onExpandoClick({node: first});
-						var firstFirst = first.getChildren()[0];
-						myTree._onExpandoClick({node: firstFirst});
-
-						setTimeout(d.getTestCallback(function(){
-							// Give the tree time to load the children, and the do checks that it
-							// loaded correctly
-
-							var children = firstFirst.getChildren();
-							doh.is(2, children.length, "two children");
-							doh.is("node1.1.1", children[0].label, "first child");
-						}), 500);
-						return d;
+					{
+						runTest: function openANode(){
+							var d = new doh.Deferred;
+							
+							var first = myTree.rootNode.getChildren()[0];
+							
+							myTree._onExpandoClick({
+								node: first
+							});
+							setTimeout(function(){
+								var firstFirst = first.getChildren()[0];
+								myTree._onExpandoClick({
+									node: firstFirst
+								});
+								
+								setTimeout(d.getTestCallback(function(){
+									// Give the tree time to load the children, and the do checks that it
+									// loaded correctly
+									
+									var children = firstFirst.getChildren();
+									doh.is(2, children.length, "two children");
+									doh.is("node1.1.1", children[0].label, "first child");
+								}), 500);
+							}, 500);
+							return d;
+						},
+						timeout: 2000
 					}
 				]
 			);
@@ -100,14 +110,10 @@
 	</script>
 
 </head>
-<body class="tundra">
+<body class="claro">
 
 	<h1 class="testTitle">Dijit.Tree automated tests</h1>
 	<div id="container"> <!--  tree will go here --></div>
 	<div id="container2"> <!--  tree2 will go here --></div>
 </body>
 </html>
-
-
-
-

data/dojo/dijit/tests/Widget-placeAt.html

@@ -12,7 +12,7 @@
 	</style>
 
 	<!-- required: a default dijit theme: -->
-	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/tundra/tundra.css">
+	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/claro/claro.css">
 
 	<!-- required: load the dojo base -->
 	<script type="text/javascript" src="../../dojo/dojo.js" djConfig="isDebug:true, parseOnLoad: true" ></script>
@@ -66,7 +66,7 @@
 					},
 
 					function placeAsFirst(){
-						pane2.attr("content","button should appear BEFORE this text");
+						pane2.set("content","button should appear BEFORE this text");
 
 						// create a button, and add it to pane2 before the above text
 						var button = new dijit.form.Button({
@@ -109,7 +109,7 @@
 		});
 	</script>
 </head>
-<body class="tundra">
+<body class="claro">
 	<h1 class="testTitle">_Widget.placeAt tests</h1>
 
 	<div id="container">
@@ -128,20 +128,20 @@
 			<button id="addStuff" dojoType="dijit.form.Button">
 				Add Stuff
 				<script type="dojo/method" event="onClick">
-					this.attr("disabled", true);
+					this.set("disabled", true);
 					var bc = dijit.byId("bc1");
 
 					// add a left pane and add content
 					new dijit.layout.ContentPane({
 						region:"left",
 						style:"width:100px"
-					}).placeAt(bc).attr("content","<p>wowzers</p>");
+					}).placeAt(bc).set("content","<p>wowzers</p>");
 
 					// add a top pane, and add content
 					new dijit.layout.ContentPane({
 						region:"top",
 						style:"height:100px"
-					}).placeAt(bc).attr("content","<div>some HTML text</div>");
+					}).placeAt(bc).set("content","<div>some HTML text</div>");
 
 				</script>
 			</button>

data/dojo/dijit/tests/_Container.html

@@ -95,7 +95,7 @@
 
 	</script>
 </head>
-<body class="tundra">
+<body class="claro">
 
 	<div id="container" dojoType="dijit.TestContainer">
 		<div id="zero" dojoType="dijit.TestContained"></div>

data/dojo/dijit/tests/_Templated-widgetsInTemplate.html

@@ -162,7 +162,7 @@
 		@import "../themes/tundra/tundra.css";
 	</style>
 	</head>
-	<body class="tundra">
+	<body class="claro">
 		<h1>testing widgetsInTemplate support</h1>
 		<xmp id="Test1Template" style="display:none;">
 			<div>
@@ -274,7 +274,7 @@
 
 		var test4WidgetProgrammatic;
 		dojo.addOnLoad(function(){
-			test4WidgetProgrammatic = new Test4Widget().placeAt("test4Widget", "after");
+			test4WidgetProgrammatic = new Test4Widget({dir: "ltr"}).placeAt("test4Widget", "after");
 			test4WidgetProgrammatic.startup();
 		});
 

data/dojo/dijit/tests/_Widget-attr.html

@@ -2,7 +2,7 @@
 		"http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-	<title>Widget.attr() unit test</title>
+	<title>Widget.get()/set() unit test</title>
 	<style type="text/css">
 		@import "../../dojo/resources/dojo.css";
 		@import "css/dijitTests.css";
@@ -86,14 +86,33 @@
 						doh.is("bang", b.attr("name"));
 						doh.is("zap", b.attr("foo"));
 					},
+					function setGet(){
+						var b = new Baz();
+
+						// widget attribute mapped to DOM node innerHTML
+						dojo.body().appendChild(b.domNode);
+						doh.is("howdy!", b.get("name"));
+						doh.is("howdy!", b.nameNode.innerHTML);
+						b.set("name", "thinger");
+						doh.is(b.get("name"), "thinger");
+						doh.is(b.nameNode.innerHTML, "thinger");
+
+						// hash setting
+						b.set({
+							name: "bang",
+							foo: "zap"
+						});
+						doh.is("bang", b.get("name"));
+						doh.is("zap", b.get("foo"));
+					},
 
-					function domAttr(){
+					function domSetGet(){
 						// test setting widget attributes corresponding to DOM node attributes
 						var t = new Textbox();
-						doh.assertFalse(t.attr("disabled"));
-						t.attr("disabled", true);
+						doh.assertFalse(t.get("disabled"));
+						t.set("disabled", true);
 						doh.assertTrue(dojo.attr(t.domNode, "disabled"));
-						doh.assertTrue(t.attr("disabled"));
+						doh.assertTrue(t.get("disabled"));
 					},
 
 					function domInnerHTML(){
@@ -102,7 +121,7 @@
 							foo: "blah",
 							name: "whatever"
 						});
-						doh.is("whatever", b2.attr("name"));
+						doh.is("whatever", b2.get("name"));
 						doh.is("whatever", b2.nameNode.innerHTML);
 					},
 					function attributeMap(){
@@ -131,7 +150,7 @@
 	</script>
 </head>
 <body>
-	<h1>Dijit Widget.attr() Unit Test</h1>
+	<h1>Dijit Widget.get()/set() Unit Test</h1>
 	<div id="attributeMapWrapper"></div>
 </body>
 </html>

data/dojo/dijit/tests/_Widget-connect-performance.html

@@ -63,7 +63,7 @@
 
 	</script>
 </head>
-<body class="tundra">
+<body class="claro">
 	<div id="externalNode"></div>
 	<div id="widget1" dojoType="dijit.MyWidget"></div>
 </body>

data/dojo/dijit/tests/_Widget-deferredConnect.html

@@ -44,7 +44,7 @@
 
 	</script>
 </head>
-<body class="tundra">
+<body class="claro">
 	<h1>Test deferred connections</h1>
 	<p>
 		OnMouseMove is a deferred connection, _Widget only call dojo.connect()

data/dojo/dijit/tests/_Widget-lifecycle.html

@@ -87,7 +87,7 @@
 
 	</script>
 </head>
-<body class="tundra">
+<body class="claro">
 
 	<div id="w1"></div>
 	<div id="w2"></div>

data/dojo/dijit/tests/_Widget-ondijitclick.html

@@ -33,7 +33,7 @@
 		}
 	</style>
 </head>
-<body class="tundra">
+<body class="claro">
 	<h1>_Widget.ondijitclick test</h1>
 	<p>
 		This tests dijit's infrastructure for catching SPACE and ENTER key clicks on nodes

data/dojo/dijit/tests/_Widget-subscribe.html

@@ -90,7 +90,7 @@
 
 	</script>
 </head>
-<body class="tundra">
+<body class="claro">
 	<div id="widget1" dojoType="dijit.MyWidget"></div>
 </body>
 </html>

data/dojo/dijit/tests/_altCalendar.html

@@ -1,13 +1,14 @@
-<table cellspacing="0" cellpadding="0" class="dijitCalendarContainer">
+<table cellspacing="0" cellpadding="0" class="dijitCalendarContainer" role="grid" dojoAttachEvent="onkeypress: _onKeyPress">
 	<thead>
 		<tr class="dijitReset dijitCalendarMonthContainer" valign="top">
-			<th><span class='dijitReset' dojoAttachPoint="decrementMonth">
-				<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarDecrease" waiRole="presentation">
+			<th>			
+			<span class='dijitReset dijitCalendarArrow' dojoAttachPoint="decrementMonth">
+				<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarDecrease" role="presentation">
 				<span dojoAttachPoint="decreaseArrowNode" class="dijitA11ySideArrow">-</span>
 			</span>
-			<span class='dijitReset' dojoAttachEvent="onclick:goToToday" style="cursor: pointer; cursor: hand;">&#9632;</span>
-			<span class='dijitReset' dojoAttachPoint="incrementMonth">
-				<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarIncrease" waiRole="presentation">
+			<span dojoAttachEvent="onclick: goToToday" style="cursor: pointer; cursor: hand;">&#2299;</span>
+			<span class='dijitReset dijitCalendarArrow' dojoAttachPoint="incrementMonth">
+				<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarIncrease" role="presentation"/>
 				<span dojoAttachPoint="increaseArrowNode" class="dijitA11ySideArrow">+</span>
 			</span></th>
 			<th class='dijitReset' colspan="6">
@@ -17,16 +18,16 @@
 					</div>
 				</div>
 				<div dojoAttachPoint="monthLabelSpacer" class="dijitSpacer"></div>
-				<div dojoAttachPoint="monthLabelNode" class="dijitCalendarMonthLabel dijitVisible" dojoAttachEvent="onmousedown: _onMonthToggle"></div>
+				<div dojoAttachPoint="monthLabelNode" class="dijitCalendarMonthLabel dijitInline dijitVisible" dojoAttachEvent="onmousedown: _onMonthToggle"></div>
 			</th>
 		</tr>
 		<tr>
-			<th class="dijitReset dijitCalendarDayLabelTemplate"><span class="dijitCalendarDayLabel"></span></th>
+			<th class="dijitReset dijitCalendarDayLabelTemplate" role="columnheader"><span class="dijitCalendarDayLabel"></span></th>
 		</tr>
 	</thead>
-	<tbody dojoAttachEvent="onclick: _onDayClick" class="dijitReset dijitCalendarBodyContainer">
-		<tr class="dijitReset dijitCalendarWeekTemplate">
-			<td class="dijitReset dijitCalendarDateTemplate"><span class="dijitCalendarDateLabel"></span><span class="dijitCalendarDateDescription"></span></td>
+	<tbody dojoAttachEvent="onclick: _onDayClick, onmouseover: _onDayMouseOver, onmouseout: _onDayMouseOut, onmousedown: _onDayMouseDown, onmouseup: _onDayMouseUp" class="dijitReset dijitCalendarBodyContainer">
+		<tr class="dijitReset dijitCalendarWeekTemplate" role="row">
+			<td class="dijitReset dijitCalendarDateTemplate" role="gridcell"><span class="dijitCalendarDateLabel"></span><span class="dijitCalendarDateDescription"></span></td>
 		</tr>
 	</tbody>
 	<tfoot class="dijitReset dijitCalendarYearContainer">