html-minifier 1.4.0 → 1.5.0

package/src/htmllint.js

@@ -1,7 +1,7 @@
 /*!
  * HTMLLint (to be used in conjunction with HTMLMinifier)
  *
- * Copyright (c) 2010-2013 Juriy "kangax" Zaytsev
+ * Copyright (c) 2010-2016 Juriy "kangax" Zaytsev
  * Licensed under the MIT license.
  *
  */
@@ -9,67 +9,65 @@
 'use strict';
 
 function isPresentationalElement(tag) {
-  return (/^(?:big|small|hr|blink|marquee)$/).test(tag);
+  return /^(?:big|small|hr|blink|marquee)$/.test(tag);
 }
 function isDeprecatedElement(tag) {
-  return (/^(?:applet|basefont|center|dir|font|isindex|strike)$/).test(tag);
+  return /^(?:applet|basefont|center|dir|font|isindex|strike)$/.test(tag);
 }
 function isEventAttribute(attrName) {
-  return (/^on[a-z]+/).test(attrName);
+  return /^on[a-z]+/.test(attrName);
 }
 function isStyleAttribute(attrName) {
-  return (attrName.toLowerCase() === 'style');
+  return attrName.toLowerCase() === 'style';
 }
 function isDeprecatedAttribute(tag, attrName) {
   return (
-    (attrName === 'align' &&
-    (/^(?:caption|applet|iframe|img|imput|object|legend|table|hr|div|h[1-6]|p)$/).test(tag)) ||
-    (attrName === 'alink' && tag === 'body') ||
-    (attrName === 'alt' && tag === 'applet') ||
-    (attrName === 'archive' && tag === 'applet') ||
-    (attrName === 'background' && tag === 'body') ||
-    (attrName === 'bgcolor' && (/^(?:table|t[rdh]|body)$/).test(tag)) ||
-    (attrName === 'border' && (/^(?:img|object)$/).test(tag)) ||
-    (attrName === 'clear' && tag === 'br') ||
-    (attrName === 'code' && tag === 'applet') ||
-    (attrName === 'codebase' && tag === 'applet') ||
-    (attrName === 'color' && (/^(?:base(?:font)?)$/).test(tag)) ||
-    (attrName === 'compact' && (/^(?:dir|[dou]l|menu)$/).test(tag)) ||
-    (attrName === 'face' && (/^base(?:font)?$/).test(tag)) ||
-    (attrName === 'height' && (/^(?:t[dh]|applet)$/).test(tag)) ||
-    (attrName === 'hspace' && (/^(?:applet|img|object)$/).test(tag)) ||
-    (attrName === 'language' && tag === 'script') ||
-    (attrName === 'link' && tag === 'body') ||
-    (attrName === 'name' && tag === 'applet') ||
-    (attrName === 'noshade' && tag === 'hr') ||
-    (attrName === 'nowrap' && (/^t[dh]$/).test(tag)) ||
-    (attrName === 'object' && tag === 'applet') ||
-    (attrName === 'prompt' && tag === 'isindex') ||
-    (attrName === 'size' && (/^(?:hr|font|basefont)$/).test(tag)) ||
-    (attrName === 'start' && tag === 'ol') ||
-    (attrName === 'text' && tag === 'body') ||
-    (attrName === 'type' && (/^(?:li|ol|ul)$/).test(tag)) ||
-    (attrName === 'value' && tag === 'li') ||
-    (attrName === 'version' && tag === 'html') ||
-    (attrName === 'vlink' && tag === 'body') ||
-    (attrName === 'vspace' && (/^(?:applet|img|object)$/).test(tag)) ||
-    (attrName === 'width' && (/^(?:hr|td|th|applet|pre)$/).test(tag))
+    attrName === 'align' &&
+    /^(?:caption|applet|iframe|img|imput|object|legend|table|hr|div|h[1-6]|p)$/.test(tag) ||
+    attrName === 'alink' && tag === 'body' ||
+    attrName === 'alt' && tag === 'applet' ||
+    attrName === 'archive' && tag === 'applet' ||
+    attrName === 'background' && tag === 'body' ||
+    attrName === 'bgcolor' && /^(?:table|t[rdh]|body)$/.test(tag) ||
+    attrName === 'border' && /^(?:img|object)$/.test(tag) ||
+    attrName === 'clear' && tag === 'br' ||
+    attrName === 'code' && tag === 'applet' ||
+    attrName === 'codebase' && tag === 'applet' ||
+    attrName === 'color' && /^(?:base(?:font)?)$/.test(tag) ||
+    attrName === 'compact' && /^(?:dir|[dou]l|menu)$/.test(tag) ||
+    attrName === 'face' && /^base(?:font)?$/.test(tag) ||
+    attrName === 'height' && /^(?:t[dh]|applet)$/.test(tag) ||
+    attrName === 'hspace' && /^(?:applet|img|object)$/.test(tag) ||
+    attrName === 'language' && tag === 'script' ||
+    attrName === 'link' && tag === 'body' ||
+    attrName === 'name' && tag === 'applet' ||
+    attrName === 'noshade' && tag === 'hr' ||
+    attrName === 'nowrap' && /^t[dh]$/.test(tag) ||
+    attrName === 'object' && tag === 'applet' ||
+    attrName === 'prompt' && tag === 'isindex' ||
+    attrName === 'size' && /^(?:hr|font|basefont)$/.test(tag) ||
+    attrName === 'start' && tag === 'ol' ||
+    attrName === 'text' && tag === 'body' ||
+    attrName === 'type' && /^(?:li|ol|ul)$/.test(tag) ||
+    attrName === 'value' && tag === 'li' ||
+    attrName === 'version' && tag === 'html' ||
+    attrName === 'vlink' && tag === 'body' ||
+    attrName === 'vspace' && /^(?:applet|img|object)$/.test(tag) ||
+    attrName === 'width' && /^(?:hr|td|th|applet|pre)$/.test(tag)
   );
 }
 function isInaccessibleAttribute(attrName, attrValue) {
-  return (
-    attrName === 'href' &&
-    (/^\s*javascript\s*:\s*void\s*(\s+0|\(\s*0\s*\))\s*$/i).test(attrValue)
-  );
+  return attrName === 'href' && /^\s*javascript\s*:\s*void\s*(\s+0|\(\s*0\s*\))\s*$/i.test(attrValue);
 }
 
 function Lint() {
-  this.log = [ ];
+  this.log = [];
   this._lastElement = null;
   this._isElementRepeated = false;
 }
 
 Lint.prototype.testElement = function(tag) {
+  this._attributes = Object.create(null);
   if (isDeprecatedElement(tag)) {
     this.log.push(
       'Found <span class="deprecated-element">deprecated</span> <strong><code>&lt;' +
@@ -103,6 +101,15 @@ Lint.prototype._reportRepeatingElement = function() {
 };
 
 Lint.prototype.testAttribute = function(tag, attrName, attrValue) {
+  if (this._attributes[attrName]) {
+    this.log.push(
+      'Found <span class="repeating-attribute">repeating attribute</span> (<strong>' +
+      attrName + '</strong>) on <strong><code>&lt;' + tag + '&gt;</code></strong> element.'
+    );
+  }
+  else {
+    this._attributes[attrName] = true;
+  }
   if (isEventAttribute(attrName)) {
     this.log.push(
       'Found <span class="event-attribute">event attribute</span> (<strong>' +
@@ -141,24 +148,29 @@ Lint.prototype.test = function(tag, attrName, attrValue) {
   this.testAttribute(tag, attrName, attrValue);
 };
 
+Lint.prototype.testDoctype = function(doctype) {
+  this._doctype = doctype;
+};
+
 Lint.prototype.populate = function(writeToElement) {
+  if (!this._doctype) {
+    this.log.push('No DOCTYPE found.');
+  }
+
   if (this._isElementRepeated) {
     this._reportRepeatingElement();
   }
 
-  if (this.log.length) {
-    if (writeToElement) {
-      writeToElement.innerHTML = '<ol><li>' + this.log.join('<li>') + '</ol>';
-    }
-    else {
-      var output = ' - ' +
-        this.log.join('\n - ')
-        .replace(/(<([^>]+)>)/ig, '')
-        .replace(/&lt;/g, '<')
-        .replace(/&gt;/g, '>');
-
-      console.log(output);
-    }
+  var output;
+  if (writeToElement) {
+    output = this.log.map(function(line) {
+      return '<li>' + line + '</li>';
+    }).join('');
+    writeToElement.innerHTML = '<ol>' + output + '</ol>';
+  }
+  else if (this.log.length) {
+    output = this.log.join('\n - ').replace(/<[^>]+>/g, '');
+    console.log(' - ' + output.replace(/&lt;/g, '<').replace(/&gt;/g, '>'));
   }
 };