From 6887a0f57307820b097b51aee952c555bcf69024 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 20 Jan 2017 12:29:59 -0500
Subject: 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 <andersk@mit.edu>
---
 lib/dijit/form/templates/Button.html           | 5 +++--
 lib/dijit/form/templates/CheckBox.html         | 2 +-
 lib/dijit/form/templates/ComboButton.html      | 7 ++++---
 lib/dijit/form/templates/DropDownBox.html      | 8 +++++---
 lib/dijit/form/templates/DropDownButton.html   | 8 ++++----
 lib/dijit/form/templates/HorizontalSlider.html | 2 +-
 lib/dijit/form/templates/Select.html           | 4 ++--
 lib/dijit/form/templates/Spinner.html          | 2 +-
 lib/dijit/form/templates/VerticalSlider.html   | 6 +++---
 9 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'lib/dijit/form/templates')

diff --git a/lib/dijit/form/templates/Button.html b/lib/dijit/form/templates/Button.html
index d167ac0d0..98574f959 100644
--- a/lib/dijit/form/templates/Button.html
+++ b/lib/dijit/form/templates/Button.html
@@ -1,6 +1,6 @@
 <span class="dijit dijitReset dijitInline" role="presentation"
 	><span class="dijitReset dijitInline dijitButtonNode"
-		data-dojo-attach-event="ondijitclick:_onClick" role="presentation"
+		data-dojo-attach-event="ondijitclick:__onClick" role="presentation"
 		><span class="dijitReset dijitStretch dijitButtonContents"
 			data-dojo-attach-point="titleNode,focusNode"
 			role="button" aria-labelledby="${id}_label"
@@ -13,5 +13,6 @@
 		></span
 	></span
 	><input ${!nameAttrSetting} type="${type}" value="${value}" class="dijitOffScreen"
-		tabIndex="-1" role="presentation" data-dojo-attach-point="valueNode"
+		data-dojo-attach-event="onclick:_onClick"
+		tabIndex="-1" aria-hidden="true" data-dojo-attach-point="valueNode"
 /></span>
diff --git a/lib/dijit/form/templates/CheckBox.html b/lib/dijit/form/templates/CheckBox.html
index a9c99b53b..5122fe2aa 100644
--- a/lib/dijit/form/templates/CheckBox.html
+++ b/lib/dijit/form/templates/CheckBox.html
@@ -3,5 +3,5 @@
 	 	${!nameAttrSetting} type="${type}" role="${type}" aria-checked="false" ${checkedAttrSetting}
 		class="dijitReset dijitCheckBoxInput"
 		data-dojo-attach-point="focusNode"
-	 	data-dojo-attach-event="onclick:_onClick"
+	 	data-dojo-attach-event="ondijitclick:_onClick"
 /></div>
diff --git a/lib/dijit/form/templates/ComboButton.html b/lib/dijit/form/templates/ComboButton.html
index 1ffe2ec89..51d5746e3 100644
--- a/lib/dijit/form/templates/ComboButton.html
+++ b/lib/dijit/form/templates/ComboButton.html
@@ -1,7 +1,7 @@
 <table class="dijit dijitReset dijitInline dijitLeft"
 	cellspacing='0' cellpadding='0' role="presentation"
 	><tbody role="presentation"><tr role="presentation"
-		><td class="dijitReset dijitStretch dijitButtonNode" data-dojo-attach-point="buttonNode" data-dojo-attach-event="ondijitclick:_onClick,onkeypress:_onButtonKeyPress"
+		><td class="dijitReset dijitStretch dijitButtonNode" data-dojo-attach-point="buttonNode" data-dojo-attach-event="ondijitclick:__onClick,onkeydown:_onButtonKeyDown"
 		><div id="${id}_button" class="dijitReset dijitButtonContents"
 			data-dojo-attach-point="titleNode"
 			role="button" aria-labelledby="${id}_label"
@@ -11,13 +11,14 @@
 		></td
 		><td id="${id}_arrow" class='dijitReset dijitRight dijitButtonNode dijitArrowButton'
 			data-dojo-attach-point="_popupStateNode,focusNode,_buttonNode"
-			data-dojo-attach-event="onkeypress:_onArrowKeyPress"
+			data-dojo-attach-event="onkeydown:_onArrowKeyDown"
 			title="${optionsTitle}"
 			role="button" aria-haspopup="true"
 			><div class="dijitReset dijitArrowButtonInner" role="presentation"></div
 			><div class="dijitReset dijitArrowButtonChar" role="presentation">&#9660;</div
 		></td
 		><td style="display:none !important;"
