Merge branch 'master' into update-clean-input-utility

.travis.yml

@@ -2,9 +2,15 @@ language: node_js
 node_js:
 - 6.8.1
 sudo: false
+addons:
+  apt:
+    packages:
+      - xvfb
 install:
 - time npm install
 - time ./node_modules/bower/bin/bower update
+- export DISPLAY=':99.0'
+- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
 env:
   global:
   - secure: |-

dist/js/fuelux.js

@@ -1,5 +1,6 @@
 /*!
- * Fuel UX v3.16.0 
+ * Fuel UX EDGE - Built 2017/06/09, 4:48:45 PM 
+ * Previous release: v3.16.0 
  * Copyright 2012-2017 ExactTarget
  * Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
  */

grunt/config/connect.js

@@ -27,6 +27,5 @@ module.exports = function (grunt) {
 				useAvailablePort: true
 			}
 		}
-	}
-
-};
+	};
+};

grunt/config/jshint.js

@@ -3,6 +3,5 @@ module.exports = {
 		jshintrc: '.jshintrc', // use project defined jshint settings which can be shared with IDEs etc
 		ignores: ['test/data/*.js']
 	},
-	sourceAndDist: ['Gruntfile.js', 'js/*.js', 'dist/fuelux.js'],
-	tests: ['test/**/*.js', '!test/commonjs-bundle.js'],
+	sourceAndDist: ['Gruntfile.js', 'js/*.js', 'dist/fuelux.js']
 };

grunt/config/shell.js

@@ -113,6 +113,28 @@ module.exports = function (grunt) {
 				grunt.log.write(command);
 				return command;
 			}
+		},
+		copyToReference: {
+			command: function copyDistToRef() {
+				var moveDist = [
+					'rm -rf reference/dist',
+					'mkdir reference/dist',
+					'cp -R dist/* reference/dist'
+				].join(' && ');
+				grunt.log.write('Copying dist into reference/dist for use in visual regression testing.\n');
+				grunt.log.write(moveDist);
+
+				var deleteFluff = [
+					'rm reference/dist/css/fuelux.css.map',
+					'rm reference/dist/css/fuelux.min.css',
+					'rm reference/dist/fuelux.zip',
+					'rm reference/dist/js/fuelux.min.js'
+				].join(' && ');
+				grunt.log.write('\nRemovine .zip and .min files to save space in repo');
+				grunt.log.write(deleteFluff);
+
+				return moveDist + ' && ' + deleteFluff;
+			}
 		}
 	};
 };

grunt/config/watch.js

