Merge pull request #1984 from cormacmccarthy/GH1964---tree-should-be-…

…accessible

Makes tree accessible

grunt/tasks/test.js

@@ -3,6 +3,10 @@ module.exports = function test (grunt) {
 	grunt.registerTask('test', 'run jshint, qunit source w/ coverage, and validate HTML',
 		['jshint', 'connect:testServer', 'qunit:noMoment', 'qunit:globals', 'test-dist', 'htmllint']);
 
+	grunt.registerTask('unittest', 'Just unit test the dist without all the fluff',
+		['connect:testServer', 'test-dist']);
+
+
 	grunt.registerTask('prep-commonjs-test', 'run commonjs config build and browserify to prep for commonjs test',
 		['commonjs', 'browserify:commonjs']);
 

index.html

@@ -2071,7 +2071,7 @@ <h5>Choose Folder Location</h5>
 							</div>
 
 							<div class="picker-body well">
-								<ul class="tree" id="myPickerTree1" role="tree">
+								<ul class="tree" id="myPickerTree1" role="tree" aria-activedescendant="" aria-label="My Tree">
 									<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
 										<div class="tree-branch-header">
 											<button type="button" class="glyphicon icon-caret glyphicon-play"><span class="sr-only">Open</span>
@@ -2113,10 +2113,10 @@ <h5>Choose Folder Location</h5>
 				<h2>Tree</h2>
 				<div class="thin-box">
 					<!-- Utilizes Handlebars templates (see index.js) -->
-					<h3>folders selectable (please note structure of treebranch)</h3>
+					<h3 id="myTreeLabel">folders selectable (please note structure of treebranch)</h3>
 					<div id="myTreeWrapper"></div>
 
-					<h3>only items selectable (please note structure of treebranch)</h3>
+					<h3 id="myTree2Label">only items selectable (please note structure of treebranch)</h3>
 					<div id="myTree2Wrapper"></div>
 
 				</div>

index.js

@@ -999,7 +999,7 @@ define(function (require) {
 
 	var tree = require('hbs!fuelux_templates/tree');
 	var $myTreeWrapper = $('#myTreeWrapper');
-	$myTreeWrapper.html(tree({id: 'myTree', folderSelect: true}));
+	$myTreeWrapper.html(tree({id: 'myTree', labelledBy: 'myTreeLabel', folderSelect: true}));
 
 	var treeDataSource = function (parentData, callback) {
 		log('Opening branch data: ', parentData);
@@ -1099,7 +1099,7 @@ define(function (require) {
 	// initialize
 	function myTreeInit () {
 		var $myTree2Wrapper = $('#myTree2Wrapper');
-		$myTree2Wrapper.html(tree({id: 'myTree2'}));
+		$myTree2Wrapper.html(tree({id: 'myTree2', labelledBy: 'myTree2Label'}));
 
 		var callLimit = 200;
 		var callCount = 0;