lib: Upgrade Dojo and Dijit from 1.8.3 to 1.12.1

The itemNode and expandoNode elements have changed from img to
span (https://bugs.dojotoolkit.org/ticket/16699), so we now put our
tree icons inside them rather than replacing them.

Signed-off-by: Anders Kaseorg <[email protected]>

19 files changed, 100 insertions, 83 deletions

diff --git a/lib/dijit/templates/Calendar.html b/lib/dijit/templates/Calendar.html
index b4405ed84..5a2fa2b87 100644
--- a/lib/dijit/templates/Calendar.html
+++ b/lib/dijit/templates/Calendar.html
@@ -1,35 +1,30 @@
-<table cellspacing="0" cellpadding="0" class="dijitCalendarContainer" role="grid" aria-labelledby="${id}_mddb ${id}_year">
-	<thead>
-		<tr class="dijitReset dijitCalendarMonthContainer" valign="top">
-			<th class='dijitReset dijitCalendarArrow' data-dojo-attach-point="decrementMonth">
-				<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarDecrease" role="presentation"/>
-				<span data-dojo-attach-point="decreaseArrowNode" class="dijitA11ySideArrow">-</span>
-			</th>
-			<th class='dijitReset' colspan="5">
-				<div data-dojo-attach-point="monthNode">
-				</div>
-			</th>
-			<th class='dijitReset dijitCalendarArrow' data-dojo-attach-point="incrementMonth">
-				<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarIncrease" role="presentation"/>
-				<span data-dojo-attach-point="increaseArrowNode" class="dijitA11ySideArrow">+</span>
-			</th>
-		</tr>
-		<tr role="row">
-			${!dayCellsHtml}
-		</tr>
-	</thead>
-	<tbody data-dojo-attach-point="dateRowsNode" data-dojo-attach-event="onclick: _onDayClick" class="dijitReset dijitCalendarBodyContainer">
-			${!dateRowsHtml}
-	</tbody>
-	<tfoot class="dijitReset dijitCalendarYearContainer">
-		<tr>
-			<td class='dijitReset' valign="top" colspan="7" role="presentation">
-				<div class="dijitCalendarYearLabel">
-					<span data-dojo-attach-point="previousYearLabelNode" class="dijitInline dijitCalendarPreviousYear" role="button"></span>
-					<span data-dojo-attach-point="currentYearLabelNode" class="dijitInline dijitCalendarSelectedYear" role="button" id="${id}_year"></span>
-					<span data-dojo-attach-point="nextYearLabelNode" class="dijitInline dijitCalendarNextYear" role="button"></span>
-				</div>
-			</td>
-		</tr>
-	</tfoot>
-</table>
+<div class="dijitCalendarContainer dijitInline" role="presentation" aria-labelledby="${id}_mddb ${id}_year">
+	<div class="dijitReset dijitCalendarMonthContainer" role="presentation">
+		<div class='dijitReset dijitCalendarArrow dijitCalendarDecrementArrow' data-dojo-attach-point="decrementMonth">
+			<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarDecrease" role="presentation"/>
+			<span data-dojo-attach-point="decreaseArrowNode" class="dijitA11ySideArrow">-</span>
+		</div>
+		<div class='dijitReset dijitCalendarArrow dijitCalendarIncrementArrow' data-dojo-attach-point="incrementMonth">
+			<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarIncrease" role="presentation"/>
+			<span data-dojo-attach-point="increaseArrowNode" class="dijitA11ySideArrow">+</span>
+		</div>
+		<div data-dojo-attach-point="monthNode" class="dijitInline"></div>
+	</div>
+	<table cellspacing="0" cellpadding="0" role="grid" data-dojo-attach-point="gridNode">
+		<thead>
+			<tr role="row">
+				${!dayCellsHtml}
+			</tr>
+		</thead>
+		<tbody data-dojo-attach-point="dateRowsNode" data-dojo-attach-event="ondijitclick: _onDayClick" class="dijitReset dijitCalendarBodyContainer">
+				${!dateRowsHtml}
+		</tbody>
+	</table>
+	<div class="dijitReset dijitCalendarYearContainer" role="presentation">
+		<div class="dijitCalendarYearLabel">
+			<span data-dojo-attach-point="previousYearLabelNode" class="dijitInline dijitCalendarPreviousYear" role="button"></span>
+			<span data-dojo-attach-point="currentYearLabelNode" class="dijitInline dijitCalendarSelectedYear" role="button" id="${id}_year"></span>
+			<span data-dojo-attach-point="nextYearLabelNode" class="dijitInline dijitCalendarNextYear" role="button"></span>
+		</div>
+	</div>
+</div>
diff --git a/lib/dijit/templates/CheckedMenuItem.html b/lib/dijit/templates/CheckedMenuItem.html
index 71a0824d9..9584bf1fe 100644
--- a/lib/dijit/templates/CheckedMenuItem.html
+++ b/lib/dijit/templates/CheckedMenuItem.html
@@ -1,9 +1,9 @@
-<tr class="dijitReset dijitMenuItem" data-dojo-attach-point="focusNode" role="menuitemcheckbox" tabIndex="-1">
+<tr class="dijitReset" data-dojo-attach-point="focusNode" role="${role}" tabIndex="-1" aria-checked="${checked}">
 	<td class="dijitReset dijitMenuItemIconCell" role="presentation">
-		<img src="${_blankGif}" alt="" class="dijitMenuItemIcon dijitCheckedMenuItemIcon" data-dojo-attach-point="iconNode"/>
-		<span class="dijitCheckedMenuItemIconChar">&#10003;</span>
+		<span class="dijitInline dijitIcon dijitMenuItemIcon dijitCheckedMenuItemIcon" data-dojo-attach-point="iconNode"></span>
+		<span class="dijitMenuItemIconChar dijitCheckedMenuItemIconChar">${!checkedChar}</span>
 	</td>
-	<td class="dijitReset dijitMenuItemLabel" colspan="2" data-dojo-attach-point="containerNode,labelNode"></td>
+	<td class="dijitReset dijitMenuItemLabel" colspan="2" data-dojo-attach-point="containerNode,labelNode,textDirNode"></td>
 	<td class="dijitReset dijitMenuItemAccelKey" style="display: none" data-dojo-attach-point="accelKeyNode"></td>
 	<td class="dijitReset dijitMenuArrowCell" role="presentation">&#160;</td>
 </tr>
diff --git a/lib/dijit/templates/ColorPalette.html b/lib/dijit/templates/ColorPalette.html
index 3f7f96065..82361d539 100644
--- a/lib/dijit/templates/ColorPalette.html
+++ b/lib/dijit/templates/ColorPalette.html
@@ -1,5 +1,5 @@
-<div class="dijitInline dijitColorPalette">
-	<table dojoAttachPoint="paletteTableNode" class="dijitPaletteTable" cellSpacing="0" cellPadding="0" role="grid">
+<div class="dijitInline dijitColorPalette" role="grid">
+	<table data-dojo-attach-point="paletteTableNode" class="dijitPaletteTable" cellSpacing="0" cellPadding="0" role="presentation">
 		<tbody data-dojo-attach-point="gridNode"></tbody>
 	</table>
 </div>
diff --git a/lib/dijit/templates/Dialog.html b/lib/dijit/templates/Dialog.html
index 0de2225ab..fbebe4c21 100644
--- a/lib/dijit/templates/Dialog.html
+++ b/lib/dijit/templates/Dialog.html
@@ -2,9 +2,11 @@
 	<div data-dojo-attach-point="titleBar" class="dijitDialogTitleBar">
 		<span data-dojo-attach-point="titleNode" class="dijitDialogTitle" id="${id}_title"
 				role="heading" level="1"></span>
-		<span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabIndex="-1">
+		<span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabindex="-1">
 			<span data-dojo-attach-point="closeText" class="closeText" title="${buttonCancel}">x</span>
 		</span>
 	</div>
 	<div data-dojo-attach-point="containerNode" class="dijitDialogPaneContent"></div>
+	${!actionBarTemplate}
 </div>
+
diff --git a/lib/dijit/templates/Fieldset.html b/lib/dijit/templates/Fieldset.html
new file mode 100644
index 000000000..50fd1222f
--- /dev/null
+++ b/lib/dijit/templates/Fieldset.html
@@ -0,0 +1,16 @@
+<fieldset>
+	<legend data-dojo-attach-event="ondijitclick:_onTitleClick, onkeydown:_onTitleKey"
+			data-dojo-attach-point="titleBarNode, titleNode">
+		<span data-dojo-attach-point="arrowNode" class="dijitInline dijitArrowNode" role="presentation"></span
+		><span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span
+		><span data-dojo-attach-point="titleNode, focusNode" class="dijitFieldsetLegendNode" id="${id}_titleNode"></span>
+	</legend>
+	<div class="dijitFieldsetContentOuter" data-dojo-attach-point="hideNode" role="presentation">
+		<div class="dijitReset" data-dojo-attach-point="wipeNode" role="presentation">
+			<div class="dijitFieldsetContentInner" data-dojo-attach-point="containerNode" role="region"
+				 	id="${id}_pane" aria-labelledby="${id}_titleNode">
+				<!-- nested divs because wipeIn()/wipeOut() doesn't work right on node w/padding etc.  Put padding on inner div. -->
+			</div>
+		</div>
+	</div>
+</fieldset>
diff --git a/lib/dijit/templates/InlineEditBox.html b/lib/dijit/templates/InlineEditBox.html
index d6c7096dc..6aac77ee1 100644
--- a/lib/dijit/templates/InlineEditBox.html
+++ b/lib/dijit/templates/InlineEditBox.html
@@ -1,10 +1,9 @@
 <span data-dojo-attach-point="editNode" role="presentation" class="dijitReset dijitInline dijitOffScreen"
-	data-dojo-attach-event="onkeypress: _onKeyPress"
 	><span data-dojo-attach-point="editorPlaceholder"></span
 	><span data-dojo-attach-point="buttonContainer"
-		><button data-dojo-type="dijit/form/Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'"
+		><button data-dojo-type="./form/Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'"
 			data-dojo-attach-point="saveButton" data-dojo-attach-event="onClick:save"></button
-		><button data-dojo-type="dijit/form/Button"  data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'"
+		><button data-dojo-type="./form/Button"  data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'"
 			data-dojo-attach-point="cancelButton" data-dojo-attach-event="onClick:cancel"></button
 	></span
 ></span>
diff --git a/lib/dijit/templates/Menu.html b/lib/dijit/templates/Menu.html
index 2c3cb53ba..a9f635b26 100644
--- a/lib/dijit/templates/Menu.html
+++ b/lib/dijit/templates/Menu.html
@@ -1,4 +1,4 @@
 <table class="dijit dijitMenu dijitMenuPassive dijitReset dijitMenuTable" role="menu" tabIndex="${tabIndex}"
-	   data-dojo-attach-event="onkeypress:_onKeyPress" cellspacing="0">
+	   cellspacing="0">
 	<tbody class="dijitReset" data-dojo-attach-point="containerNode"></tbody>
 </table>
diff --git a/lib/dijit/templates/MenuBar.html b/lib/dijit/templates/MenuBar.html
index 3ba1ea2b4..ed5442905 100644
--- a/lib/dijit/templates/MenuBar.html
+++ b/lib/dijit/templates/MenuBar.html
@@ -1 +1,2 @@
-<div class="dijitMenuBar dijitMenuPassive" data-dojo-attach-point="containerNode"  role="menubar" tabIndex="${tabIndex}" data-dojo-attach-event="onkeypress: _onKeyPress"></div>
+<div class="dijitMenuBar dijitMenuPassive" data-dojo-attach-point="containerNode" role="menubar" tabIndex="${tabIndex}"
+	 ></div>
diff --git a/lib/dijit/templates/MenuBarItem.html b/lib/dijit/templates/MenuBarItem.html
index f236dfe01..0195329cc 100644
--- a/lib/dijit/templates/MenuBarItem.html
+++ b/lib/dijit/templates/MenuBarItem.html
@@ -1,4 +1,4 @@
 <div class="dijitReset dijitInline dijitMenuItem dijitMenuItemLabel" data-dojo-attach-point="focusNode"
 	 	role="menuitem" tabIndex="-1">
-	<span data-dojo-attach-point="containerNode"></span>
+	<span data-dojo-attach-point="containerNode,textDirNode"></span>
 </div>
diff --git a/lib/dijit/templates/MenuItem.html b/lib/dijit/templates/MenuItem.html
index 920038435..457f467b7 100644
--- a/lib/dijit/templates/MenuItem.html
+++ b/lib/dijit/templates/MenuItem.html
@@ -1,13 +1,14 @@
-<tr class="dijitReset dijitMenuItem" data-dojo-attach-point="focusNode" role="menuitem" tabIndex="-1">
+<tr class="dijitReset" data-dojo-attach-point="focusNode" role="menuitem" tabIndex="-1">
 	<td class="dijitReset dijitMenuItemIconCell" role="presentation">
-		<img src="${_blankGif}" alt="" class="dijitIcon dijitMenuItemIcon" data-dojo-attach-point="iconNode"/>
+		<span role="presentation" class="dijitInline dijitIcon dijitMenuItemIcon" data-dojo-attach-point="iconNode"></span>
 	</td>
-	<td class="dijitReset dijitMenuItemLabel" colspan="2" data-dojo-attach-point="containerNode"></td>
+	<td class="dijitReset dijitMenuItemLabel" colspan="2" data-dojo-attach-point="containerNode,textDirNode"
+		role="presentation"></td>
 	<td class="dijitReset dijitMenuItemAccelKey" style="display: none" data-dojo-attach-point="accelKeyNode"></td>
 	<td class="dijitReset dijitMenuArrowCell" role="presentation">
-		<div data-dojo-attach-point="arrowWrapper" style="visibility: hidden">
-			<img src="${_blankGif}" alt="" class="dijitMenuExpand"/>
+		<span data-dojo-attach-point="arrowWrapper" style="visibility: hidden">
+			<span class="dijitInline dijitIcon dijitMenuExpand"></span>
 			<span class="dijitMenuExpandA11y">+</span>
-		</div>
+		</span>
 	</td>
 </tr>
diff --git a/lib/dijit/templates/MenuSeparator.html b/lib/dijit/templates/MenuSeparator.html
index 77d1d0516..3d4155b92 100644
--- a/lib/dijit/templates/MenuSeparator.html
+++ b/lib/dijit/templates/MenuSeparator.html
@@ -1,4 +1,4 @@
-<tr class="dijitMenuSeparator">
+<tr class="dijitMenuSeparator" role="separator">
 	<td class="dijitMenuSeparatorIconCell">
 		<div class="dijitMenuSeparatorTop"></div>
 		<div class="dijitMenuSeparatorBottom"></div>
@@ -7,4 +7,4 @@
 		<div class="dijitMenuSeparatorTop dijitMenuSeparatorLabel"></div>
 		<div class="dijitMenuSeparatorBottom"></div>
 	</td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/lib/dijit/templates/ProgressBar.html b/lib/dijit/templates/ProgressBar.html
index 9ed12aff6..bac261a12 100644
--- a/lib/dijit/templates/ProgressBar.html
+++ b/lib/dijit/templates/ProgressBar.html
@@ -4,5 +4,6 @@
 		><span style="visibility:hidden">&#160;</span
 	></div
 	><div data-dojo-attach-point="labelNode" class="dijitProgressBarLabel" id="${id}_label"></div
-	><img data-dojo-attach-point="indeterminateHighContrastImage" class="dijitProgressBarIndeterminateHighContrastImage" alt=""
-/></div>
+	><span data-dojo-attach-point="indeterminateHighContrastImage"
+		   class="dijitInline dijitProgressBarIndeterminateHighContrastImage"></span
+></div>
diff --git a/lib/dijit/templates/TimePicker.html b/lib/dijit/templates/TimePicker.html
deleted file mode 100644
index 919fbb0d2..000000000
--- a/lib/dijit/templates/TimePicker.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="widget_${id}" class="dijitMenu"
-    ><div data-dojo-attach-point="upArrow" class="dijitButtonNode dijitUpArrowButton" data-dojo-attach-event="onmouseenter:_buttonMouse,onmouseleave:_buttonMouse"
-		><div class="dijitReset dijitInline dijitArrowButtonInner" role="presentation">&#160;</div
-		><div class="dijitArrowButtonChar">&#9650;</div></div
-    ><div data-dojo-attach-point="timeMenu,focusNode" data-dojo-attach-event="onclick:_onOptionSelected,onmouseover,onmouseout"></div
-    ><div data-dojo-attach-point="downArrow" class="dijitButtonNode dijitDownArrowButton" data-dojo-attach-event="onmouseenter:_buttonMouse,onmouseleave:_buttonMouse"
-		><div class="dijitReset dijitInline dijitArrowButtonInner" role="presentation">&#160;</div
-		><div class="dijitArrowButtonChar">&#9660;</div></div
-></div>
diff --git a/lib/dijit/templates/TitlePane.html b/lib/dijit/templates/TitlePane.html
index 4990bfb1d..d48251492 100644
--- a/lib/dijit/templates/TitlePane.html
+++ b/lib/dijit/templates/TitlePane.html
@@ -1,9 +1,9 @@
 <div>
-	<div data-dojo-attach-event="onclick:_onTitleClick, onkeydown:_onTitleKey"
+	<div data-dojo-attach-event="ondijitclick:_onTitleClick, onkeydown:_onTitleKey"
 			class="dijitTitlePaneTitle" data-dojo-attach-point="titleBarNode" id="${id}_titleBarNode">
 		<div class="dijitTitlePaneTitleFocus" data-dojo-attach-point="focusNode">
-			<img src="${_blankGif}" alt="" data-dojo-attach-point="arrowNode" class="dijitArrowNode" role="presentation"
-			/><span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span
+			<span data-dojo-attach-point="arrowNode" class="dijitInline dijitArrowNode" role="presentation"></span
+			><span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span
 			><span data-dojo-attach-point="titleNode" class="dijitTitlePaneTextNode"></span>
 		</div>
 	</div>
diff --git a/lib/dijit/templates/Tooltip.html b/lib/dijit/templates/Tooltip.html
index fdb1a8212..e08d1a891 100644
--- a/lib/dijit/templates/Tooltip.html
+++ b/lib/dijit/templates/Tooltip.html
@@ -1,4 +1,4 @@
-<div class="dijitTooltip dijitTooltipLeft" id="dojoTooltip"
-	><div class="dijitTooltipContainer dijitTooltipContents" data-dojo-attach-point="containerNode" role='alert'></div
+<div class="dijitTooltip dijitTooltipLeft" id="dojoTooltip" data-dojo-attach-event="mouseenter:onMouseEnter,mouseleave:onMouseLeave"
 	><div class="dijitTooltipConnector" data-dojo-attach-point="connectorNode"></div
+	><div class="dijitTooltipContainer dijitTooltipContents" data-dojo-attach-point="containerNode" role='alert'></div
 ></div>
diff --git a/lib/dijit/templates/TooltipDialog.html b/lib/dijit/templates/TooltipDialog.html
index 52d26abb1..0ec136f0b 100644
--- a/lib/dijit/templates/TooltipDialog.html
+++ b/lib/dijit/templates/TooltipDialog.html
@@ -1,6 +1,9 @@
-<div role="presentation" tabIndex="-1">
+<div role="alertdialog" tabIndex="-1">
 	<div class="dijitTooltipContainer" role="presentation">
-		<div class ="dijitTooltipContents dijitTooltipFocusNode" data-dojo-attach-point="containerNode" role="dialog"></div>
+		<div data-dojo-attach-point="contentsNode" class="dijitTooltipContents dijitTooltipFocusNode">
+			<div data-dojo-attach-point="containerNode"></div>
+			${!actionBarTemplate}
+		</div>
 	</div>
 	<div class="dijitTooltipConnector" role="presentation" data-dojo-attach-point="connectorNode"></div>
 </div>
diff --git a/lib/dijit/templates/Tree.html b/lib/dijit/templates/Tree.html
index 9d00191bf..778f5d764 100644
--- a/lib/dijit/templates/Tree.html
+++ b/lib/dijit/templates/Tree.html
@@ -1,3 +1,6 @@
-<div class="dijitTree dijitTreeContainer" role="tree">
+<div role="tree">
 	<div class="dijitInline dijitTreeIndent" style="position: absolute; top: -9999px" data-dojo-attach-point="indentDetector"></div>
+	<div class="dijitTreeExpando dijitTreeExpandoLoading" data-dojo-attach-point="rootLoadingIndicator"></div>
+	<div data-dojo-attach-point="containerNode" class="dijitTreeContainer" role="presentation">
+	</div>
 </div>
diff --git a/lib/dijit/templates/TreeNode.html b/lib/dijit/templates/TreeNode.html
index ae3e66a0d..1e6e1c60a 100644
--- a/lib/dijit/templates/TreeNode.html
+++ b/lib/dijit/templates/TreeNode.html
@@ -1,14 +1,14 @@
 <div class="dijitTreeNode" role="presentation"
-	><div data-dojo-attach-point="rowNode" class="dijitTreeRow dijitInline" role="presentation"
-		><div data-dojo-attach-point="indentNode" class="dijitInline"></div
-		><img src="${_blankGif}" alt="" data-dojo-attach-point="expandoNode" class="dijitTreeExpando" role="presentation"
-		/><span data-dojo-attach-point="expandoNodeText" class="dijitExpandoText" role="presentation"
-		></span
+	><div data-dojo-attach-point="rowNode" class="dijitTreeRow" role="presentation"
+		><span data-dojo-attach-point="expandoNode" class="dijitInline dijitTreeExpando" role="presentation"></span
+		><span data-dojo-attach-point="expandoNodeText" class="dijitExpandoText" role="presentation"></span
 		><span data-dojo-attach-point="contentNode"
 			class="dijitTreeContent" role="presentation">
-			<img src="${_blankGif}" alt="" data-dojo-attach-point="iconNode" class="dijitIcon dijitTreeIcon" role="presentation"
-			/><span data-dojo-attach-point="labelNode" class="dijitTreeLabel" role="treeitem" tabindex="-1" aria-selected="false"></span>
+			<span role="presentation" class="dijitInline dijitIcon dijitTreeIcon" data-dojo-attach-point="iconNode"></span
+			><span data-dojo-attach-point="labelNode,focusNode" class="dijitTreeLabel" role="treeitem"
+				   tabindex="-1" aria-selected="false" id="${id}_label"></span>
 		</span
 	></div>
-	<div data-dojo-attach-point="containerNode" class="dijitTreeContainer" role="presentation" style="display: none;"></div>
+	<div data-dojo-attach-point="containerNode" class="dijitTreeNodeContainer" role="presentation"
+		 style="display: none;" aria-labelledby="${id}_label"></div>
 </div>
diff --git a/lib/dijit/templates/actionBar.html b/lib/dijit/templates/actionBar.html
new file mode 100644
index 000000000..d428709e0
--- /dev/null
+++ b/lib/dijit/templates/actionBar.html
@@ -0,0 +1,5 @@
+<div class='dijitDialogPaneActionBar' data-dojo-attach-point="actionBarNode">
+	<button data-dojo-type='dijit/form/Button' type='submit' data-dojo-attach-point="okButton"></button>
+	<button data-dojo-type='dijit/form/Button' type='button'
+			data-dojo-attach-point="cancelButton" data-dojo-attach-event='click:onCancel'></button>
+</div>