-			><input ${!nameAttrSetting} type="${type}" value="${value}" data-dojo-attach-point="valueNode" role="presentation"
+			><input ${!nameAttrSetting} type="${type}" value="${value}" data-dojo-attach-point="valueNode"
+				class="dijitOffScreen" aria-hidden="true" data-dojo-attach-event="onclick:_onClick"
 		/></td></tr></tbody
 ></table>
diff --git a/lib/dijit/form/templates/DropDownBox.html b/lib/dijit/form/templates/DropDownBox.html
index eb8f3e70d..282f55978 100644
--- a/lib/dijit/form/templates/DropDownBox.html
+++ b/lib/dijit/form/templates/DropDownBox.html
@@ -1,8 +1,10 @@
 <div class="dijit dijitReset dijitInline dijitLeft"
 	id="widget_${id}"
 	role="combobox"
+	aria-haspopup="true"
+	data-dojo-attach-point="_popupStateNode"
 	><div class='dijitReset dijitRight dijitButtonNode dijitArrowButton dijitDownArrowButton dijitArrowButtonContainer'
-		data-dojo-attach-point="_buttonNode, _popupStateNode" role="presentation"
+		data-dojo-attach-point="_buttonNode" role="presentation"
 		><input class="dijitReset dijitInputField dijitArrowButtonInner" value="&#9660; " type="text" tabIndex="-1" readonly="readonly" role="button presentation" aria-hidden="true"
 			${_buttonInputDisabled}
 	/></div
@@ -10,7 +12,7 @@
 		><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
 	/></div
 	><div class="dijitReset dijitInputField dijitInputContainer"
-		><input class='dijitReset dijitInputInner' ${!nameAttrSetting} type="text" autocomplete="off"
-			data-dojo-attach-point="textbox,focusNode" role="textbox" aria-haspopup="true"
+		><input class='dijitReset dijitInputInner' ${!nameAttrSetting} type="${type}" autocomplete="off"
+			data-dojo-attach-point="textbox,focusNode" role="textbox"
 	/></div
 ></div>
diff --git a/lib/dijit/form/templates/DropDownButton.html b/lib/dijit/form/templates/DropDownButton.html
index 92d9ad047..dedcb8a2a 100644
--- a/lib/dijit/form/templates/DropDownButton.html
+++ b/lib/dijit/form/templates/DropDownButton.html
@@ -1,14 +1,14 @@
 <span class="dijit dijitReset dijitInline"
 	><span class='dijitReset dijitInline dijitButtonNode'
-		data-dojo-attach-event="ondijitclick:_onClick" data-dojo-attach-point="_buttonNode"
+		data-dojo-attach-event="ondijitclick:__onClick" data-dojo-attach-point="_buttonNode"
 		><span class="dijitReset dijitStretch dijitButtonContents"
-			data-dojo-attach-point="focusNode,titleNode,_arrowWrapperNode"
+			data-dojo-attach-point="focusNode,titleNode,_arrowWrapperNode,_popupStateNode"
 			role="button" aria-haspopup="true" aria-labelledby="${id}_label"
 			><span class="dijitReset dijitInline dijitIcon"
 				data-dojo-attach-point="iconNode"
 			></span
 			><span class="dijitReset dijitInline dijitButtonText"
-				data-dojo-attach-point="containerNode,_popupStateNode"
+				data-dojo-attach-point="containerNode"
 				id="${id}_label"
 			></span
 			><span class="dijitReset dijitInline dijitArrowButtonInner"></span
@@ -16,5 +16,5 @@
 		></span
 	></span
 	><input ${!nameAttrSetting} type="${type}" value="${value}" class="dijitOffScreen" tabIndex="-1"
-		data-dojo-attach-point="valueNode" role="presentation"
+		data-dojo-attach-event="onclick:_onClick" data-dojo-attach-point="valueNode" aria-hidden="true"
 /></span>
diff --git a/lib/dijit/form/templates/HorizontalSlider.html b/lib/dijit/form/templates/HorizontalSlider.html
index f633281cb..b926c7d88 100644
--- a/lib/dijit/form/templates/HorizontalSlider.html
+++ b/lib/dijit/form/templates/HorizontalSlider.html
@@ -1,4 +1,4 @@
-<table class="dijit dijitReset dijitSlider dijitSliderH" cellspacing="0" cellpadding="0" border="0" rules="none" data-dojo-attach-event="onkeypress:_onKeyPress,onkeyup:_onKeyUp"
+<table class="dijit dijitReset dijitSlider dijitSliderH" cellspacing="0" cellpadding="0" border="0" rules="none" data-dojo-attach-event="onkeydown:_onKeyDown, onkeyup:_onKeyUp"
 	role="presentation"
 	><tr class="dijitReset"
 		><td class="dijitReset" colspan="2"></td