@@ -43,7 +43,7 @@ module.exports = {
 		]
 	},
 	less: {
-		files: ['fonts/**', 
+		files: ['fonts/**',
 			'less/**'],
 		options: {
 			livereload: true
@@ -65,9 +65,9 @@ module.exports = {
 		tasks: ['distcssdev']
 	},
 	dist: {
-		files: ['fonts/**', 
+		files: ['fonts/**',
 			'grunt/**',
-			'js/**', 
+			'js/**',
 			'less/**'],
 		options: {
 			livereload: true
@@ -81,4 +81,4 @@ module.exports = {
 		},
 		tasks: []
 	}
-};
+};

grunt/tasks/release.js

@@ -77,9 +77,22 @@ module.exports = function (grunt) {
 		grunt.config('banner', '<%= bannerRelease %>');
 
 		// Run dist again to grab the latest version numbers. Yeah, we're running it twice... ¯\_(ツ)_/¯
-		grunt.task.run(['bump-only:' + grunt.config('release.buildSemVerType'), 'replace:readme', 'replace:packageJs', 'dist',
-			'shell:addReleaseFiles', 'prompt:commit', 'prompt:tag', 'prompt:pushLocalBranchToUpstream',
-			'prompt:pushTagToUpstream', 'prompt:uploadToCDN', 'prompt:pushLocalBranchToUpstreamMaster', 'shell:publishToNPM', 'prompt:generatelogs']);
+		grunt.task.run([
+			'bump-only:' + grunt.config('release.buildSemVerType'),
+			'replace:readme',
+			'replace:packageJs',
+			'dist',
+			'shell:addReleaseFiles',
+			'prompt:commit',
+			'prompt:tag',
+			'prompt:pushLocalBranchToUpstream',
+			'prompt:pushTagToUpstream',
+			'prompt:uploadToCDN',
+			'prompt:pushLocalBranchToUpstreamMaster',
+			'shell:publishToNPM',
+			'shell:copyToReference',
+			'prompt:generatelogs'
+		]);
 	});
 };
 

grunt/tasks/serve.js

@@ -1,22 +1,18 @@
-module.exports = function(grunt) {
-
-	/* -------------
-		SERVE
-	------------- */
-	// default serve task that runs tests and builds and tests dist by default.
-	grunt.registerTask('serve', 'Test, build, serve files. (~20s)', function () {
+module.exports = function serveTasks (grunt) {
+	// runs tests and builds and tests dist by default.
+	grunt.registerTask('serve', 'Test, build, serve files. (~20s)', function serve () {
 		var tasks = ['test', 'servedist'];
 		grunt.task.run(tasks);
 	});
 
 	// serve task that runs tests and builds and tests dist by default (~20s).
-	grunt.registerTask('serveslow', 'Serve files. Run all tests. Does not build. (~20s)', function () {
+	grunt.registerTask('serveslow', 'Serve files. Run all tests. Does not build. (~20s)', function serveslow () {
 		var tasks = ['connect:server', 'test', 'watch:source'];
 		grunt.task.run(tasks);
 	});
 
-	//Fastest serve command for freely slinging code (no tests will run by default).
-	grunt.registerTask('servefast', 'Serve the files (no watch), --test to run minimal tests. (~0s)', function () {
+	// Fastest serve command for freely slinging code (no tests will run by default).
+	grunt.registerTask('servefast', 'Serve the files (no watch), --test to run minimal tests. (~0s)', function servefast () {
 		grunt.task.run(['connect:server']);
 
 		if (grunt.option('test')) {
@@ -27,7 +23,7 @@ module.exports = function(grunt) {
 	});
 
 	// Fastest serve command when you're working on LESS
-	grunt.registerTask('serveless', 'Compile LESS and serve the files. pass --tests to run test. (~3s)', function () {
+	grunt.registerTask('serveless', 'Compile LESS and serve the files. pass --tests to run test. (~3s)', function serveless () {
 		grunt.task.run(['distcss']);
 
 		if (grunt.option('test')) {
@@ -46,27 +42,25 @@ module.exports = function(grunt) {
 	});
 
 	// Complies the less files into the -dev versions, does not overwrite the main css files.
-	grunt.registerTask('servedev', 'Serve the files with no "dist" build or tests. Optional --no-less to also disable compiling less into css.', function() {
-		if (! grunt.option('no-less') ) {
+	grunt.registerTask('servedev', 'Serve the files with no "dist" build or tests. Optional --no-less to also disable compiling less into css.', function servedev () {
+		if ( !grunt.option('no-less') ) {
 			grunt.task.run(['distcssdev']);
 		}
 		grunt.task.run(['connect:server', 'watch:cssdev']);
 	});
 
 	// same as `grunt serve` but tests default to being off
-	grunt.registerTask('servedist', 'Compile and serve everything, pass --test to run tests. (~7s)', function () {
+	grunt.registerTask('servedist', 'Compile and serve everything, pass --test to run tests. (~7s)', function servedist () {
 		grunt.task.run(['dist']);
 
-		//start up the servers here so we can run tests if appropriate
+		// start up the servers here so we can run tests if appropriate
 		grunt.task.run(['connect:server']);
 		grunt.task.run(['connect:testServer']);
 
 		if (grunt.option('test')) {
-			grunt.task.run(['browserify:commonjs','qunit:dist', 'watch:full']);
+			grunt.task.run(['browserify:commonjs', 'qunit:dist', 'watch:full']);
 		} else {
 			grunt.task.run(['watch:dist']);
 		}
 	});
-
-
-};
+};

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

@@ -57,53 +57,6 @@
 			<section id="checkboxes">
 				<h2>Checkboxes</h2>
 				<div class="thin-box">
-					<section id="checkboxes-block">
-						<div id="myCheckbox1Wrapper" style="width: 300px;"></div>
-						<div class="checkbox" id="myCheckbox">
-							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomCheckbox1">
-								<input class="sr-only" type="checkbox" value="" />
-								<span class="checkbox-label">Custom checkbox unchecked on page load</span>
-							</label>
-						</div>
-						<div class="checkbox" id="myCheckbox2">
-							<label class="checkbox-custom checked" data-initialize="checkbox" id="myCustomCheckbox2">
-								<input class="sr-only" checked="checked" type="checkbox" value="" />
-								<span class="checkbox-label">Custom checkbox checked on page load</span>
-							</label>
-						</div>
-						<div class="checkbox" id="myCheckbox3">
-							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomCheckbox3">
-								<input class="sr-only" disabled="disabled" type="checkbox" value="" />
-								<span class="checkbox-label">Disabled custom checkbox unchecked on page load</span>
-							</label>
-						</div>
-						<div class="checkbox" id="myCheckbox4">
-							<label class="checkbox-custom checked disabled" data-initialize="checkbox" id="myCustomCheckbox4">
-								<input class="sr-only" checked="checked" disabled="disabled" type="checkbox" value="" />
-								<span class="checkbox-label">Disabled custom checkbox checked on page load</span>
-							</label>
-						</div>
-					</section>
-
-					<section id="checkboxes-inline">
-						<label class="checkbox-custom checkbox-inline" data-initialize="checkbox" id="myCustomInlineCheckbox1">
-							<input type="checkbox" class="sr-only" checked="checked" />
-							<span class="checkbox-label">1, 2, buckle my shoe</span>
-						</label>
-						<label class="checkbox-custom checkbox-inline" data-initialize="checkbox" id="myCustomInlineCheckbox2">
-							<input type="checkbox" class="sr-only" />
-							<span class="checkbox-label">3, 4, shut the door</span>
-						</label>
-						<label class="checkbox-custom checkbox-inline" data-initialize="checkbox" id="myCustomInlineCheckbox3">
-							<input type="checkbox" class="sr-only" disabled="disabled" />
-							<span class="checkbox-label">5, 6, pick up sticks</span>
-						</label>
-						<label class="checkbox-custom checkbox-inline" data-initialize="checkbox" id="myCustomInlineCheckbox4">
-							<input type="checkbox" class="checked sr-only" checked="checked" disabled="disabled" />
-							<span class="checkbox-label">7, 8, lay them straight</span>
-						</label>
-					</section>
-
 					<section id="checkboxes-toggling">
 						<div class="checkbox">
 							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomTogglingCheckbox1">
@@ -2118,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>
@@ -2160,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;