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/layout/templates/AccordionButton.html    |  8 +++----
 .../layout/templates/ScrollingTabController.html   | 28 +++++++++++-----------
 .../templates/_ScrollingTabControllerButton.html   |  4 ++--
 lib/dijit/layout/templates/_TabButton.html         |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

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

diff --git a/lib/dijit/layout/templates/AccordionButton.html b/lib/dijit/layout/templates/AccordionButton.html
index d2a9eee40..1c110e14a 100644
--- a/lib/dijit/layout/templates/AccordionButton.html
+++ b/lib/dijit/layout/templates/AccordionButton.html
@@ -1,10 +1,10 @@
-<div data-dojo-attach-event='onclick:_onTitleClick' class='dijitAccordionTitle' role="presentation">
-	<div data-dojo-attach-point='titleNode,focusNode' data-dojo-attach-event='onkeypress:_onTitleKeyPress'
+<div data-dojo-attach-event='ondijitclick:_onTitleClick' class='dijitAccordionTitle' role="presentation">
+	<div data-dojo-attach-point='titleNode,focusNode' data-dojo-attach-event='onkeydown:_onTitleKeyDown'
 			class='dijitAccordionTitleFocus' role="tab" aria-expanded="false"
 		><span class='dijitInline dijitAccordionArrow' role="presentation"></span
 		><span class='arrowTextUp' role="presentation">+</span
 		><span class='arrowTextDown' role="presentation">-</span
-		><img src="${_blankGif}" alt="" class="dijitIcon" data-dojo-attach-point='iconNode' style="vertical-align: middle" role="presentation"/>
-		<span role="presentation" data-dojo-attach-point='titleTextNode' class='dijitAccordionText'></span>
+		><span role="presentation" class="dijitInline dijitIcon" data-dojo-attach-point="iconNode"></span>
+		<span role="presentation" data-dojo-attach-point='titleTextNode, textDirNode' class='dijitAccordionText'></span>
 	</div>
 </div>
diff --git a/lib/dijit/layout/templates/ScrollingTabController.html b/lib/dijit/layout/templates/ScrollingTabController.html
index 505b92fc8..f72817d90 100644
--- a/lib/dijit/layout/templates/ScrollingTabController.html
+++ b/lib/dijit/layout/templates/ScrollingTabController.html
@@ -1,22 +1,22 @@
 <div class="dijitTabListContainer-${tabPosition}" style="visibility:hidden">
 	<div data-dojo-type="dijit.layout._ScrollingTabControllerMenuButton"
-			class="tabStripButton-${tabPosition}"
-			id="${id}_menuBtn"
-			data-dojo-props="containerId: '${containerId}', iconClass: 'dijitTabStripMenuIcon',
+		 class="tabStripButton-${tabPosition}"
+		 id="${id}_menuBtn"
+		 data-dojo-props="containerId: '${containerId}', iconClass: 'dijitTabStripMenuIcon',
 					dropDownPosition: ['below-alt', 'above-alt']"
-			data-dojo-attach-point="_menuBtn" showLabel="false" title="">&#9660;</div>
+		 data-dojo-attach-point="_menuBtn" showLabel="false" title="">&#9660;</div>
 	<div data-dojo-type="dijit.layout._ScrollingTabControllerButton"
-			class="tabStripButton-${tabPosition}"
-			id="${id}_leftBtn"
-			data-dojo-props="iconClass:'dijitTabStripSlideLeftIcon', showLabel:false, title:''"
-			data-dojo-attach-point="_leftBtn" data-dojo-attach-event="onClick: doSlideLeft">&#9664;</div>
+		 class="tabStripButton-${tabPosition}"
+		 id="${id}_leftBtn"
+		 data-dojo-props="iconClass:'dijitTabStripSlideLeftIcon', showLabel:false, title:''"
+		 data-dojo-attach-point="_leftBtn" data-dojo-attach-event="onClick: doSlideLeft">&#9664;</div>
 	<div data-dojo-type="dijit.layout._ScrollingTabControllerButton"
-			class="tabStripButton-${tabPosition}"
-			id="${id}_rightBtn"
-			data-dojo-props="iconClass:'dijitTabStripSlideRightIcon', showLabel:false, title:''"
-			data-dojo-attach-point="_rightBtn" data-dojo-attach-event="onClick: doSlideRight">&#9654;</div>
+		 class="tabStripButton-${tabPosition}"
+		 id="${id}_rightBtn"
+		 data-dojo-props="iconClass:'dijitTabStripSlideRightIcon', showLabel:false, title:''"
+		 data-dojo-attach-point="_rightBtn" data-dojo-attach-event="onClick: doSlideRight">&#9654;</div>
 	<div class='dijitTabListWrapper' data-dojo-attach-point='tablistWrapper'>
-		<div role='tablist' data-dojo-attach-event='onkeypress:onkeypress'
-				data-dojo-attach-point='containerNode' class='nowrapTabStrip'></div>
+		<div role='tablist' data-dojo-attach-event='onkeydown:onkeydown'
+			 data-dojo-attach-point='containerNode' class='nowrapTabStrip'></div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/lib/dijit/layout/templates/_ScrollingTabControllerButton.html b/lib/dijit/layout/templates/_ScrollingTabControllerButton.html
index 3e01ab099..e80fa43c3 100644
--- a/lib/dijit/layout/templates/_ScrollingTabControllerButton.html
+++ b/lib/dijit/layout/templates/_ScrollingTabControllerButton.html
@@ -1,4 +1,4 @@
-<div data-dojo-attach-event="onclick:_onClick" class="dijitTabInnerDiv dijitTabContent dijitButtonContents"  data-dojo-attach-point="focusNode">
-	<img role="presentation" alt="" src="${_blankGif}" class="dijitTabStripIcon" data-dojo-attach-point="iconNode"/>
+<div data-dojo-attach-event="ondijitclick:_onClick" class="dijitTabInnerDiv dijitTabContent dijitButtonContents"  data-dojo-attach-point="focusNode" role="button">
+	<span role="presentation" class="dijitInline dijitTabStripIcon" data-dojo-attach-point="iconNode"></span>
 	<span data-dojo-attach-point="containerNode,titleNode" class="dijitButtonText"></span>
 </div>
\ No newline at end of file
diff --git a/lib/dijit/layout/templates/_TabButton.html b/lib/dijit/layout/templates/_TabButton.html
index 99c76a9ac..507b571cb 100644
--- a/lib/dijit/layout/templates/_TabButton.html
+++ b/lib/dijit/layout/templates/_TabButton.html
@@ -1,5 +1,5 @@
 <div role="presentation" data-dojo-attach-point="titleNode,innerDiv,tabContent" class="dijitTabInner dijitTabContent">
-	<img src="${_blankGif}" alt="" class="dijitIcon dijitTabButtonIcon" data-dojo-attach-point='iconNode'/>
+	<span role="presentation" class="dijitInline dijitIcon dijitTabButtonIcon" data-dojo-attach-point="iconNode"></span>
 	<span data-dojo-attach-point='containerNode,focusNode' class='tabLabel'></span>
 	<span class="dijitInline dijitTabCloseButton dijitTabCloseIcon" data-dojo-attach-point='closeNode'
 		  role="presentation">
-- 
cgit v1.2.3