Merge remote-tracking branch 'origin/master' into #149

Conflicts:
	dist/js/axs_testing.js
	src/audits/FocusableElementNotVisibleAndNotAriaHidden.js

Changelog.md

@@ -1,6 +1,16 @@
+## 2.7.1-rc.1 - 2015-06-23
+
+### Bug fixes:
+
+* Check for null `textAlternatives` in `FocusableElementNotVisibleAndNotAriaHidden`'s `relevantElementMatcher` method.
+
+## 2.7.1-rc.0 - 2015-06-15
+
 ### Enhancements:
 * Rework findTextAlternatives not to return non-exposed text alternatives.
 * Add Bower config (#157)
+* Pull color code into separate file.
+* Improve color suggestion algorithm.
 
 ### Bug fixes:
 * Check for any text alternatives when assessing unlabeled images (#154).

Gruntfile.js

@@ -18,6 +18,7 @@ module.exports = function(grunt) {
               './src/js/axs.js',
               './src/js/BrowserUtils.js',
               './src/js/Constants.js',
+              './src/js/Color.js',
               './src/js/AccessibilityUtils.js',
               './src/js/Properties.js',
               './src/js/AuditRule.js',
@@ -53,7 +54,8 @@ module.exports = function(grunt) {
     },
 
     clean: {
-      all: ['.tmp', 'dist']
+      local: ['.tmp'],
+      dist: ['dist']
     },
 
     bump: {
@@ -69,7 +71,7 @@ module.exports = function(grunt) {
     coffee: {
       compile: {
         files: {
-          '.tmp/util/gh_repo.js': 'src/util/gh_repo.coffee'
+          '.tmp/util/gh_repo.js': 'scripts/gh_repo.coffee'
         }
       }
     },
@@ -220,6 +222,7 @@ module.exports = function(grunt) {
       'prompt:gh-release',
       'build',
       'test:unit',
+      'clean:dist',
       'copy:dist',
       'bump-only:' + releaseType,
       'changelog:' + releaseType,
@@ -237,9 +240,9 @@ module.exports = function(grunt) {
     grunt.task.run('git-describe');
   });
 
-  grunt.registerTask('build', ['clean:all', 'save-revision', 'closurecompiler:minify']);
+  grunt.registerTask('build', ['clean:local', 'save-revision', 'closurecompiler:minify']);
   grunt.registerTask('test:unit', ['qunit']);
-  grunt.registerTask('dist', ['build', 'copy:dist']);
+  grunt.registerTask('dist', ['clean:dist', 'build', 'copy:dist']);
   grunt.registerTask('travis', ['closurecompiler:minify', 'test:unit']);
   grunt.registerTask('default', ['build', 'test:unit']);
 };

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.0",
+  "version": "2.7.1-rc.1",
   "homepage": "https://github.com/GoogleChrome/accessibility-developer-tools",
   "authors": [
     "Google"