update dependencies

chalk 2.0.1
commander 2.11.0
gruntify-eslint 4.0.0

diff --git a/package.json b/package.json
index 775d600..13f849d 100644 (file)
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
   "dependencies": {
     "camel-case": "3.0.x",
     "clean-css": "4.1.x",
-    "commander": "2.9.x",
+    "commander": "2.11.x",
     "he": "1.1.x",
     "ncname": "1.0.x",
     "param-case": "2.1.x",
@@ -67,13 +67,13 @@
     "grunt": "1.0.x",
     "grunt-browserify": "5.0.x",
     "grunt-contrib-uglify": "3.0.x",
-    "gruntify-eslint": "3.1.x",
+    "gruntify-eslint": "4.0.x",
     "phantomjs-prebuilt": "2.1.x",
     "qunitjs": "2.x"
   },
   "benchmarkDependencies": {
     "brotli": "1.3.x",
-    "chalk": "1.1.x",
+    "chalk": "2.0.x",
     "cli-table": "0.3.x",
     "lzma": "2.3.x",
     "minimize": "2.1.x",

diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index d52498f..6910e15 100644 (file)
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -131,29 +131,29 @@ function isAttributeRedundant(tag, attrName, attrValue, attrs) {
   attrValue = attrValue ? trimWhitespace(attrValue.toLowerCase()) : '';
 
   return (
-      tag === 'script' &&
-      attrName === 'language' &&
-      attrValue === 'javascript' ||
+    tag === 'script' &&
+    attrName === 'language' &&
+    attrValue === 'javascript' ||
 
-      tag === 'form' &&
-      attrName === 'method' &&
-      attrValue === 'get' ||
+    tag === 'form' &&
+    attrName === 'method' &&
+    attrValue === 'get' ||
 
-      tag === 'input' &&
-      attrName === 'type' &&
-      attrValue === 'text' ||
+    tag === 'input' &&
+    attrName === 'type' &&
+    attrValue === 'text' ||
 
-      tag === 'script' &&
-      attrName === 'charset' &&
-      !attributesInclude(attrs, 'src') ||
+    tag === 'script' &&
+    attrName === 'charset' &&
+    !attributesInclude(attrs, 'src') ||
 
-      tag === 'a' &&
-      attrName === 'name' &&
-      attributesInclude(attrs, 'id') ||
+    tag === 'a' &&
+    attrName === 'name' &&
+    attributesInclude(attrs, 'id') ||
 
-      tag === 'area' &&
-      attrName === 'shape' &&
-      attrValue === 'rect'
+    tag === 'area' &&
+    attrName === 'shape' &&
+    attrValue === 'rect'
   );
 }
 

diff --git a/src/htmlparser.js b/src/htmlparser.js
index 2195347..74695a0 100644 (file)
--- a/src/htmlparser.js
+++ b/src/htmlparser.js
@@ -26,7 +26,7 @@
  *
  */
 
- /* global ActiveXObject, DOMDocument */
+/* global ActiveXObject, DOMDocument */
 
 'use strict';
 

diff --git a/tests/minifier.js b/tests/minifier.js
index 361dff1..577c9ef 100644 (file)
--- a/tests/minifier.js
+++ b/tests/minifier.js
@@ -1,4 +1,4 @@
- /* global minify */
+/* global minify */
 'use strict';
 
 if (typeof minify === 'undefined') {
@@ -1930,22 +1930,22 @@ QUnit.test('script minification', function(assert) {
   assert.equal(minify(input, { minifyJS: true }), input);
 
   input = '<script>(function(){ var foo = 1; var bar = 2; alert(foo + " " + bar); })()</script>';
-  output = '<script>!function(){alert("1 2")}()</script>';
+  output = '<script>alert("1 2")</script>';
 
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type="text/JavaScript">(function(){ var foo = 1; var bar = 2; alert(foo + " " + bar); })()</script>';
-  output = '<script type="text/JavaScript">!function(){alert("1 2")}()</script>';
+  output = '<script type="text/JavaScript">alert("1 2")</script>';
 
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type="application/javascript;version=1.8">(function(){ var foo = 1; var bar = 2; alert(foo + " " + bar); })()</script>';
-  output = '<script type="application/javascript;version=1.8">!function(){alert("1 2")}()</script>';
+  output = '<script type="application/javascript;version=1.8">alert("1 2")</script>';
 
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type=" application/javascript  ; charset=utf-8 ">(function(){ var foo = 1; var bar = 2; alert(foo + " " + bar); })()</script>';
-  output = '<script type="application/javascript;charset=utf-8">!function(){alert("1 2")}()</script>';
+  output = '<script type="application/javascript;charset=utf-8">alert("1 2")</script>';
 
   assert.equal(minify(input, { minifyJS: true }), output);