Merge branch 'master' into 1.3

oria · Jun 13, 2014 · d366c85 · d366c85
2 parents 2047490 + 5d7f6c7
commit d366c85
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/modules/Bar.js b/modules/Bar.js
@@ -319,7 +319,7 @@ define([
 		},
 
 		_doBlur: function(node, evt, step){
-			var elems = window.a11y._getTabNavigable(node),
+			var elems = a11y._getTabNavigable(node),
 				first = elems.first,
 				last = elems.last, result;
 

diff --git a/tests/test_grid_bar.html b/tests/test_grid_bar.html
@@ -99,5 +99,17 @@ <h2>SummaryBar as a module</h2>
 			"gridx/modules/SummaryBar"
 		]
 	'></div>
+	<h2>Empty Toolbar</h2>
+	<div id='grid5' jsid='grid5' data-dojo-type='gridx.Grid' data-dojo-props='
+		cacheClass: "gridx/core/model/cache/Sync",
+		store: store,
+		structure: layout,
+		selectRowTriggerOnCell: true,
+		modules: [
+			"gridx/modules/extendedSelect/Row",
+			"gridx/modules/IndirectSelectColumn",
+			"gridx/modules/ToolBar"
+		]
+	'></div>
 </body>
 </html>