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/templates/TreeNode.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/dijit/templates/TreeNode.html')

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>
-- 
cgit v1.2.3