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/Dialog.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

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