fix collapseWhitespace on attributes which contains custom fragments
authoralexlamsl <alexlamsl@gmail.com>
Mon, 14 Mar 2016 11:30:26 +0000 (19:30 +0800)
committeralexlamsl <alexlamsl@gmail.com>
Mon, 14 Mar 2016 11:30:26 +0000 (19:30 +0800)
fixes #551

dist/htmlminifier.js
dist/htmlminifier.min.js
src/htmlminifier.js
tests/minifier.js

index 820bbc0..8e29f8e 100644 (file)
     };
   }
 
+  function compressWhitespace(spaces) {
+    return spaces === '\t' ? spaces : ' ';
+  }
+
   function collapseWhitespaceAll(str) {
-    return str ? str.replace(/[\t\n\r ]+/g, ' ') : str;
+    return str ? str.replace(/[\t\n\r ]+/g, compressWhitespace) : str;
   }
 
   function createMap(values) {
     }
 
     if (trimLeft) {
-      str = str.replace(/^\s+/, !lineBreakBefore && options.conservativeCollapse ? ' ' : '');
+      str = str.replace(/^\s+/, !lineBreakBefore && options.conservativeCollapse ? compressWhitespace : '');
     }
 
     if (trimRight) {
-      str = str.replace(/\s+$/, !lineBreakAfter && options.conservativeCollapse ? ' ' : '');
+      str = str.replace(/\s+$/, !lineBreakAfter && options.conservativeCollapse ? compressWhitespace : '');
     }
 
     if (collapseAll) {
index 040f845..13209e8 100644 (file)
@@ -3,4 +3,4 @@
  * Copyright 2010-2016 Juriy "kangax" Zaytsev
  * Licensed under the MIT license
  */
-!function(a){"use strict";function b(a){var b=e.source+"(?:\\s*("+c(a)+")\\s*(?:"+h.join("|")+"))?";if(a.customAttrSurround){for(var d=[],f=a.customAttrSurround.length-1;f>=0;f--)d[f]="(?:("+a.customAttrSurround[f][0].source+")\\s*"+b+"\\s*("+a.customAttrSurround[f][1].source+"))";d.push("(?:"+b+")"),b="(?:"+d.join("|")+")"}return new RegExp("^\\s*"+b)}function c(a){return g.concat(a.customAttrAssign||[]).map(function(a){return"(?:"+a.source+")"}).join("|")}function d(a){for(var b={},c=a.split(","),d=0;d<c.length;d++)b[c[d]]=!0,b[c[d].toUpperCase()]=!0;return b}var e=/([^\s"'<>\/=]+)/,f=/=/,g=[f],h=[/"([^"]*)"+/.source,/'([^']*)'+/.source,/([^\s"'=<>`]+)/.source],i=function(){var b;return b="function"==typeof require?require("ncname"):a.NCName,b=b?b.source.slice(1,-1):"[:A-Za-z_][:\\w\\-\\.]*","((?:"+b+"\\:)?"+b+")"}(),j=new RegExp("^<"+i),k=/^\s*(\/?)>/,l=new RegExp("^<\\/"+i+"[^>]*>"),m=/^<!DOCTYPE [^>]+>/i,n=!1;"x".replace(/x(.)?/g,function(a,b){n=""===b});var o=d("area,base,basefont,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),p=d("a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,noscript,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,svg,textarea,tt,u,var"),q=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),r=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),s=d("script,style"),t=d("abbr,b,bdi,bdo,button,cite,code,data,dfn,em,h1,h2,h3,h4,h5,h6,i,kbd,label,legend,mark,meter,output,p,pre,progress,q,rp,rt,s,samp,small,span,strong,sub,sup,time,u,var"),u=d("a,abbr,area,audio,b,bdi,bdo,br,button,canvas,cite,code,data,datalist,del,dfn,em,embed,i,iframe,img,input,ins,kbd,keygen,label,link,main,map,mark,math,menu,meter,nav,noscript,object,ol,output,p,picture,pre,progress,q,ruby,s,samp,script,section,select,small,span,strong,sub,sup,svg,table,template,textarea,time,u,ul,var,video,wbr"),v={},w=a.HTMLParser=function(a,c){function d(a){var b=a.match(j);if(b){var c={tagName:b[1],attrs:[]};a=a.slice(b[0].length);for(var d,e;!(d=a.match(k))&&(e=a.match(y));)a=a.slice(e[0].length),c.attrs.push(e);if(d)return c.unarySlash=d[1],c.rest=a.slice(d[0].length),c}}function e(a){var b=a.tagName,d=a.unarySlash;if(c.html5&&g&&t[g]&&!u[b]&&f("",g),!c.html5)for(;g&&p[g];)f("",g);q[b]&&g===b&&f("",b);var e=o[b]||"html"===b&&"head"===g||!!d,h=a.attrs.map(function(a){var b,d,e,f,g,h,i,j=7;n&&-1===a[0].indexOf('""')&&(""===a[3]&&(a[3]=void 0),""===a[4]&&(a[4]=void 0),""===a[5]&&(a[5]=void 0));var k=1;if(c.customAttrSurround)for(var l=0,m=c.customAttrSurround.length;m>l;l++,k+=j)if(b=a[k+1],h=a[k+2],b){e=a[k+3],d=e||a[k+4]||a[k+5],i=e?'"':d?"'":"",f=a[k],g=a[k+6];break}return!b&&(b=a[k])&&(h=a[k+1],e=a[k+2],d=e||a[k+3]||a[k+4],i=e?'"':d?"'":""),void 0===d&&(d=r[b]?b:e),{name:b,value:d,customAssign:h||"=",customOpen:f||"",customClose:g||"",quote:i||""}});e||(x.push({tag:b,attrs:h}),g=b,d=""),c.start&&c.start(b,h,e,d)}function f(a,b){var d;if(b){var e=b.toLowerCase();for(d=x.length-1;d>=0&&x[d].tag.toLowerCase()!==e;d--);}else d=0;if(d>=0){for(var f=x.length-1;f>=d;f--)c.end&&c.end(x[f].tag,x[f].attrs,f>d||!a);x.length=d,g=d&&x[d-1].tag}}for(var g,h,i,w,x=[],y=b(c);a;){if(h=a,g&&s[g]){var z=g.toLowerCase(),A=v[z]||(v[z]=new RegExp("([\\s\\S]*?)</"+z+"[^>]*>","i"));a=a.replace(A,function(a,b){return"script"!==z&&"style"!==z&&"noscript"!==z&&(b=b.replace(/<!--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g,"$1")),c.chars&&c.chars(b),""}),f("</"+z+">",z)}else{var B=a.indexOf("<");if(0===B){if(/^<!--/.test(a)){var C=a.indexOf("-->");if(C>=0){c.comment&&c.comment(a.substring(4,C)),a=a.substring(C+3),i="";continue}}if(/^<!\[/.test(a)){var D=a.indexOf("]>");if(D>=0){c.comment&&c.comment(a.substring(2,D+1),!0),a=a.substring(D+2),i="";continue}}var E=a.match(m);if(E){c.doctype&&c.doctype(E[0]),a=a.substring(E[0].length),i="";continue}var F=a.match(l);if(F){a=a.substring(F[0].length),F[0].replace(l,f),i="/"+F[1].toLowerCase();continue}var G=d(a);if(G){a=G.rest,e(G),i=G.tagName.toLowerCase();continue}}var H;B>=0?(H=a.substring(0,B),a=a.substring(B)):(H=a,a="");var I=d(a);I?w=I.tagName:(I=a.match(l),w=I?"/"+I[1]:""),c.chars&&c.chars(H,i,w),i=""}if(a===h)throw"Parse Error: "+a}c.partialMarkup||f()};a.HTMLtoXML=function(a){var b="";return new w(a,{start:function(a,c,d){b+="<"+a;for(var e=0;e<c.length;e++)b+=" "+c[e].name+'="'+(c[e].value||"").replace(/"/g,"&#34;")+'"';b+=(d?"/":"")+">"},end:function(a){b+="</"+a+">"},chars:function(a){b+=a},comment:function(a){b+="<!--"+a+"-->"},ignore:function(a){b+=a}}),b},a.HTMLtoDOM=function(a,b){var c=d("html,head,body,title"),e={link:"head",base:"head"};b?b=b.ownerDocument||b.getOwnerDocument&&b.getOwnerDocument()||b:"undefined"!=typeof DOMDocument?b=new DOMDocument:"undefined"!=typeof document&&document.implementation&&document.implementation.createDocument?b=document.implementation.createDocument("","",null):"undefined"!=typeof ActiveX&&(b=new ActiveXObject("Msxml.DOMDocument"));var f=[],g=b.documentElement||b.getDocumentElement&&b.getDocumentElement();if(!g&&b.createElement&&!function(){var a=b.createElement("html"),c=b.createElement("head");c.appendChild(b.createElement("title")),a.appendChild(c),a.appendChild(b.createElement("body")),b.appendChild(a)}(),b.getElementsByTagName)for(var h in c)c[h]=b.getElementsByTagName(h)[0];var i=c.body;return new w(a,{start:function(a,d,g){if(c[a])return void(i=c[a]);var h=b.createElement(a);for(var j in d)h.setAttribute(d[j].name,d[j].value);e[a]&&"boolean"!=typeof c[e[a]]?c[e[a]].appendChild(h):i&&i.appendChild&&i.appendChild(h),g||(f.push(h),i=h)},end:function(){f.length-=1,i=f[f.length-1]},chars:function(a){i.appendChild(b.createTextNode(a))},comment:function(){},ignore:function(){}}),b}}("undefined"==typeof exports?this:exports),function(a){"use strict";function b(a){return a?a.replace(/[\t\n\r ]+/g," "):a}function c(a){var b={};return a.forEach(function(a){b[a]=1}),function(a){return 1===b[a]}}function d(a){return c(a.split(/,/))}function e(a,c,d,e,f){var g="",h="";return c.preserveLineBreaks&&(a=a.replace(/^[\t ]*[\n\r][\t\n\r ]*/,function(){return g="\n",""}).replace(/[\t\n\r ]*[\n\r][\t ]*$/,function(){return h="\n",""})),d&&(a=a.replace(/^\s+/,!g&&c.conservativeCollapse?" ":"")),e&&(a=a.replace(/\s+$/,!h&&c.conservativeCollapse?" ":"")),f&&(a=b(a)),g+a+h}function f(a,b,c,d){var f=b&&!W(b);f&&!d.collapseInlineTagWhitespace&&(f="/"===b.charAt(0)?!U(b.slice(1)):!V(b));var g=c&&!W(c);return g&&!d.collapseInlineTagWhitespace&&(g="/"===c.charAt(0)?!V(c.slice(1)):!U(c)),e(a,d,f,g,b&&c)}function g(a){return/^\[if\s[^\]]+\]|\[endif\]$/.test(a)}function h(a,b){if(/^!/.test(a))return!0;if(b.ignoreCustomComments)for(var c=0,d=b.ignoreCustomComments.length;d>c;c++)if(b.ignoreCustomComments[c].test(a))return!0;return!1}function i(a,b){var c=b.customEventAttributes;if(c){for(var d=c.length;d--;)if(c[d].test(a))return!0;return!1}return/^on[a-z]{3,}$/.test(a)}function j(a){return/^[^\x20\t\n\f\r"'`=<>]+$/.test(a)}function k(a,b){for(var c=a.length;c--;)if(a[c].name.toLowerCase()===b)return!0;return!1}function l(a,b,c,d){return c=c?T(c.toLowerCase()):"","script"===a&&"language"===b&&"javascript"===c||"form"===a&&"method"===b&&"get"===c||"input"===a&&"type"===b&&"text"===c||"script"===a&&"charset"===b&&!k(d,"src")||"a"===a&&"name"===b&&k(d,"id")||"area"===a&&"shape"===b&&"rect"===c}function m(a,b,c){return"script"===a&&"type"===b&&X(T(c.toLowerCase()))}function n(a,b){if("script"!==a)return!1;for(var c=0,d=b.length;d>c;c++){var e=b[c].name.toLowerCase();if("type"===e){var f=T(b[c].value.split(/;/,2)[0]).toLowerCase();return""===f||X(f)}}return!0}function o(a,b,c){return("style"===a||"link"===a)&&"type"===b&&"text/css"===T(c.toLowerCase())}function p(a,b){return Y(a)||"draggable"===a&&!Z(b)}function q(a,b){return/^(?:a|area|link|base)$/.test(b)&&"href"===a||"img"===b&&/^(?:src|longdesc|usemap)$/.test(a)||"object"===b&&/^(?:classid|codebase|data|usemap)$/.test(a)||"q"===b&&"cite"===a||"blockquote"===b&&"cite"===a||("ins"===b||"del"===b)&&"cite"===a||"form"===b&&"action"===a||"input"===b&&("src"===a||"usemap"===a)||"head"===b&&"profile"===a||"script"===b&&("src"===a||"for"===a)}function r(a,b){return/^(?:a|area|object|button)$/.test(b)&&"tabindex"===a||"input"===b&&("maxlength"===a||"tabindex"===a)||"select"===b&&("size"===a||"tabindex"===a)||"textarea"===b&&/^(?:rows|cols|tabindex)$/.test(a)||"colgroup"===b&&"span"===a||"col"===b&&"span"===a||("th"===b||"td"===b)&&("rowspan"===a||"colspan"===a)}function s(a,b){if("link"!==a)return!1;for(var c=0,d=b.length;d>c;c++)if("rel"===b[c].name&&"canonical"===b[c].value)return!0}function t(a,c,d,e,f){if(d&&i(c,e)){if(d=T(d).replace(/^javascript:\s*/i,"").replace(/\s*;$/,""),e.minifyJS){var g=M($+d+_,e.minifyJS);return g.slice($.length,-_.length)}return d}return"class"===c?b(T(d)):q(c,a)?(d=T(d),e.minifyURLs&&!s(a,f)?L(d,e.minifyURLs):d):r(c,a)?T(d):"style"===c?(d=T(d),d&&(d=d.replace(/\s*;\s*$/,"")),e.minifyCSS?N(d,e.minifyCSS,!0):d):(u(a,f)&&"content"===c?d=d.replace(/\s+/g,"").replace(/[0-9]+\.[0-9]+/g,function(a){return(+a).toString()}):d&&e.customAttrCollapse&&e.customAttrCollapse.test(c)?d=d.replace(/\n+|\r+|\s{2,}/g,""):"script"===a&&"type"===c&&(d=T(d.replace(/\s*;\s*/g,";"))),d)}function u(a,b){if("meta"!==a)return!1;for(var c=0,d=b.length;d>c;c++)if("name"===b[c].name&&"viewport"===b[c].value)return!0}function v(a){return"*{"+a+"}"}function w(a){var b=a.match(/^\*\{([\s\S]*)\}$/m);return b&&b[1]?b[1]:a}function x(a,b){return a.replace(/^(\[if\s[^\]]+\]>)([\s\S]*?)(<!\[endif\])$/,function(a,c,d,e){return c+P(d,b,!0)+e})}function y(a){return a.replace(/^(?:\s*\/\*\s*<!\[CDATA\[\s*\*\/|\s*\/\/\s*<!\[CDATA\[.*)/,"").replace(/(?:\/\*\s*\]\]>\s*\*\/|\/\/\s*\]\]>)\s*$/,"")}function z(a,b,c){for(var d=0,e=c.length;e>d;d++)if("type"===c[d].name.toLowerCase()&&b.processScripts.indexOf(c[d].value)>-1)return P(a,b);return a}function A(a,b){return a.replace(aa[b],"").replace(ba[b],"")}function B(a,b){switch(a){case"html":case"head":return!0;case"body":return!ea(b);case"colgroup":return"col"===b;case"tbody":return"tr"===b}return!1}function C(a,b){switch(b){case"colgroup":return"colgroup"===a;case"tbody":return ma(a)}return!1}function D(a,b){switch(a){case"html":case"head":case"body":case"colgroup":case"caption":return!0;case"li":case"optgroup":case"tr":return b===a;case"dt":case"dd":return fa(b);case"p":return ga(b);case"rb":case"rt":case"rp":return ia(b);case"rtc":return ja(b);case"option":return ka(b);case"thead":case"tbody":return la(b);case"tfoot":return"tbody"===b;case"td":case"th":return na(b)}return!1}function E(a,b,c){var d=!c||/^\s*$/.test(c);return d?"input"===a&&"value"===b||ta.test(b):!1}function F(a,b){for(var c=b.length-1;c>=0;c--)if(b[c].name===a)return!0;return!1}function G(a,b){switch(a){case"textarea":return!1;case"audio":case"script":case"video":if(F("src",b))return!1;break;case"iframe":if(F("src",b)||F("srcdoc",b))return!1;break;case"object":if(F("data",b))return!1;break;case"applet":if(F("code",b))return!1}return!0}function H(a){return!/^(?:script|style|pre|textarea)$/.test(a)}function I(a){return!/^(?:pre|textarea)$/.test(a)}function J(a,b,c,d,e,f,g){var h,i,k=f.caseSensitive?a.name:a.name.toLowerCase(),n=a.value,q=a.quote;if(f.removeRedundantAttributes&&l(c,k,n,b)||f.removeScriptTypeAttributes&&m(c,k,n)||f.removeStyleLinkTypeAttributes&&o(c,k,n))return"";if(n=t(c,k,n,f,b),f.removeEmptyAttributes&&E(c,k,n))return"";if(void 0!==n&&!f.removeAttributeQuotes||!j(n)){if(!f.preventAttributesEscaping){if(void 0!==f.quoteCharacter)q="'"===f.quoteCharacter?"'":'"';else{var r=(n.match(/'/g)||[]).length,s=(n.match(/"/g)||[]).length;q=s>r?"'":'"'}n='"'===q?n.replace(/"/g,"&#34;"):n.replace(/'/g,"&#39;")}i=q+n+q,g||f.removeTagWhitespace||(i+=" ")}else i=!g||d||/\/$/.test(n)?n+" ":n;return void 0===n||f.collapseBooleanAttributes&&p(k.toLowerCase(),n.toLowerCase())?(h=k,g||(h+=" ")):h=k+a.customAssign+i,a.customOpen+h+a.customClose}function K(a){"includeAutoGeneratedTags"in a||(a.includeAutoGeneratedTags=!0);for(var b=["canCollapseWhitespace","canTrimWhitespace"],c=0,d=b.length;d>c;c++)a[b[c]]||(a[b[c]]=function(){return!1})}function L(b,c){"object"!=typeof c&&(c={});try{var d=a.RelateUrl;return"undefined"==typeof d&&"function"==typeof require&&(d=require("relateurl")),d&&d.relate?d.relate(b,c):b}catch(e){R(e)}return b}function M(b,c){"object"!=typeof c&&(c={}),c.fromString=!0;var d=c.output||{};d.inline_script=!0,c.output=d;try{var e=a.UglifyJS;if("undefined"==typeof e&&"function"==typeof require&&(e=require("uglify-js")),!e)return b;if(e.minify)return e.minify(b,c).code;if(e.parse){var f=e.parse(b);f.figure_out_scope();var g=e.Compressor(),h=f.transform(g);h.figure_out_scope(),h.compute_char_frequency(),c.mangle!==!1&&h.mangle_names();var i=e.OutputStream(c.output);return h.print(i),i.toString()}return b}catch(j){R(j)}return b}function N(b,c,d){"object"!=typeof c&&(c={}),"undefined"==typeof c.advanced&&(c.advanced=!1);try{var e=a.CleanCSS;"undefined"==typeof e&&"function"==typeof require&&(e=require("clean-css"));var f=new e(c);return d?w(f.minify(v(b)).styles):f.minify(b).styles}catch(g){R(g)}return b}function O(a){var b;do b=Math.random().toString(36).slice(2);while(~a.indexOf(b));return b}function P(a,c,d){function i(a,b){return H(a)||c.canCollapseWhitespace(a,b)}function j(a,b){return I(a)||c.canTrimWhitespace(a,b)}function k(){for(var a=t.length-1;a>0&&!/^<[^\/!]/.test(t[a]);)a--;t.length=Math.max(0,a)}function l(){for(var a=t.length-1;a>0&&!/^<\//.test(t[a]);)a--;t.length=Math.max(0,a)}function m(a){var b;t.length>1&&/^(?:<!|$)/.test(t[t.length-1])&&/\s$/.test(t[t.length-2])?b=t.length-2:t.length>0&&/\s$/.test(t[t.length-1])&&(b=t.length-1),b>0&&(t[b]=t[b].replace(/\s+$/,function(b){return f(b,"comment",a,c)}))}c=c||{};var o=[];K(c),a=c.collapseWhitespace?T(a):a;var p,q,r,s,t=[],u="",v="",w=[],E=[],F=[],L="",P="",U=c.lint,W=Date.now(),X=[],Y=[];a=a.replace(/<!-- htmlmin:ignore -->([\s\S]*?)<!-- htmlmin:ignore -->/g,function(b,c){r||(r="<!--!"+O(a)+"-->");var d=r+X.length;return X.push(c),d});var Z=(c.ignoreCustomFragments||[/<%[\s\S]*?%>/,/<\?[\s\S]*?\?>/]).map(function(a){return a.source});if(Z.length){var $=new RegExp("\\s*(?:"+Z.join("|")+")+\\s*","g");a=a.replace($,function(b){s||(s=O(a));var c=s+Y.length;return Y.push(b),"   "+c+"   "})}new S(a,{partialMarkup:d,html5:"undefined"!=typeof c.html5?c.html5:!0,start:function(a,b,d,e){var f=a.toLowerCase();if("svg"===f){o.push(c);var g={};for(var h in c)g[h]=c[h];g.keepClosingSlash=!0,g.caseSensitive=!0,c=g}a=c.caseSensitive?a:f,v=a,p=a,V(a)||(u=""),q=!1,w=b;var n=c.removeOptionalTags;if(n){var r=sa(a);r&&B(L,a)&&k(),L="",r&&D(P,a)&&(l(),n=!C(P,a)),P=""}c.collapseWhitespace&&(E.length||m(a),j(a,b)||E.push(a),i(a,b)||F.push(a));var s="<"+a,x=e&&c.keepClosingSlash;t.push(s),U&&U.testElement(a);for(var y,z=[],A=!0,G=b.length;--G>=0;)U&&U.testAttribute(a,b[G].name.toLowerCase(),b[G].value),y=J(b[G],b,a,x,G,c,A),y&&(A=!1,z.unshift(y));z.length>0?(t.push(" "),t.push.apply(t,z)):n&&ca(a)&&(L=a),t.push(t.pop()+(x?"/":"")+">")},end:function(a,b,d){var e=a.toLowerCase();"svg"===e&&(c=o.pop()),a=c.caseSensitive?a:e,c.collapseWhitespace&&(E.length?a===E[E.length-1]&&E.pop():m("/"+a),F.length&&a===F[F.length-1]&&F.pop());var f=!1;a===v&&(v="",f=!q),c.removeOptionalTags&&(f&&oa(L)&&k(),L="",!sa(a)||!P||ra(P)||"p"===P&&ha(a)||l(),P=da(a)?a:""),c.removeEmptyElements&&f&&G(a,b)?(k(),L="",P=""):(!c.includeAutoGeneratedTags&&d||t.push("</"+a+">"),p="/"+a,V(a)||(u=""))},chars:function(a,d,g){if(d=""===d?"comment":d,g=""===g?"comment":g,c.collapseWhitespace){if(!E.length){if("comment"===d){var h=""===t[t.length-1];if(h&&(d=p),t.length>1&&(h||/ $/.test(u))){var i=t.length-2;t[i]=t[i].replace(/\s+$/,function(b){return a=b+a,""})}}if(d&&V("/"===d.charAt(0)?d.slice(1):d)&&(a=e(a,c,/(?:^|\s)$/.test(u))),a=d||g?f(a,d,g,c):T(a),!a&&/\s$/.test(u)&&d&&"/"===d.charAt(0))for(var m=t.length-2,o=d.slice(1);m>=0&&j(o);m--){var r=t[m],s=r.match(/^<\/([\w:-]+)>$/);if(s)o=s[1];else if(/>$/.test(r)||(t[m]=f(r,null,g,c)))break}}F.length||(a=d&&g||"html"===g?a:b(a))}"script"!==v&&"style"!==v||(c.removeCommentsFromCDATA&&(a=A(a,v)),c.removeCDATASectionsFromCDATA&&(a=y(a)),c.processScripts&&(a=z(a,c,w))),c.minifyJS&&n(v,w)&&(a=M(a,c.minifyJS),";"===a.charAt(a.length-1)&&(a=a.slice(0,-1))),"style"===v&&c.minifyCSS&&(a=N(a,c.minifyCSS)),c.removeOptionalTags&&a&&(("html"===L||"body"===L&&!/^\s/.test(a))&&k(),L="",(pa(P)||qa(P)&&!/^\s/.test(a))&&l(),P=""),p=/^\s*$/.test(a)?d:"comment",u+=a,a&&(q=!0),U&&U.testChars(a),t.push(a)},comment:function(a,b){var d=b?"<!":"<!--",e=b?">":"-->";a=g(a)?d+x(a,c)+e:c.removeComments?h(a,c)?"<!--"+a+"-->":"":d+a+e,c.removeOptionalTags&&a&&(L="",P=""),t.push(a)},doctype:function(a){t.push(c.useShortDoctype?"<!DOCTYPE html>":b(a))},customAttrAssign:c.customAttrAssign,customAttrSurround:c.customAttrSurround}),c.removeOptionalTags&&(oa(L)&&k(),P&&!ra(P)&&l());var _=Q(t,c);return s&&(_=_.replace(new RegExp("(\\s*)"+s+"([0-9]+)(\\s*)","g"),function(a,b,d,f){var g=Y[+d];return c.collapseWhitespace?("       "!==b&&(g=b+g),"        "!==f&&(g+=f),e(g,{preserveLineBreaks:c.preserveLineBreaks,conservativeCollapse:!0},/^\s/.test(g),/\s$/.test(g))):g})),r&&(_=_.replace(new RegExp(r+"([0-9]+)","g"),function(a,b){return X[+b]})),R("minified in: "+(Date.now()-W)+"ms"),_}function Q(a,b){var c,d=b.maxLineLength;if(d){for(var e,f=[],g="",h=0,i=a.length;i>h;h++)e=a[h],g.length+e.length<d?g+=e:(f.push(g.replace(/^\n/,"")),g=e);f.push(g),c=f.join("\n")}else c=a.join("");return b.collapseWhitespace?T(c):c}var R,S;R=a.console&&a.console.log?function(b){a.console.log(b)}:function(){},a.HTMLParser?S=a.HTMLParser:"function"==typeof require&&(S=require("./htmlparser").HTMLParser);var T=function(a){return"string"!=typeof a?a:a.replace(/^\s+/,"").replace(/\s+$/,"")};String.prototype.trim&&(T=function(a){return"string"!=typeof a?a:a.trim()});var U=d("a,abbr,acronym,b,bdi,bdo,big,button,cite,code,del,dfn,em,font,i,ins,kbd,mark,math,q,rt,rp,s,samp,small,span,strike,strong,sub,sup,svg,time,tt,u,var"),V=d("a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var"),W=d("comment,img,input"),X=c(["text/javascript","text/ecmascript","text/jscript","application/javascript","application/x-javascript","application/ecmascript"]),Y=d("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"),Z=d("true,false"),$="!function(){",_="}();",aa={script:/^\s*(?:\/\/)?\s*<!--.*\n?/,style:/^\s*<!--\s*/},ba={script:/\s*(?:\/\/)?\s*-->\s*$/,style:/\s*-->\s*$/},ca=d("html,head,body,colgroup,tbody"),da=d("html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,caption,thead,tbody,tfoot,tr,td,th"),ea=d("meta,link,script,style,template,noscript"),fa=d("dt,dd"),ga=d("address,article,aside,blockquote,details,div,dl,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,main,menu,nav,ol,p,pre,section,table,ul"),ha=d("a,audio,del,ins,map,noscript,video"),ia=d("rb,rt,rtc,rp"),ja=d("rb,rtc,rp"),ka=d("option,optgroup"),la=d("tbody,tfoot"),ma=d("thead,tbody,tfoot"),na=d("td,th"),oa=d("html,head,body"),pa=d("html,body"),qa=d("head,colgroup,caption"),ra=d("dt,thead"),sa=d("a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,command,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,element,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,menu,menuitem,meta,meter,multicol,nav,nobr,noembed,noframes,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,pre,progress,q,rp,rt,rtc,ruby,s,samp,script,section,select,shadow,small,source,spacer,span,strike,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,xmp"),ta=new RegExp("^(?:class|id|style|title|lang|dir|on(?:focus|blur|change|click|dblclick|mouse(?:down|up|over|move|out)|key(?:press|down|up)))$");a.minify=function(a,b){return P(a,b)}}("undefined"==typeof exports?this:exports),function(a){"use strict";function b(a){return/^(?:big|small|hr|blink|marquee)$/.test(a)}function c(a){return/^(?:applet|basefont|center|dir|font|isindex|strike)$/.test(a)}function d(a){return/^on[a-z]+/.test(a)}function e(a){return"style"===a.toLowerCase()}function f(a,b){return"align"===b&&/^(?:caption|applet|iframe|img|imput|object|legend|table|hr|div|h[1-6]|p)$/.test(a)||"alink"===b&&"body"===a||"alt"===b&&"applet"===a||"archive"===b&&"applet"===a||"background"===b&&"body"===a||"bgcolor"===b&&/^(?:table|t[rdh]|body)$/.test(a)||"border"===b&&/^(?:img|object)$/.test(a)||"clear"===b&&"br"===a||"code"===b&&"applet"===a||"codebase"===b&&"applet"===a||"color"===b&&/^(?:base(?:font)?)$/.test(a)||"compact"===b&&/^(?:dir|[dou]l|menu)$/.test(a)||"face"===b&&/^base(?:font)?$/.test(a)||"height"===b&&/^(?:t[dh]|applet)$/.test(a)||"hspace"===b&&/^(?:applet|img|object)$/.test(a)||"language"===b&&"script"===a||"link"===b&&"body"===a||"name"===b&&"applet"===a||"noshade"===b&&"hr"===a||"nowrap"===b&&/^t[dh]$/.test(a)||"object"===b&&"applet"===a||"prompt"===b&&"isindex"===a||"size"===b&&/^(?:hr|font|basefont)$/.test(a)||"start"===b&&"ol"===a||"text"===b&&"body"===a||"type"===b&&/^(?:li|ol|ul)$/.test(a)||"value"===b&&"li"===a||"version"===b&&"html"===a||"vlink"===b&&"body"===a||"vspace"===b&&/^(?:applet|img|object)$/.test(a)||"width"===b&&/^(?:hr|td|th|applet|pre)$/.test(a)}function g(a,b){return"href"===a&&/^\s*javascript\s*:\s*void\s*(\s+0|\(\s*0\s*\))\s*$/i.test(b)}function h(){this.log=[],this._lastElement=null,this._isElementRepeated=!1}h.prototype.testElement=function(a){c(a)?this.log.push('Found <span class="deprecated-element">deprecated</span> <strong><code>&lt;'+a+"&gt;</code></strong> element"):b(a)?this.log.push('Found <span class="presentational-element">presentational</span> <strong><code>&lt;'+a+"&gt;</code></strong> element"):this.checkRepeatingElement(a)},h.prototype.checkRepeatingElement=function(a){"br"===a&&"br"===this._lastElement?this._isElementRepeated=!0:this._isElementRepeated&&(this._reportRepeatingElement(),this._isElementRepeated=!1),this._lastElement=a},h.prototype._reportRepeatingElement=function(){this.log.push("Found <code>&lt;br></code> sequence. Try replacing it with styling.")},h.prototype.testAttribute=function(a,b,c){d(b)?this.log.push('Found <span class="event-attribute">event attribute</span> (<strong>'+b+"</strong>) on <strong><code>&lt;"+a+"&gt;</code></strong> element."):f(a,b)?this.log.push('Found <span class="deprecated-attribute">deprecated</span> <strong>'+b+"</strong> attribute on <strong><code>&lt;"+a+"&gt;</code></strong> element."):e(b)?this.log.push('Found <span class="style-attribute">style attribute</span> on <strong><code>&lt;'+a+"&gt;</code></strong> element."):g(b,c)&&this.log.push('Found <span class="inaccessible-attribute">inaccessible attribute</span> (on <strong><code>&lt;'+a+"&gt;</code></strong> element).")},h.prototype.testChars=function(a){this._lastElement="",/(&nbsp;\s*){2,}/.test(a)&&this.log.push("Found repeating <strong><code>&amp;nbsp;</code></strong> sequence. Try replacing it with styling.")},h.prototype.test=function(a,b,c){this.testElement(a),this.testAttribute(a,b,c)},h.prototype.populate=function(a){if(this._isElementRepeated&&this._reportRepeatingElement(),this.log.length)if(a)a.innerHTML="<ol><li>"+this.log.join("<li>")+"</ol>";else{var b=" - "+this.log.join("\n - ").replace(/(<([^>]+)>)/gi,"").replace(/&lt;/g,"<").replace(/&gt;/g,">");console.log(b)}},a.HTMLLint=h}("undefined"==typeof exports?this:exports);
\ No newline at end of file
+!function(a){"use strict";function b(a){var b=e.source+"(?:\\s*("+c(a)+")\\s*(?:"+h.join("|")+"))?";if(a.customAttrSurround){for(var d=[],f=a.customAttrSurround.length-1;f>=0;f--)d[f]="(?:("+a.customAttrSurround[f][0].source+")\\s*"+b+"\\s*("+a.customAttrSurround[f][1].source+"))";d.push("(?:"+b+")"),b="(?:"+d.join("|")+")"}return new RegExp("^\\s*"+b)}function c(a){return g.concat(a.customAttrAssign||[]).map(function(a){return"(?:"+a.source+")"}).join("|")}function d(a){for(var b={},c=a.split(","),d=0;d<c.length;d++)b[c[d]]=!0,b[c[d].toUpperCase()]=!0;return b}var e=/([^\s"'<>\/=]+)/,f=/=/,g=[f],h=[/"([^"]*)"+/.source,/'([^']*)'+/.source,/([^\s"'=<>`]+)/.source],i=function(){var b;return b="function"==typeof require?require("ncname"):a.NCName,b=b?b.source.slice(1,-1):"[:A-Za-z_][:\\w\\-\\.]*","((?:"+b+"\\:)?"+b+")"}(),j=new RegExp("^<"+i),k=/^\s*(\/?)>/,l=new RegExp("^<\\/"+i+"[^>]*>"),m=/^<!DOCTYPE [^>]+>/i,n=!1;"x".replace(/x(.)?/g,function(a,b){n=""===b});var o=d("area,base,basefont,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),p=d("a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,noscript,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,svg,textarea,tt,u,var"),q=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),r=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),s=d("script,style"),t=d("abbr,b,bdi,bdo,button,cite,code,data,dfn,em,h1,h2,h3,h4,h5,h6,i,kbd,label,legend,mark,meter,output,p,pre,progress,q,rp,rt,s,samp,small,span,strong,sub,sup,time,u,var"),u=d("a,abbr,area,audio,b,bdi,bdo,br,button,canvas,cite,code,data,datalist,del,dfn,em,embed,i,iframe,img,input,ins,kbd,keygen,label,link,main,map,mark,math,menu,meter,nav,noscript,object,ol,output,p,picture,pre,progress,q,ruby,s,samp,script,section,select,small,span,strong,sub,sup,svg,table,template,textarea,time,u,ul,var,video,wbr"),v={},w=a.HTMLParser=function(a,c){function d(a){var b=a.match(j);if(b){var c={tagName:b[1],attrs:[]};a=a.slice(b[0].length);for(var d,e;!(d=a.match(k))&&(e=a.match(y));)a=a.slice(e[0].length),c.attrs.push(e);if(d)return c.unarySlash=d[1],c.rest=a.slice(d[0].length),c}}function e(a){var b=a.tagName,d=a.unarySlash;if(c.html5&&g&&t[g]&&!u[b]&&f("",g),!c.html5)for(;g&&p[g];)f("",g);q[b]&&g===b&&f("",b);var e=o[b]||"html"===b&&"head"===g||!!d,h=a.attrs.map(function(a){var b,d,e,f,g,h,i,j=7;n&&-1===a[0].indexOf('""')&&(""===a[3]&&(a[3]=void 0),""===a[4]&&(a[4]=void 0),""===a[5]&&(a[5]=void 0));var k=1;if(c.customAttrSurround)for(var l=0,m=c.customAttrSurround.length;m>l;l++,k+=j)if(b=a[k+1],h=a[k+2],b){e=a[k+3],d=e||a[k+4]||a[k+5],i=e?'"':d?"'":"",f=a[k],g=a[k+6];break}return!b&&(b=a[k])&&(h=a[k+1],e=a[k+2],d=e||a[k+3]||a[k+4],i=e?'"':d?"'":""),void 0===d&&(d=r[b]?b:e),{name:b,value:d,customAssign:h||"=",customOpen:f||"",customClose:g||"",quote:i||""}});e||(x.push({tag:b,attrs:h}),g=b,d=""),c.start&&c.start(b,h,e,d)}function f(a,b){var d;if(b){var e=b.toLowerCase();for(d=x.length-1;d>=0&&x[d].tag.toLowerCase()!==e;d--);}else d=0;if(d>=0){for(var f=x.length-1;f>=d;f--)c.end&&c.end(x[f].tag,x[f].attrs,f>d||!a);x.length=d,g=d&&x[d-1].tag}}for(var g,h,i,w,x=[],y=b(c);a;){if(h=a,g&&s[g]){var z=g.toLowerCase(),A=v[z]||(v[z]=new RegExp("([\\s\\S]*?)</"+z+"[^>]*>","i"));a=a.replace(A,function(a,b){return"script"!==z&&"style"!==z&&"noscript"!==z&&(b=b.replace(/<!--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g,"$1")),c.chars&&c.chars(b),""}),f("</"+z+">",z)}else{var B=a.indexOf("<");if(0===B){if(/^<!--/.test(a)){var C=a.indexOf("-->");if(C>=0){c.comment&&c.comment(a.substring(4,C)),a=a.substring(C+3),i="";continue}}if(/^<!\[/.test(a)){var D=a.indexOf("]>");if(D>=0){c.comment&&c.comment(a.substring(2,D+1),!0),a=a.substring(D+2),i="";continue}}var E=a.match(m);if(E){c.doctype&&c.doctype(E[0]),a=a.substring(E[0].length),i="";continue}var F=a.match(l);if(F){a=a.substring(F[0].length),F[0].replace(l,f),i="/"+F[1].toLowerCase();continue}var G=d(a);if(G){a=G.rest,e(G),i=G.tagName.toLowerCase();continue}}var H;B>=0?(H=a.substring(0,B),a=a.substring(B)):(H=a,a="");var I=d(a);I?w=I.tagName:(I=a.match(l),w=I?"/"+I[1]:""),c.chars&&c.chars(H,i,w),i=""}if(a===h)throw"Parse Error: "+a}c.partialMarkup||f()};a.HTMLtoXML=function(a){var b="";return new w(a,{start:function(a,c,d){b+="<"+a;for(var e=0;e<c.length;e++)b+=" "+c[e].name+'="'+(c[e].value||"").replace(/"/g,"&#34;")+'"';b+=(d?"/":"")+">"},end:function(a){b+="</"+a+">"},chars:function(a){b+=a},comment:function(a){b+="<!--"+a+"-->"},ignore:function(a){b+=a}}),b},a.HTMLtoDOM=function(a,b){var c=d("html,head,body,title"),e={link:"head",base:"head"};b?b=b.ownerDocument||b.getOwnerDocument&&b.getOwnerDocument()||b:"undefined"!=typeof DOMDocument?b=new DOMDocument:"undefined"!=typeof document&&document.implementation&&document.implementation.createDocument?b=document.implementation.createDocument("","",null):"undefined"!=typeof ActiveX&&(b=new ActiveXObject("Msxml.DOMDocument"));var f=[],g=b.documentElement||b.getDocumentElement&&b.getDocumentElement();if(!g&&b.createElement&&!function(){var a=b.createElement("html"),c=b.createElement("head");c.appendChild(b.createElement("title")),a.appendChild(c),a.appendChild(b.createElement("body")),b.appendChild(a)}(),b.getElementsByTagName)for(var h in c)c[h]=b.getElementsByTagName(h)[0];var i=c.body;return new w(a,{start:function(a,d,g){if(c[a])return void(i=c[a]);var h=b.createElement(a);for(var j in d)h.setAttribute(d[j].name,d[j].value);e[a]&&"boolean"!=typeof c[e[a]]?c[e[a]].appendChild(h):i&&i.appendChild&&i.appendChild(h),g||(f.push(h),i=h)},end:function(){f.length-=1,i=f[f.length-1]},chars:function(a){i.appendChild(b.createTextNode(a))},comment:function(){},ignore:function(){}}),b}}("undefined"==typeof exports?this:exports),function(a){"use strict";function b(a){return"       "===a?a:" "}function c(a){return a?a.replace(/[\t\n\r ]+/g,b):a}function d(a){var b={};return a.forEach(function(a){b[a]=1}),function(a){return 1===b[a]}}function e(a){return d(a.split(/,/))}function f(a,d,e,f,g){var h="",i="";return d.preserveLineBreaks&&(a=a.replace(/^[\t ]*[\n\r][\t\n\r ]*/,function(){return h="\n",""}).replace(/[\t\n\r ]*[\n\r][\t ]*$/,function(){return i="\n",""})),e&&(a=a.replace(/^\s+/,!h&&d.conservativeCollapse?b:"")),f&&(a=a.replace(/\s+$/,!i&&d.conservativeCollapse?b:"")),g&&(a=c(a)),h+a+i}function g(a,b,c,d){var e=b&&!X(b);e&&!d.collapseInlineTagWhitespace&&(e="/"===b.charAt(0)?!V(b.slice(1)):!W(b));var g=c&&!X(c);return g&&!d.collapseInlineTagWhitespace&&(g="/"===c.charAt(0)?!W(c.slice(1)):!V(c)),f(a,d,e,g,b&&c)}function h(a){return/^\[if\s[^\]]+\]|\[endif\]$/.test(a)}function i(a,b){if(/^!/.test(a))return!0;if(b.ignoreCustomComments)for(var c=0,d=b.ignoreCustomComments.length;d>c;c++)if(b.ignoreCustomComments[c].test(a))return!0;return!1}function j(a,b){var c=b.customEventAttributes;if(c){for(var d=c.length;d--;)if(c[d].test(a))return!0;return!1}return/^on[a-z]{3,}$/.test(a)}function k(a){return/^[^\x20\t\n\f\r"'`=<>]+$/.test(a)}function l(a,b){for(var c=a.length;c--;)if(a[c].name.toLowerCase()===b)return!0;return!1}function m(a,b,c,d){return c=c?U(c.toLowerCase()):"","script"===a&&"language"===b&&"javascript"===c||"form"===a&&"method"===b&&"get"===c||"input"===a&&"type"===b&&"text"===c||"script"===a&&"charset"===b&&!l(d,"src")||"a"===a&&"name"===b&&l(d,"id")||"area"===a&&"shape"===b&&"rect"===c}function n(a,b,c){return"script"===a&&"type"===b&&Y(U(c.toLowerCase()))}function o(a,b){if("script"!==a)return!1;for(var c=0,d=b.length;d>c;c++){var e=b[c].name.toLowerCase();if("type"===e){var f=U(b[c].value.split(/;/,2)[0]).toLowerCase();return""===f||Y(f)}}return!0}function p(a,b,c){return("style"===a||"link"===a)&&"type"===b&&"text/css"===U(c.toLowerCase())}function q(a,b){return Z(a)||"draggable"===a&&!$(b)}function r(a,b){return/^(?:a|area|link|base)$/.test(b)&&"href"===a||"img"===b&&/^(?:src|longdesc|usemap)$/.test(a)||"object"===b&&/^(?:classid|codebase|data|usemap)$/.test(a)||"q"===b&&"cite"===a||"blockquote"===b&&"cite"===a||("ins"===b||"del"===b)&&"cite"===a||"form"===b&&"action"===a||"input"===b&&("src"===a||"usemap"===a)||"head"===b&&"profile"===a||"script"===b&&("src"===a||"for"===a)}function s(a,b){return/^(?:a|area|object|button)$/.test(b)&&"tabindex"===a||"input"===b&&("maxlength"===a||"tabindex"===a)||"select"===b&&("size"===a||"tabindex"===a)||"textarea"===b&&/^(?:rows|cols|tabindex)$/.test(a)||"colgroup"===b&&"span"===a||"col"===b&&"span"===a||("th"===b||"td"===b)&&("rowspan"===a||"colspan"===a)}function t(a,b){if("link"!==a)return!1;for(var c=0,d=b.length;d>c;c++)if("rel"===b[c].name&&"canonical"===b[c].value)return!0}function u(a,b,d,e,f){if(d&&j(b,e)){if(d=U(d).replace(/^javascript:\s*/i,"").replace(/\s*;$/,""),e.minifyJS){var g=N(_+d+aa,e.minifyJS);return g.slice(_.length,-aa.length)}return d}return"class"===b?c(U(d)):r(b,a)?(d=U(d),e.minifyURLs&&!t(a,f)?M(d,e.minifyURLs):d):s(b,a)?U(d):"style"===b?(d=U(d),d&&(d=d.replace(/\s*;\s*$/,"")),e.minifyCSS?O(d,e.minifyCSS,!0):d):(v(a,f)&&"content"===b?d=d.replace(/\s+/g,"").replace(/[0-9]+\.[0-9]+/g,function(a){return(+a).toString()}):d&&e.customAttrCollapse&&e.customAttrCollapse.test(b)?d=d.replace(/\n+|\r+|\s{2,}/g,""):"script"===a&&"type"===b&&(d=U(d.replace(/\s*;\s*/g,";"))),d)}function v(a,b){if("meta"!==a)return!1;for(var c=0,d=b.length;d>c;c++)if("name"===b[c].name&&"viewport"===b[c].value)return!0}function w(a){return"*{"+a+"}"}function x(a){var b=a.match(/^\*\{([\s\S]*)\}$/m);return b&&b[1]?b[1]:a}function y(a,b){return a.replace(/^(\[if\s[^\]]+\]>)([\s\S]*?)(<!\[endif\])$/,function(a,c,d,e){return c+Q(d,b,!0)+e})}function z(a){return a.replace(/^(?:\s*\/\*\s*<!\[CDATA\[\s*\*\/|\s*\/\/\s*<!\[CDATA\[.*)/,"").replace(/(?:\/\*\s*\]\]>\s*\*\/|\/\/\s*\]\]>)\s*$/,"")}function A(a,b,c){for(var d=0,e=c.length;e>d;d++)if("type"===c[d].name.toLowerCase()&&b.processScripts.indexOf(c[d].value)>-1)return Q(a,b);return a}function B(a,b){return a.replace(ba[b],"").replace(ca[b],"")}function C(a,b){switch(a){case"html":case"head":return!0;case"body":return!fa(b);case"colgroup":return"col"===b;case"tbody":return"tr"===b}return!1}function D(a,b){switch(b){case"colgroup":return"colgroup"===a;case"tbody":return na(a)}return!1}function E(a,b){switch(a){case"html":case"head":case"body":case"colgroup":case"caption":return!0;case"li":case"optgroup":case"tr":return b===a;case"dt":case"dd":return ga(b);case"p":return ha(b);case"rb":case"rt":case"rp":return ja(b);case"rtc":return ka(b);case"option":return la(b);case"thead":case"tbody":return ma(b);case"tfoot":return"tbody"===b;case"td":case"th":return oa(b)}return!1}function F(a,b,c){var d=!c||/^\s*$/.test(c);return d?"input"===a&&"value"===b||ua.test(b):!1}function G(a,b){for(var c=b.length-1;c>=0;c--)if(b[c].name===a)return!0;return!1}function H(a,b){switch(a){case"textarea":return!1;case"audio":case"script":case"video":if(G("src",b))return!1;break;case"iframe":if(G("src",b)||G("srcdoc",b))return!1;break;case"object":if(G("data",b))return!1;break;case"applet":if(G("code",b))return!1}return!0}function I(a){return!/^(?:script|style|pre|textarea)$/.test(a)}function J(a){return!/^(?:pre|textarea)$/.test(a)}function K(a,b,c,d,e,f,g){var h,i,j=f.caseSensitive?a.name:a.name.toLowerCase(),l=a.value,o=a.quote;if(f.removeRedundantAttributes&&m(c,j,l,b)||f.removeScriptTypeAttributes&&n(c,j,l)||f.removeStyleLinkTypeAttributes&&p(c,j,l))return"";if(l=u(c,j,l,f,b),f.removeEmptyAttributes&&F(c,j,l))return"";if(void 0!==l&&!f.removeAttributeQuotes||!k(l)){if(!f.preventAttributesEscaping){if(void 0!==f.quoteCharacter)o="'"===f.quoteCharacter?"'":'"';else{var r=(l.match(/'/g)||[]).length,s=(l.match(/"/g)||[]).length;o=s>r?"'":'"'}l='"'===o?l.replace(/"/g,"&#34;"):l.replace(/'/g,"&#39;")}i=o+l+o,g||f.removeTagWhitespace||(i+=" ")}else i=!g||d||/\/$/.test(l)?l+" ":l;return void 0===l||f.collapseBooleanAttributes&&q(j.toLowerCase(),l.toLowerCase())?(h=j,g||(h+=" ")):h=j+a.customAssign+i,a.customOpen+h+a.customClose}function L(a){"includeAutoGeneratedTags"in a||(a.includeAutoGeneratedTags=!0);for(var b=["canCollapseWhitespace","canTrimWhitespace"],c=0,d=b.length;d>c;c++)a[b[c]]||(a[b[c]]=function(){return!1})}function M(b,c){"object"!=typeof c&&(c={});try{var d=a.RelateUrl;return"undefined"==typeof d&&"function"==typeof require&&(d=require("relateurl")),d&&d.relate?d.relate(b,c):b}catch(e){S(e)}return b}function N(b,c){"object"!=typeof c&&(c={}),c.fromString=!0;var d=c.output||{};d.inline_script=!0,c.output=d;try{var e=a.UglifyJS;if("undefined"==typeof e&&"function"==typeof require&&(e=require("uglify-js")),!e)return b;if(e.minify)return e.minify(b,c).code;if(e.parse){var f=e.parse(b);f.figure_out_scope();var g=e.Compressor(),h=f.transform(g);h.figure_out_scope(),h.compute_char_frequency(),c.mangle!==!1&&h.mangle_names();var i=e.OutputStream(c.output);return h.print(i),i.toString()}return b}catch(j){S(j)}return b}function O(b,c,d){"object"!=typeof c&&(c={}),"undefined"==typeof c.advanced&&(c.advanced=!1);try{var e=a.CleanCSS;"undefined"==typeof e&&"function"==typeof require&&(e=require("clean-css"));var f=new e(c);return d?x(f.minify(w(b)).styles):f.minify(b).styles}catch(g){S(g)}return b}function P(a){var b;do b=Math.random().toString(36).slice(2);while(~a.indexOf(b));return b}function Q(a,b,d){function e(a,c){return I(a)||b.canCollapseWhitespace(a,c)}function j(a,c){return J(a)||b.canTrimWhitespace(a,c)}function k(){for(var a=t.length-1;a>0&&!/^<[^\/!]/.test(t[a]);)a--;t.length=Math.max(0,a)}function l(){for(var a=t.length-1;a>0&&!/^<\//.test(t[a]);)a--;t.length=Math.max(0,a)}function m(a){var c;t.length>1&&/^(?:<!|$)/.test(t[t.length-1])&&/\s$/.test(t[t.length-2])?c=t.length-2:t.length>0&&/\s$/.test(t[t.length-1])&&(c=t.length-1),c>0&&(t[c]=t[c].replace(/\s+$/,function(c){return g(c,"comment",a,b)}))}b=b||{};var n=[];L(b),a=b.collapseWhitespace?U(a):a;var p,q,r,s,t=[],u="",v="",w=[],x=[],F=[],G="",M="",Q=b.lint,V=Date.now(),X=[],Y=[];a=a.replace(/<!-- htmlmin:ignore -->([\s\S]*?)<!-- htmlmin:ignore -->/g,function(b,c){r||(r="<!--!"+P(a)+"-->");var d=r+X.length;return X.push(c),d});var Z=(b.ignoreCustomFragments||[/<%[\s\S]*?%>/,/<\?[\s\S]*?\?>/]).map(function(a){return a.source});if(Z.length){var $=new RegExp("\\s*(?:"+Z.join("|")+")+\\s*","g");a=a.replace($,function(b){s||(s=P(a));var c=s+Y.length;return Y.push(b),"       "+c+"   "})}new T(a,{partialMarkup:d,html5:"undefined"!=typeof b.html5?b.html5:!0,start:function(a,c,d,f){var g=a.toLowerCase();if("svg"===g){n.push(b);var h={};for(var i in b)h[i]=b[i];h.keepClosingSlash=!0,h.caseSensitive=!0,b=h}a=b.caseSensitive?a:g,v=a,p=a,W(a)||(u=""),q=!1,w=c;var o=b.removeOptionalTags;if(o){var r=ta(a);r&&C(G,a)&&k(),G="",r&&E(M,a)&&(l(),o=!D(M,a)),M=""}b.collapseWhitespace&&(x.length||m(a),j(a,c)||x.push(a),e(a,c)||F.push(a));var s="<"+a,y=f&&b.keepClosingSlash;t.push(s),Q&&Q.testElement(a);for(var z,A=[],B=!0,H=c.length;--H>=0;)Q&&Q.testAttribute(a,c[H].name.toLowerCase(),c[H].value),z=K(c[H],c,a,y,H,b,B),z&&(B=!1,A.unshift(z));A.length>0?(t.push(" "),t.push.apply(t,A)):o&&da(a)&&(G=a),t.push(t.pop()+(y?"/":"")+">")},end:function(a,c,d){var e=a.toLowerCase();"svg"===e&&(b=n.pop()),a=b.caseSensitive?a:e,b.collapseWhitespace&&(x.length?a===x[x.length-1]&&x.pop():m("/"+a),F.length&&a===F[F.length-1]&&F.pop());var f=!1;a===v&&(v="",f=!q),b.removeOptionalTags&&(f&&pa(G)&&k(),G="",!ta(a)||!M||sa(M)||"p"===M&&ia(a)||l(),M=ea(a)?a:""),b.removeEmptyElements&&f&&H(a,c)?(k(),G="",M=""):(!b.includeAutoGeneratedTags&&d||t.push("</"+a+">"),p="/"+a,W(a)||(u=""))},chars:function(a,d,e){if(d=""===d?"comment":d,e=""===e?"comment":e,b.collapseWhitespace){if(!x.length){if("comment"===d){var h=""===t[t.length-1];if(h&&(d=p),t.length>1&&(h||/ $/.test(u))){var i=t.length-2;t[i]=t[i].replace(/\s+$/,function(b){return a=b+a,""})}}if(d&&W("/"===d.charAt(0)?d.slice(1):d)&&(a=f(a,b,/(?:^|\s)$/.test(u))),a=d||e?g(a,d,e,b):U(a),!a&&/\s$/.test(u)&&d&&"/"===d.charAt(0))for(var m=t.length-2,n=d.slice(1);m>=0&&j(n);m--){var r=t[m],s=r.match(/^<\/([\w:-]+)>$/);if(s)n=s[1];else if(/>$/.test(r)||(t[m]=g(r,null,e,b)))break}}F.length||(a=d&&e||"html"===e?a:c(a))}"script"!==v&&"style"!==v||(b.removeCommentsFromCDATA&&(a=B(a,v)),b.removeCDATASectionsFromCDATA&&(a=z(a)),b.processScripts&&(a=A(a,b,w))),b.minifyJS&&o(v,w)&&(a=N(a,b.minifyJS),";"===a.charAt(a.length-1)&&(a=a.slice(0,-1))),"style"===v&&b.minifyCSS&&(a=O(a,b.minifyCSS)),b.removeOptionalTags&&a&&(("html"===G||"body"===G&&!/^\s/.test(a))&&k(),G="",(qa(M)||ra(M)&&!/^\s/.test(a))&&l(),M=""),p=/^\s*$/.test(a)?d:"comment",u+=a,a&&(q=!0),Q&&Q.testChars(a),t.push(a)},comment:function(a,c){var d=c?"<!":"<!--",e=c?">":"-->";a=h(a)?d+y(a,b)+e:b.removeComments?i(a,b)?"<!--"+a+"-->":"":d+a+e,b.removeOptionalTags&&a&&(G="",M=""),t.push(a)},doctype:function(a){t.push(b.useShortDoctype?"<!DOCTYPE html>":c(a))},customAttrAssign:b.customAttrAssign,customAttrSurround:b.customAttrSurround}),b.removeOptionalTags&&(pa(G)&&k(),M&&!sa(M)&&l());var _=R(t,b);return s&&(_=_.replace(new RegExp("(\\s*)"+s+"([0-9]+)(\\s*)","g"),function(a,c,d,e){var g=Y[+d];return b.collapseWhitespace?("       "!==c&&(g=c+g),"        "!==e&&(g+=e),f(g,{preserveLineBreaks:b.preserveLineBreaks,conservativeCollapse:!0},/^\s/.test(g),/\s$/.test(g))):g})),r&&(_=_.replace(new RegExp(r+"([0-9]+)","g"),function(a,b){return X[+b]})),S("minified in: "+(Date.now()-V)+"ms"),_}function R(a,b){var c,d=b.maxLineLength;if(d){for(var e,f=[],g="",h=0,i=a.length;i>h;h++)e=a[h],g.length+e.length<d?g+=e:(f.push(g.replace(/^\n/,"")),g=e);f.push(g),c=f.join("\n")}else c=a.join("");return b.collapseWhitespace?U(c):c}var S,T;S=a.console&&a.console.log?function(b){a.console.log(b)}:function(){},a.HTMLParser?T=a.HTMLParser:"function"==typeof require&&(T=require("./htmlparser").HTMLParser);var U=function(a){return"string"!=typeof a?a:a.replace(/^\s+/,"").replace(/\s+$/,"")};String.prototype.trim&&(U=function(a){return"string"!=typeof a?a:a.trim()});var V=e("a,abbr,acronym,b,bdi,bdo,big,button,cite,code,del,dfn,em,font,i,ins,kbd,mark,math,q,rt,rp,s,samp,small,span,strike,strong,sub,sup,svg,time,tt,u,var"),W=e("a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var"),X=e("comment,img,input"),Y=d(["text/javascript","text/ecmascript","text/jscript","application/javascript","application/x-javascript","application/ecmascript"]),Z=e("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"),$=e("true,false"),_="!function(){",aa="}();",ba={script:/^\s*(?:\/\/)?\s*<!--.*\n?/,style:/^\s*<!--\s*/},ca={script:/\s*(?:\/\/)?\s*-->\s*$/,style:/\s*-->\s*$/},da=e("html,head,body,colgroup,tbody"),ea=e("html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,caption,thead,tbody,tfoot,tr,td,th"),fa=e("meta,link,script,style,template,noscript"),ga=e("dt,dd"),ha=e("address,article,aside,blockquote,details,div,dl,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,main,menu,nav,ol,p,pre,section,table,ul"),ia=e("a,audio,del,ins,map,noscript,video"),ja=e("rb,rt,rtc,rp"),ka=e("rb,rtc,rp"),la=e("option,optgroup"),ma=e("tbody,tfoot"),na=e("thead,tbody,tfoot"),oa=e("td,th"),pa=e("html,head,body"),qa=e("html,body"),ra=e("head,colgroup,caption"),sa=e("dt,thead"),ta=e("a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,command,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,element,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,menu,menuitem,meta,meter,multicol,nav,nobr,noembed,noframes,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,pre,progress,q,rp,rt,rtc,ruby,s,samp,script,section,select,shadow,small,source,spacer,span,strike,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,xmp"),ua=new RegExp("^(?:class|id|style|title|lang|dir|on(?:focus|blur|change|click|dblclick|mouse(?:down|up|over|move|out)|key(?:press|down|up)))$");a.minify=function(a,b){return Q(a,b)}}("undefined"==typeof exports?this:exports),function(a){"use strict";function b(a){return/^(?:big|small|hr|blink|marquee)$/.test(a)}function c(a){return/^(?:applet|basefont|center|dir|font|isindex|strike)$/.test(a)}function d(a){return/^on[a-z]+/.test(a)}function e(a){return"style"===a.toLowerCase()}function f(a,b){return"align"===b&&/^(?:caption|applet|iframe|img|imput|object|legend|table|hr|div|h[1-6]|p)$/.test(a)||"alink"===b&&"body"===a||"alt"===b&&"applet"===a||"archive"===b&&"applet"===a||"background"===b&&"body"===a||"bgcolor"===b&&/^(?:table|t[rdh]|body)$/.test(a)||"border"===b&&/^(?:img|object)$/.test(a)||"clear"===b&&"br"===a||"code"===b&&"applet"===a||"codebase"===b&&"applet"===a||"color"===b&&/^(?:base(?:font)?)$/.test(a)||"compact"===b&&/^(?:dir|[dou]l|menu)$/.test(a)||"face"===b&&/^base(?:font)?$/.test(a)||"height"===b&&/^(?:t[dh]|applet)$/.test(a)||"hspace"===b&&/^(?:applet|img|object)$/.test(a)||"language"===b&&"script"===a||"link"===b&&"body"===a||"name"===b&&"applet"===a||"noshade"===b&&"hr"===a||"nowrap"===b&&/^t[dh]$/.test(a)||"object"===b&&"applet"===a||"prompt"===b&&"isindex"===a||"size"===b&&/^(?:hr|font|basefont)$/.test(a)||"start"===b&&"ol"===a||"text"===b&&"body"===a||"type"===b&&/^(?:li|ol|ul)$/.test(a)||"value"===b&&"li"===a||"version"===b&&"html"===a||"vlink"===b&&"body"===a||"vspace"===b&&/^(?:applet|img|object)$/.test(a)||"width"===b&&/^(?:hr|td|th|applet|pre)$/.test(a)}function g(a,b){return"href"===a&&/^\s*javascript\s*:\s*void\s*(\s+0|\(\s*0\s*\))\s*$/i.test(b)}function h(){this.log=[],this._lastElement=null,this._isElementRepeated=!1}h.prototype.testElement=function(a){c(a)?this.log.push('Found <span class="deprecated-element">deprecated</span> <strong><code>&lt;'+a+"&gt;</code></strong> element"):b(a)?this.log.push('Found <span class="presentational-element">presentational</span> <strong><code>&lt;'+a+"&gt;</code></strong> element"):this.checkRepeatingElement(a)},h.prototype.checkRepeatingElement=function(a){"br"===a&&"br"===this._lastElement?this._isElementRepeated=!0:this._isElementRepeated&&(this._reportRepeatingElement(),this._isElementRepeated=!1),this._lastElement=a},h.prototype._reportRepeatingElement=function(){this.log.push("Found <code>&lt;br></code> sequence. Try replacing it with styling.")},h.prototype.testAttribute=function(a,b,c){d(b)?this.log.push('Found <span class="event-attribute">event attribute</span> (<strong>'+b+"</strong>) on <strong><code>&lt;"+a+"&gt;</code></strong> element."):f(a,b)?this.log.push('Found <span class="deprecated-attribute">deprecated</span> <strong>'+b+"</strong> attribute on <strong><code>&lt;"+a+"&gt;</code></strong> element."):e(b)?this.log.push('Found <span class="style-attribute">style attribute</span> on <strong><code>&lt;'+a+"&gt;</code></strong> element."):g(b,c)&&this.log.push('Found <span class="inaccessible-attribute">inaccessible attribute</span> (on <strong><code>&lt;'+a+"&gt;</code></strong> element).")},h.prototype.testChars=function(a){this._lastElement="",/(&nbsp;\s*){2,}/.test(a)&&this.log.push("Found repeating <strong><code>&amp;nbsp;</code></strong> sequence. Try replacing it with styling.")},h.prototype.test=function(a,b,c){this.testElement(a),this.testAttribute(a,b,c)},h.prototype.populate=function(a){if(this._isElementRepeated&&this._reportRepeatingElement(),this.log.length)if(a)a.innerHTML="<ol><li>"+this.log.join("<li>")+"</ol>";else{var b=" - "+this.log.join("\n - ").replace(/(<([^>]+)>)/gi,"").replace(/&lt;/g,"<").replace(/&gt;/g,">");console.log(b)}},a.HTMLLint=h}("undefined"==typeof exports?this:exports);
\ No newline at end of file
index a261818..d66a367 100644 (file)
     };
   }
 
+  function compressWhitespace(spaces) {
+    return spaces === '\t' ? spaces : ' ';
+  }
+
   function collapseWhitespaceAll(str) {
-    return str ? str.replace(/[\t\n\r ]+/g, ' ') : str;
+    return str ? str.replace(/[\t\n\r ]+/g, compressWhitespace) : str;
   }
 
   function createMap(values) {
     }
 
     if (trimLeft) {
-      str = str.replace(/^\s+/, !lineBreakBefore && options.conservativeCollapse ? ' ' : '');
+      str = str.replace(/^\s+/, !lineBreakBefore && options.conservativeCollapse ? compressWhitespace : '');
     }
 
     if (trimRight) {
-      str = str.replace(/\s+$/, !lineBreakAfter && options.conservativeCollapse ? ' ' : '');
+      str = str.replace(/\s+$/, !lineBreakAfter && options.conservativeCollapse ? compressWhitespace : '');
     }
 
     if (collapseAll) {
index e4ffc3f..5a06b8a 100644 (file)
     input = '<p{% if form.name.errors %}class=\'error\'{% endif %}>' +
               '{{ form.name.label_tag }}' +
               '{{ form.name }}' +
+              ' <label>{{ label }}</label> ' +
               '{% if form.name.errors %}' +
               '{% for error in form.name.errors %}' +
               '<span class=\'error_msg\' style=\'color:#ff0000\'>{{ error }}</span>' +
       quoteCharacter: '\''
     }), input);
     output = '<p {% if form.name.errors %} class=\'error\' {% endif %}>' +
-              '{{ form.name.label_tag }}' +
-              '{{ form.name }}' +
-              '{% if form.name.errors %}' +
-              '{% for error in form.name.errors %} ' +
-              '<span class=\'error_msg\' style=\'color:#ff0000\'>{{ error }} </span>' +
-              '{% endfor %}' +
-              '{% endif %}' +
-            '</p>';
+               '{{ form.name.label_tag }}' +
+               '{{ form.name }}' +
+               ' <label>{{ label }}</label> ' +
+               '{% if form.name.errors %}' +
+               '{% for error in form.name.errors %}' +
+               '<span class=\'error_msg\' style=\'color:#ff0000\'>{{ error }}</span>' +
+               '{% endfor %}' +
+               '{% endif %}' +
+             '</p>';
     equal(minify(input, {
       ignoreCustomFragments: [
         /\{\%[\s\S]*?\%\}/g,
       ]
     }), input);
 
+    input = '<img class="titi.<%=tsItem_[0]%>">';
+    equal(minify(input), input);
+    equal(minify(input, {
+      collapseWhitespace: true
+    }), input);
+
     input = '<table id="<?php echo $this->escapeHtmlAttr($this->table_id); ?>"></table>';
     equal(minify(input), input);
     equal(minify(input, {