diff --git a/lib/dijit/form/templates/Select.html b/lib/dijit/form/templates/Select.html
index acf2d2c23..4901aa866 100644
--- a/lib/dijit/form/templates/Select.html
+++ b/lib/dijit/form/templates/Select.html
@@ -1,9 +1,9 @@
 <table class="dijit dijitReset dijitInline dijitLeft"
-	data-dojo-attach-point="_buttonNode,tableNode,focusNode" cellspacing='0' cellpadding='0'
+	data-dojo-attach-point="_buttonNode,tableNode,focusNode,_popupStateNode" cellspacing='0' cellpadding='0'
 	role="listbox" aria-haspopup="true"
 	><tbody role="presentation"><tr role="presentation"
 		><td class="dijitReset dijitStretch dijitButtonContents" role="presentation"
-			><div class="dijitReset dijitInputField dijitButtonText"  data-dojo-attach-point="containerNode,_popupStateNode" role="presentation"></div
+			><div class="dijitReset dijitInputField dijitButtonText"  data-dojo-attach-point="containerNode,textDirNode" role="presentation"></div
 			><div class="dijitReset dijitValidationContainer"
 				><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
 			/></div
diff --git a/lib/dijit/form/templates/Spinner.html b/lib/dijit/form/templates/Spinner.html
index a711cd4e3..3f2186a72 100644
--- a/lib/dijit/form/templates/Spinner.html
+++ b/lib/dijit/form/templates/Spinner.html
@@ -21,7 +21,7 @@
 		><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
 	/></div
 	><div class="dijitReset dijitInputField dijitInputContainer"
-		><input class='dijitReset dijitInputInner' data-dojo-attach-point="textbox,focusNode" type="${type}" data-dojo-attach-event="onkeypress:_onKeyPress"
+		><input class='dijitReset dijitInputInner' data-dojo-attach-point="textbox,focusNode" type="${type}" data-dojo-attach-event="onkeydown:_onKeyDown"
 			role="spinbutton" autocomplete="off" ${!nameAttrSetting}
 	/></div
 ></div>
diff --git a/lib/dijit/form/templates/VerticalSlider.html b/lib/dijit/form/templates/VerticalSlider.html
index 372c82cf0..574ed3d53 100644
--- a/lib/dijit/form/templates/VerticalSlider.html
+++ b/lib/dijit/form/templates/VerticalSlider.html
@@ -1,4 +1,4 @@
-<table class="dijit dijitReset dijitSlider dijitSliderV" cellspacing="0" cellpadding="0" border="0" rules="none" data-dojo-attach-event="onkeypress:_onKeyPress,onkeyup:_onKeyUp"
+<table class="dijit dijitReset dijitSlider dijitSliderV" cellspacing="0" cellpadding="0" border="0" rules="none" data-dojo-attach-event="onkeydown:_onKeyDown,onkeyup:_onKeyUp"
 	role="presentation"
 	><tr class="dijitReset"
 		><td class="dijitReset"></td
@@ -15,7 +15,7 @@
 		><td class="dijitReset"></td
 	></tr
 	><tr class="dijitReset"
-		><td data-dojo-attach-point="leftDecoration" class="dijitReset dijitInline dijitSliderDecoration dijitSliderDecorationL dijitSliderDecorationV"></td
+		><td data-dojo-attach-point="leftDecoration" class="dijitReset dijitSliderDecoration dijitSliderDecorationL dijitSliderDecorationV"></td
 		><td class="dijitReset dijitSliderDecorationC" style="height:100%;"
 			><input data-dojo-attach-point="valueNode" type="hidden" ${!nameAttrSetting}
 			/><center class="dijitReset dijitSliderBarContainerV" role="presentation" data-dojo-attach-point="sliderBarContainer"
@@ -27,7 +27,7 @@
 				></div
 			></center
 		></td
-		><td data-dojo-attach-point="containerNode,rightDecoration" class="dijitReset dijitInline dijitSliderDecoration dijitSliderDecorationR dijitSliderDecorationV"></td
+		><td data-dojo-attach-point="containerNode,rightDecoration" class="dijitReset dijitSliderDecoration dijitSliderDecorationR dijitSliderDecorationV"></td
 	></tr
 	><tr class="dijitReset"
 		><td class="dijitReset"></td
-- 
cgit v1.2.3