From b0dc2cb335ca4726f62b85ee53028d7b03e96252 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Tue, 1 Mar 2016 18:30:07 +0800 Subject: [PATCH] handle whitespace within and around inline tags --- dist/htmlminifier.js | 37 ++++++++++++++++++++++++++++--------- dist/htmlminifier.min.js | 2 +- src/htmlminifier.js | 37 ++++++++++++++++++++++++++++--------- tests/minifier.js | 29 +++++++++++++++++++---------- 4 files changed, 76 insertions(+), 29 deletions(-) diff --git a/dist/htmlminifier.js b/dist/htmlminifier.js index cb24d64..8dbe13c 100644 --- a/dist/htmlminifier.js +++ b/dist/htmlminifier.js @@ -619,15 +619,22 @@ return lineBreakBefore + str + lineBreakAfter; } - // array of non-empty element tags that will maintain a single space outside of them + // non-empty tags that will maintain whitespace around them var inlineTags = createMapFromString('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'); + // non-empty tags that will maintain whitespace within them + var inlineTextTags = createMapFromString('a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var'); + // self-closing tags that will maintain whitespace around them var selfClosingInlineTags = createMapFromString('comment,img,input'); function collapseWhitespaceSmart(str, prevTag, nextTag, options) { - var trimLeft = prevTag && !selfClosingInlineTags(prevTag) && - (options.collapseInlineTagWhitespace || prevTag.charAt(0) !== '/' || !inlineTags(prevTag.substr(1))); - var trimRight = nextTag && !selfClosingInlineTags(nextTag) && - (options.collapseInlineTagWhitespace || nextTag.charAt(0) === '/' || !inlineTags(nextTag)); + var trimLeft = prevTag && !selfClosingInlineTags(prevTag); + if (trimLeft && !options.collapseInlineTagWhitespace) { + trimLeft = prevTag.charAt(0) === '/' ? !inlineTags(prevTag.substr(1)) : !inlineTextTags(prevTag); + } + var trimRight = nextTag && !selfClosingInlineTags(nextTag); + if (trimRight && !options.collapseInlineTagWhitespace) { + trimRight = nextTag.charAt(0) === '/' ? !inlineTextTags(nextTag.substr(1)) : !inlineTags(nextTag); + } return collapseWhitespace(str, options, trimLeft, trimRight, prevTag && nextTag); } @@ -1258,6 +1265,7 @@ buffer = [ ], charsPrevTag, currentChars = '', + hasChars, currentTag = '', currentAttrs = [], stackNoTrimWhitespace = [], @@ -1348,7 +1356,10 @@ currentTag = tag; charsPrevTag = tag; - currentChars = ''; + if (!inlineTextTags(tag)) { + currentChars = ''; + } + hasChars = false; currentAttrs = attrs; var optional = options.removeOptionalTags; @@ -1452,7 +1463,7 @@ var isElementEmpty = false; if (tag === currentTag) { currentTag = ''; - isElementEmpty = currentChars === ''; + isElementEmpty = !hasChars; } if (options.removeOptionalTags) { @@ -1482,7 +1493,9 @@ results.push.apply(results, buffer); buffer = ['']; charsPrevTag = '/' + tag; - currentChars = ''; + if (!inlineTextTags(tag)) { + currentChars = ''; + } } }, chars: function(text, prevTag, nextTag) { @@ -1495,7 +1508,7 @@ if (removed) { prevTag = charsPrevTag; } - if (buffer.length > 1 && (removed || currentChars.charAt(currentChars.length - 1) === ' ')) { + if (buffer.length > 1 && (removed || / $/.test(currentChars))) { var charsIndex = buffer.length - 2; buffer[charsIndex] = buffer[charsIndex].replace(/\s+$/, function(trailingSpaces) { text = trailingSpaces + text; @@ -1503,6 +1516,9 @@ }); } } + if (prevTag && inlineTextTags(prevTag.charAt(0) === '/' ? prevTag.substr(1) : prevTag)) { + text = collapseWhitespace(text, options, /(?:^| )$/.test(currentChars)); + } text = prevTag || nextTag ? collapseWhitespaceSmart(text, prevTag, nextTag, options) : trimWhitespace(text); } if (!stackNoCollapseWhitespace.length) { @@ -1545,6 +1561,9 @@ } charsPrevTag = /^\s*$/.test(text) ? prevTag : 'comment'; currentChars += text; + if (text) { + hasChars = true; + } if (lint) { lint.testChars(text); } diff --git a/dist/htmlminifier.min.js b/dist/htmlminifier.min.js index 7617653..047a01d 100644 --- a/dist/htmlminifier.min.js +++ b/dist/htmlminifier.min.js @@ -3,4 +3,4 @@ * Copyright 2010-2016 Juriy "kangax" Zaytsev * Licensed under the MIT license */ -!function(a){"use strict";function b(a){var b,c=new RegExp("[\\w:\\.-]+(?:\\s*(?:"+d(a)+")\\s*(?:\"[^\"]*\"+?|'[^']*'+?|[^>\\s\"']+?))?");if(a.customAttrSurround){for(var e=[],f=a.customAttrSurround.length-1;f>=0;f--)e[f]="(?:"+a.customAttrSurround[f][0].source+"\\s*"+c.source+"\\s*"+a.customAttrSurround[f][1].source+")";e.unshift("(?:"+c.source+")"),b=new RegExp("((?:\\s*(?:"+e.join("|")+"))*)")}else b=new RegExp("((?:\\s*"+c.source+")*)");return new RegExp(j.source+b.source+k.source)}function c(a){var b=new RegExp(f.source+"(?:\\s*("+d(a)+")\\s*(?:"+i.join("|")+"))?");if(a.customAttrSurround){for(var c=[],e=a.customAttrSurround.length-1;e>=0;e--)c[e]="(?:("+a.customAttrSurround[e][0].source+")\\s*"+b.source+"\\s*("+a.customAttrSurround[e][1].source+"))";return c.unshift("(?:"+b.source+")"),new RegExp(c.join("|"),"g")}return new RegExp(b.source,"g")}function d(a){return h.concat(a.customAttrAssign||[]).map(function(a){return"(?:"+a.source+")"}).join("|")}function e(a){for(var b={},c=a.split(","),d=0;d\s]+)/.source],j=/^<([\w:-]+)/,k=/\s*(\/?)>/,l=/^<\/([\w:-]+)[^>]*>/,m=/\/>$/,n=/^]+>/i,o=!1;"x".replace(/x(.)?/g,function(a,b){o=""===b});var p,q,r,s=e("area,base,basefont,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),t=e("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"),u=e("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),v=e("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),w=e("script,style"),x={},y=a.HTMLParser=function(a,d){function e(a,b,c,e){for(var g=!1;!d.html5&&k.last()&&t[k.last()];)f("",k.last());u[b]&&k.last()===b&&f("",b),e=s[b]||!!e;var h=[];c.replace(A,function(){var a,b,c,e,f,g,i,j=7;if(o&&-1===arguments[0].indexOf('""')&&(""===arguments[3]&&(arguments[3]=void 0),""===arguments[4]&&(arguments[4]=void 0),""===arguments[5]&&(arguments[5]=void 0)),a=arguments[1])g=arguments[2],c=arguments[3],b=c||arguments[4]||arguments[5],g&&(i=arguments[0].charAt(a.length+g.length),i="'"===i||'"'===i?i:"");else if(d.customAttrSurround)for(var k=d.customAttrSurround.length-1;k>=0;k--)if(a=arguments[k*j+7],g=arguments[k*j+8],a){c=arguments[k*j+9],b=c||arguments[k*j+10]||arguments[k*j+11],e=arguments[k*j+6],f=arguments[k*j+12];break}void 0===b&&(b=v[a]?a:c),h.push({name:a,value:b,customAssign:g||"=",customOpen:e||"",customClose:f||"",quote:i||""})}),e?g=a.match(m):k.push({tag:b,attrs:h}),d.start&&d.start(b,h,e,g)}function f(a,b){var c;if(b){var e=b.toLowerCase();for(c=k.length-1;c>=0&&k[c].tag.toLowerCase()!==e;c--);}else c=0;if(c>=0){for(var f=k.length-1;f>=c;f--)d.end&&d.end(k[f].tag,k[f].attrs);k.length=c}}var g,h,i,j,k=[],y=a;k.last=function(){var a=this[this.length-1];return a&&a.tag};for(var z=b(d),A=c(d);a;){if(k.last()&&w[k.last()])p=k.last().toLowerCase(),q=x[p]||(x[p]=new RegExp("([\\s\\S]*?)]*>","i")),a=a.replace(q,function(a,b){return"script"!==p&&"style"!==p&&"noscript"!==p&&(b=b.replace(//g,"$1").replace(//g,"$1")),d.chars&&d.chars(b),""}),f("",p);else{if(/^"),g>=0)){d.comment&&d.comment(a.substring(4,g)),a=a.substring(g+3),i="";continue}if(/^"),g>=0)){d.comment&&d.comment(a.substring(2,g+1),!0),a=a.substring(g+2),i="";continue}if(h=n.exec(a)){d.doctype&&d.doctype(h[0]),a=a.substring(h[0].length),i="";continue}if(/^<\//.test(a)&&(h=a.match(l))){a=a.substring(h[0].length),h[0].replace(l,f),i="/"+h[1].toLowerCase();continue}if(/^g?a:a.substring(0,g);a=0>g?"":a.substring(g),r=a.match(z),r?j=r[1]:(r=a.match(l),j=r?"/"+r[1]:""),d.chars&&d.chars(B,i,j),i=""}if(a===y)throw"Parse Error: "+a;y=a}f()};a.HTMLtoXML=function(a){var b="";return new y(a,{start:function(a,c,d){b+="<"+a;for(var e=0;e"},end:function(a){b+=""},chars:function(a){b+=a},comment:function(a){b+=""},ignore:function(a){b+=a}}),b},a.HTMLtoDOM=function(a,b){var c=e("html,head,body,title"),d={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 y(a,{start:function(a,e,g){if(c[a])return void(i=c[a]);var h=b.createElement(a);for(var j in e)h.setAttribute(e[j].name,e[j].value);d[a]&&"boolean"!=typeof c[d[a]]?c[d[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&&!U(b)&&(d.collapseInlineTagWhitespace||"/"!==b.charAt(0)||!T(b.substr(1))),g=c&&!U(c)&&(d.collapseInlineTagWhitespace||"/"===c.charAt(0)||!T(c));return e(a,d,f,g,b&&c)}function g(a){return/\[if[^\]]+\]/.test(a)||/\s*((?: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?S(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&&"text/javascript"===S(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=S(b[c].value).split(/;/,2)[0].toLowerCase();return""===f||V(f)}}return!0}function o(a,b,c){return("style"===a||"link"===a)&&"type"===b&&"text/css"===S(c.toLowerCase())}function p(a,b){var c=/^(?: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)$/i.test(a);if(c)return!0;var d=W[a.toLowerCase()];return d?-1===d.indexOf(b.toLowerCase()):!1}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=S(d).replace(/^javascript:\s*/i,"").replace(/\s*;$/,""),e.minifyJS){var g=L(X+d+Y,e.minifyJS);return g.slice(X.length,-Y.length)}return d}return"class"===c?b(S(d)):q(c,a)?(d=S(d),e.minifyURLs&&!s(a,f)?K(d,e.minifyURLs):d):r(c,a)?S(d):"style"===c?(d=S(d),d&&(d=d.replace(/\s*;\s*$/,"")),e.minifyCSS?M(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,"")),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){return a.replace(/^(\[[^\]]+\]>)\s*/,"$1").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 O(a,b);return a}function A(a,b){return a.replace(Z[b],"").replace($[b],"")}function B(a,b){switch(a){case"html":case"head":return!0;case"body":return!ba(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 ja(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 ca(b);case"p":return da(b);case"rb":case"rt":case"rp":return fa(b);case"rtc":return ga(b);case"option":return ha(b);case"thead":case"tbody":return ia(b);case"tfoot":return"tbody"===b;case"td":case"th":return ka(b)}return!1}function E(a,b,c){var d=!c||/^\s*$/.test(c);return d?"input"===a&&"value"===b||qa.test(b):!1}function F(a,b){if("textarea"===a)return!1;if("script"===a)for(var c=b.length-1;c>=0;c--)if("src"===b[c].name)return!1;return!0}function G(a){return!/^(?:script|style|pre|textarea)$/.test(a)}function H(a){return!/^(?:pre|textarea)$/.test(a)}function I(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,"""):n.replace(/'/g,"'")}i=q+n+q,g||f.removeTagWhitespace||(i+=" ")}else i=!g||d||/\/$/.test(n)?n+" ":n;return void 0===n||f.collapseBooleanAttributes&&p(k,n)?(h=k,g||(h+=" ")):h=k+a.customAssign+i,a.customOpen+h+a.customClose}function J(a){for(var b=["canCollapseWhitespace","canTrimWhitespace"],c=0,d=b.length;d>c;c++)a[b[c]]||(a[b[c]]=function(){return!1})}function K(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){Q(e)}return b}function L(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){Q(j)}return b}function M(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){Q(g)}return b}function N(a){var b;do b=Math.random().toString(36).slice(2);while(~a.indexOf(b));return b}function O(a,c){function d(a,b){return G(a)||c.canCollapseWhitespace(a,b)}function i(a,b){return H(a)||c.canTrimWhitespace(a,b)}function j(){for(var a=r.length-1;a>0&&!/^<[^\/!]/.test(r[a]);)a--;r.length=Math.max(0,a)}function k(){for(var a=r.length-1;a>0&&!/^<\//.test(r[a]);)a--;r.length=Math.max(0,a)}c=c||{};var l=[];J(c),a=c.collapseWhitespace?S(a):a;var m,o,p,q=[],r=[],s="",t="",u=[],v=[],w=[],E="",K="",O=c.lint,T=Date.now(),U=[],V=[];a=a.replace(/([\s\S]*?)/g,function(b,c){o||(o="");var d=o+U.length;return U.push(c),d});var W=(c.ignoreCustomFragments||[/<%[\s\S]*?%>/,/<\?[\s\S]*?\?>/]).map(function(a){return a.source});if(W.length){var X=new RegExp("\\s*(?:"+W.join("|")+")+\\s*","g");a=a.replace(X,function(b){p||(p=N(a));var c=p+V.length;return V.push(b)," "+c+" "})}new R(a,{html5:"undefined"!=typeof c.html5?c.html5:!0,start:function(a,b,e,f){var g=a.toLowerCase();if("svg"===g){l.push(c);var h={};for(var n in c)h[n]=c[n];h.keepClosingSlash=!0,h.caseSensitive=!0,c=h}a=c.caseSensitive?a:g,t=a,m=a,s="",u=b;var o=c.removeOptionalTags;if(o){var p=pa(a);p&&B(E,a)&&j(),E="",p&&D(K,a)&&(k(),o=!C(K,a)),K=""}c.collapseWhitespace&&(i(a,b)||v.push(a),d(a,b)||w.push(a));var q="<"+a,x=f&&c.keepClosingSlash;r.push(q),O&&O.testElement(a);for(var y,z=[],A=!0,F=b.length;--F>=0;)O&&O.testAttribute(a,b[F].name.toLowerCase(),b[F].value),y=I(b[F],b,a,x,F,c,A),y&&(A=!1,z.unshift(y));z.length>0?(r.push(" "),r.push.apply(r,z)):o&&_(a)&&(E=a),r.push(r.pop()+(x?"/":"")+">")},end:function(a,b){var d=a.toLowerCase();if("svg"===d&&(c=l.pop()),a=c.caseSensitive?a:d,c.collapseWhitespace){if(v.length)a===v[v.length-1]&&v.pop();else{var e;r.length>1&&""===r[r.length-1]&&/\s+$/.test(r[r.length-2])?e=r.length-2:r.length>0&&/\s+$/.test(r[r.length-1])&&(e=r.length-1),e>0&&(r[e]=r[e].replace(/\s+$/,function(b){return f(b,"comment","/"+a,c)}))}w.length&&a===w[w.length-1]&&w.pop()}var g=!1;a===t&&(t="",g=""===s),c.removeOptionalTags&&(g&&la(E)&&j(),E="",!pa(a)||!K||oa(K)||"p"===K&&ea(a)||k(),K=aa(a)?a:""),c.removeEmptyElements&&g&&F(a,b)?(j(),E="",K=""):(q.push.apply(q,r),r=[""],m="/"+a,s="")},chars:function(a,d,e){if(d=""===d?"comment":d,e=""===e?"comment":e,c.collapseWhitespace){if(!v.length){if("comment"===d){var g=""===r[r.length-1];if(g&&(d=m),r.length>1&&(g||" "===s.charAt(s.length-1))){var h=r.length-2;r[h]=r[h].replace(/\s+$/,function(b){return a=b+a,""})}}a=d||e?f(a,d,e,c):S(a)}w.length||(a=d&&e||"html"===e?a:b(a))}"script"!==t&&"style"!==t||(c.removeCommentsFromCDATA&&(a=A(a,t)),c.removeCDATASectionsFromCDATA&&(a=y(a)),c.processScripts&&(a=z(a,c,u))),c.minifyJS&&n(t,u)&&(a=L(a,c.minifyJS),";"===a.charAt(a.length-1)&&(a=a.slice(0,-1))),"style"===t&&c.minifyCSS&&(a=M(a,c.minifyCSS)),c.removeOptionalTags&&a&&(("html"===E||"body"===E&&!/^\s/.test(a))&&j(),E="",(ma(K)||na(K)&&!/^\s/.test(a))&&k(),K=""),m=/^\s*$/.test(a)?d:"comment",s+=a,O&&O.testChars(a),r.push(a)},comment:function(a,b){var d=b?"":"-->";a=c.removeComments?g(a)?d+x(a)+e:h(a,c)?"":"":d+a+e,c.removeOptionalTags&&a&&(E="",K=""),r.push(a)},doctype:function(a){r.push(c.useShortDoctype?"":b(a))},customAttrAssign:c.customAttrAssign,customAttrSurround:c.customAttrSurround}),c.removeOptionalTags&&(la(E)&&j(),K&&!oa(K)&&k()),q.push.apply(q,r);var Y=P(q,c);return p&&(Y=Y.replace(new RegExp("(\\s*)"+p+"([0-9]+)(\\s*)","g"),function(a,b,d,f){var g=V[+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})),o&&(Y=Y.replace(new RegExp(o+"([0-9]+)","g"),function(a,b){return U[+b]})),Q("minified in: "+(Date.now()-T)+"ms"),Y}function P(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\s*$/,style:/\s*-->\s*$/},_=d("html,head,body,colgroup,tbody"),aa=d("html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,caption,thead,tbody,tfoot,tr,td,th"),ba=d("meta,link,script,style,template,noscript"),ca=d("dt,dd"),da=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"),ea=d("a,audio,del,ins,map,noscript,video"),fa=d("rb,rt,rtc,rp"),ga=d("rb,rtc,rp"),ha=d("option,optgroup"),ia=d("tbody,tfoot"),ja=d("thead,tbody,tfoot"),ka=d("td,th"),la=d("html,head,body"),ma=d("html,body"),na=d("head,colgroup,caption"),oa=d("dt,thead"),pa=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"),qa=new RegExp("^(?:class|id|style|title|lang|dir|on(?:focus|blur|change|click|dblclick|mouse(?:down|up|over|move|out)|key(?:press|down|up)))$");"undefined"!=typeof exports?exports.minify=O:a.minify=O}("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 deprecated <'+a+"> element"):b(a)?this.log.push('Found presentational <'+a+"> 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 <br> sequence. Try replacing it with styling.")},h.prototype.testAttribute=function(a,b,c){d(b)?this.log.push('Found event attribute ('+b+") on <"+a+"> element."):f(a,b)?this.log.push('Found deprecated '+b+" attribute on <"+a+"> element."):e(b)?this.log.push('Found style attribute on <'+a+"> element."):g(b,c)&&this.log.push('Found inaccessible attribute (on <'+a+"> element).")},h.prototype.testChars=function(a){this._lastElement="",/( \s*){2,}/.test(a)&&this.log.push("Found repeating &nbsp; 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="
  1. "+this.log.join("
  2. ")+"
";else{var b=" - "+this.log.join("\n - ").replace(/(<([^>]+)>)/gi,"").replace(/</g,"<").replace(/>/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,c=new RegExp("[\\w:\\.-]+(?:\\s*(?:"+d(a)+")\\s*(?:\"[^\"]*\"+?|'[^']*'+?|[^>\\s\"']+?))?");if(a.customAttrSurround){for(var e=[],f=a.customAttrSurround.length-1;f>=0;f--)e[f]="(?:"+a.customAttrSurround[f][0].source+"\\s*"+c.source+"\\s*"+a.customAttrSurround[f][1].source+")";e.unshift("(?:"+c.source+")"),b=new RegExp("((?:\\s*(?:"+e.join("|")+"))*)")}else b=new RegExp("((?:\\s*"+c.source+")*)");return new RegExp(j.source+b.source+k.source)}function c(a){var b=new RegExp(f.source+"(?:\\s*("+d(a)+")\\s*(?:"+i.join("|")+"))?");if(a.customAttrSurround){for(var c=[],e=a.customAttrSurround.length-1;e>=0;e--)c[e]="(?:("+a.customAttrSurround[e][0].source+")\\s*"+b.source+"\\s*("+a.customAttrSurround[e][1].source+"))";return c.unshift("(?:"+b.source+")"),new RegExp(c.join("|"),"g")}return new RegExp(b.source,"g")}function d(a){return h.concat(a.customAttrAssign||[]).map(function(a){return"(?:"+a.source+")"}).join("|")}function e(a){for(var b={},c=a.split(","),d=0;d\s]+)/.source],j=/^<([\w:-]+)/,k=/\s*(\/?)>/,l=/^<\/([\w:-]+)[^>]*>/,m=/\/>$/,n=/^]+>/i,o=!1;"x".replace(/x(.)?/g,function(a,b){o=""===b});var p,q,r,s=e("area,base,basefont,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),t=e("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"),u=e("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),v=e("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),w=e("script,style"),x={},y=a.HTMLParser=function(a,d){function e(a,b,c,e){for(var g=!1;!d.html5&&k.last()&&t[k.last()];)f("",k.last());u[b]&&k.last()===b&&f("",b),e=s[b]||!!e;var h=[];c.replace(A,function(){var a,b,c,e,f,g,i,j=7;if(o&&-1===arguments[0].indexOf('""')&&(""===arguments[3]&&(arguments[3]=void 0),""===arguments[4]&&(arguments[4]=void 0),""===arguments[5]&&(arguments[5]=void 0)),a=arguments[1])g=arguments[2],c=arguments[3],b=c||arguments[4]||arguments[5],g&&(i=arguments[0].charAt(a.length+g.length),i="'"===i||'"'===i?i:"");else if(d.customAttrSurround)for(var k=d.customAttrSurround.length-1;k>=0;k--)if(a=arguments[k*j+7],g=arguments[k*j+8],a){c=arguments[k*j+9],b=c||arguments[k*j+10]||arguments[k*j+11],e=arguments[k*j+6],f=arguments[k*j+12];break}void 0===b&&(b=v[a]?a:c),h.push({name:a,value:b,customAssign:g||"=",customOpen:e||"",customClose:f||"",quote:i||""})}),e?g=a.match(m):k.push({tag:b,attrs:h}),d.start&&d.start(b,h,e,g)}function f(a,b){var c;if(b){var e=b.toLowerCase();for(c=k.length-1;c>=0&&k[c].tag.toLowerCase()!==e;c--);}else c=0;if(c>=0){for(var f=k.length-1;f>=c;f--)d.end&&d.end(k[f].tag,k[f].attrs);k.length=c}}var g,h,i,j,k=[],y=a;k.last=function(){var a=this[this.length-1];return a&&a.tag};for(var z=b(d),A=c(d);a;){if(k.last()&&w[k.last()])p=k.last().toLowerCase(),q=x[p]||(x[p]=new RegExp("([\\s\\S]*?)]*>","i")),a=a.replace(q,function(a,b){return"script"!==p&&"style"!==p&&"noscript"!==p&&(b=b.replace(//g,"$1").replace(//g,"$1")),d.chars&&d.chars(b),""}),f("",p);else{if(/^"),g>=0)){d.comment&&d.comment(a.substring(4,g)),a=a.substring(g+3),i="";continue}if(/^"),g>=0)){d.comment&&d.comment(a.substring(2,g+1),!0),a=a.substring(g+2),i="";continue}if(h=n.exec(a)){d.doctype&&d.doctype(h[0]),a=a.substring(h[0].length),i="";continue}if(/^<\//.test(a)&&(h=a.match(l))){a=a.substring(h[0].length),h[0].replace(l,f),i="/"+h[1].toLowerCase();continue}if(/^g?a:a.substring(0,g);a=0>g?"":a.substring(g),r=a.match(z),r?j=r[1]:(r=a.match(l),j=r?"/"+r[1]:""),d.chars&&d.chars(B,i,j),i=""}if(a===y)throw"Parse Error: "+a;y=a}f()};a.HTMLtoXML=function(a){var b="";return new y(a,{start:function(a,c,d){b+="<"+a;for(var e=0;e"},end:function(a){b+=""},chars:function(a){b+=a},comment:function(a){b+=""},ignore:function(a){b+=a}}),b},a.HTMLtoDOM=function(a,b){var c=e("html,head,body,title"),d={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 y(a,{start:function(a,e,g){if(c[a])return void(i=c[a]);var h=b.createElement(a);for(var j in e)h.setAttribute(e[j].name,e[j].value);d[a]&&"boolean"!=typeof c[d[a]]?c[d[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&&!V(b);f&&!d.collapseInlineTagWhitespace&&(f="/"===b.charAt(0)?!T(b.substr(1)):!U(b));var g=c&&!V(c);return g&&!d.collapseInlineTagWhitespace&&(g="/"===c.charAt(0)?!U(c.substr(1)):!T(c)),e(a,d,f,g,b&&c)}function g(a){return/\[if[^\]]+\]/.test(a)||/\s*((?: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?S(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&&"text/javascript"===S(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=S(b[c].value).split(/;/,2)[0].toLowerCase();return""===f||W(f)}}return!0}function o(a,b,c){return("style"===a||"link"===a)&&"type"===b&&"text/css"===S(c.toLowerCase())}function p(a,b){var c=/^(?: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)$/i.test(a);if(c)return!0;var d=X[a.toLowerCase()];return d?-1===d.indexOf(b.toLowerCase()):!1}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=S(d).replace(/^javascript:\s*/i,"").replace(/\s*;$/,""),e.minifyJS){var g=L(Y+d+Z,e.minifyJS);return g.slice(Y.length,-Z.length)}return d}return"class"===c?b(S(d)):q(c,a)?(d=S(d),e.minifyURLs&&!s(a,f)?K(d,e.minifyURLs):d):r(c,a)?S(d):"style"===c?(d=S(d),d&&(d=d.replace(/\s*;\s*$/,"")),e.minifyCSS?M(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,"")),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){return a.replace(/^(\[[^\]]+\]>)\s*/,"$1").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 O(a,b);return a}function A(a,b){return a.replace($[b],"").replace(_[b],"")}function B(a,b){switch(a){case"html":case"head":return!0;case"body":return!ca(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 ka(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 da(b);case"p":return ea(b);case"rb":case"rt":case"rp":return ga(b);case"rtc":return ha(b);case"option":return ia(b);case"thead":case"tbody":return ja(b);case"tfoot":return"tbody"===b;case"td":case"th":return la(b)}return!1}function E(a,b,c){var d=!c||/^\s*$/.test(c);return d?"input"===a&&"value"===b||ra.test(b):!1}function F(a,b){if("textarea"===a)return!1;if("script"===a)for(var c=b.length-1;c>=0;c--)if("src"===b[c].name)return!1;return!0}function G(a){return!/^(?:script|style|pre|textarea)$/.test(a)}function H(a){return!/^(?:pre|textarea)$/.test(a)}function I(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,"""):n.replace(/'/g,"'")}i=q+n+q,g||f.removeTagWhitespace||(i+=" ")}else i=!g||d||/\/$/.test(n)?n+" ":n;return void 0===n||f.collapseBooleanAttributes&&p(k,n)?(h=k,g||(h+=" ")):h=k+a.customAssign+i,a.customOpen+h+a.customClose}function J(a){for(var b=["canCollapseWhitespace","canTrimWhitespace"],c=0,d=b.length;d>c;c++)a[b[c]]||(a[b[c]]=function(){return!1})}function K(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){Q(e)}return b}function L(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){Q(j)}return b}function M(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){Q(g)}return b}function N(a){var b;do b=Math.random().toString(36).slice(2);while(~a.indexOf(b));return b}function O(a,c){function d(a,b){return G(a)||c.canCollapseWhitespace(a,b)}function i(a,b){return H(a)||c.canTrimWhitespace(a,b)}function j(){for(var a=s.length-1;a>0&&!/^<[^\/!]/.test(s[a]);)a--;s.length=Math.max(0,a)}function k(){for(var a=s.length-1;a>0&&!/^<\//.test(s[a]);)a--;s.length=Math.max(0,a)}c=c||{};var l=[];J(c),a=c.collapseWhitespace?S(a):a;var m,o,p,q,r=[],s=[],t="",u="",v=[],w=[],E=[],K="",O="",T=c.lint,V=Date.now(),W=[],X=[];a=a.replace(/([\s\S]*?)/g,function(b,c){p||(p="");var d=p+W.length;return W.push(c),d});var Y=(c.ignoreCustomFragments||[/<%[\s\S]*?%>/,/<\?[\s\S]*?\?>/]).map(function(a){return a.source});if(Y.length){var Z=new RegExp("\\s*(?:"+Y.join("|")+")+\\s*","g");a=a.replace(Z,function(b){q||(q=N(a));var c=q+X.length;return X.push(b)," "+c+" "})}new R(a,{html5:"undefined"!=typeof c.html5?c.html5:!0,start:function(a,b,e,f){var g=a.toLowerCase();if("svg"===g){l.push(c);var h={};for(var n in c)h[n]=c[n];h.keepClosingSlash=!0,h.caseSensitive=!0,c=h}a=c.caseSensitive?a:g,u=a,m=a,U(a)||(t=""),o=!1,v=b;var p=c.removeOptionalTags;if(p){var q=qa(a);q&&B(K,a)&&j(),K="",q&&D(O,a)&&(k(),p=!C(O,a)),O=""}c.collapseWhitespace&&(i(a,b)||w.push(a),d(a,b)||E.push(a));var r="<"+a,x=f&&c.keepClosingSlash;s.push(r),T&&T.testElement(a);for(var y,z=[],A=!0,F=b.length;--F>=0;)T&&T.testAttribute(a,b[F].name.toLowerCase(),b[F].value),y=I(b[F],b,a,x,F,c,A),y&&(A=!1,z.unshift(y));z.length>0?(s.push(" "),s.push.apply(s,z)):p&&aa(a)&&(K=a),s.push(s.pop()+(x?"/":"")+">")},end:function(a,b){var d=a.toLowerCase();if("svg"===d&&(c=l.pop()),a=c.caseSensitive?a:d,c.collapseWhitespace){if(w.length)a===w[w.length-1]&&w.pop();else{var e;s.length>1&&""===s[s.length-1]&&/\s+$/.test(s[s.length-2])?e=s.length-2:s.length>0&&/\s+$/.test(s[s.length-1])&&(e=s.length-1),e>0&&(s[e]=s[e].replace(/\s+$/,function(b){return f(b,"comment","/"+a,c)}))}E.length&&a===E[E.length-1]&&E.pop()}var g=!1;a===u&&(u="",g=!o),c.removeOptionalTags&&(g&&ma(K)&&j(),K="",!qa(a)||!O||pa(O)||"p"===O&&fa(a)||k(),O=ba(a)?a:""),c.removeEmptyElements&&g&&F(a,b)?(j(),K="",O=""):(r.push.apply(r,s),s=[""],m="/"+a,U(a)||(t=""))},chars:function(a,d,g){if(d=""===d?"comment":d,g=""===g?"comment":g,c.collapseWhitespace){if(!w.length){if("comment"===d){var h=""===s[s.length-1];if(h&&(d=m),s.length>1&&(h||/ $/.test(t))){var i=s.length-2;s[i]=s[i].replace(/\s+$/,function(b){return a=b+a,""})}}d&&U("/"===d.charAt(0)?d.substr(1):d)&&(a=e(a,c,/(?:^| )$/.test(t))),a=d||g?f(a,d,g,c):S(a)}E.length||(a=d&&g||"html"===g?a:b(a))}"script"!==u&&"style"!==u||(c.removeCommentsFromCDATA&&(a=A(a,u)),c.removeCDATASectionsFromCDATA&&(a=y(a)),c.processScripts&&(a=z(a,c,v))),c.minifyJS&&n(u,v)&&(a=L(a,c.minifyJS),";"===a.charAt(a.length-1)&&(a=a.slice(0,-1))),"style"===u&&c.minifyCSS&&(a=M(a,c.minifyCSS)),c.removeOptionalTags&&a&&(("html"===K||"body"===K&&!/^\s/.test(a))&&j(),K="",(na(O)||oa(O)&&!/^\s/.test(a))&&k(),O=""),m=/^\s*$/.test(a)?d:"comment",t+=a,a&&(o=!0),T&&T.testChars(a),s.push(a)},comment:function(a,b){var d=b?"":"-->";a=c.removeComments?g(a)?d+x(a)+e:h(a,c)?"":"":d+a+e,c.removeOptionalTags&&a&&(K="",O=""),s.push(a)},doctype:function(a){s.push(c.useShortDoctype?"":b(a))},customAttrAssign:c.customAttrAssign,customAttrSurround:c.customAttrSurround}),c.removeOptionalTags&&(ma(K)&&j(),O&&!pa(O)&&k()),r.push.apply(r,s);var $=P(r,c);return q&&($=$.replace(new RegExp("(\\s*)"+q+"([0-9]+)(\\s*)","g"),function(a,b,d,f){var g=X[+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})),p&&($=$.replace(new RegExp(p+"([0-9]+)","g"),function(a,b){return W[+b]})),Q("minified in: "+(Date.now()-V)+"ms"),$}function P(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\s*$/,style:/\s*-->\s*$/},aa=d("html,head,body,colgroup,tbody"),ba=d("html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,caption,thead,tbody,tfoot,tr,td,th"),ca=d("meta,link,script,style,template,noscript"),da=d("dt,dd"),ea=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"),fa=d("a,audio,del,ins,map,noscript,video"),ga=d("rb,rt,rtc,rp"),ha=d("rb,rtc,rp"),ia=d("option,optgroup"),ja=d("tbody,tfoot"),ka=d("thead,tbody,tfoot"),la=d("td,th"),ma=d("html,head,body"),na=d("html,body"),oa=d("head,colgroup,caption"),pa=d("dt,thead"),qa=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"),ra=new RegExp("^(?:class|id|style|title|lang|dir|on(?:focus|blur|change|click|dblclick|mouse(?:down|up|over|move|out)|key(?:press|down|up)))$");"undefined"!=typeof exports?exports.minify=O:a.minify=O}("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 deprecated <'+a+"> element"):b(a)?this.log.push('Found presentational <'+a+"> 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 <br> sequence. Try replacing it with styling.")},h.prototype.testAttribute=function(a,b,c){d(b)?this.log.push('Found event attribute ('+b+") on <"+a+"> element."):f(a,b)?this.log.push('Found deprecated '+b+" attribute on <"+a+"> element."):e(b)?this.log.push('Found style attribute on <'+a+"> element."):g(b,c)&&this.log.push('Found inaccessible attribute (on <'+a+"> element).")},h.prototype.testChars=function(a){this._lastElement="",/( \s*){2,}/.test(a)&&this.log.push("Found repeating &nbsp; 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="
  1. "+this.log.join("
  2. ")+"
";else{var b=" - "+this.log.join("\n - ").replace(/(<([^>]+)>)/gi,"").replace(/</g,"<").replace(/>/g,">");console.log(b)}},a.HTMLLint=h}("undefined"==typeof exports?this:exports); \ No newline at end of file diff --git a/src/htmlminifier.js b/src/htmlminifier.js index 1602371..8a0583f 100644 --- a/src/htmlminifier.js +++ b/src/htmlminifier.js @@ -81,15 +81,22 @@ return lineBreakBefore + str + lineBreakAfter; } - // array of non-empty element tags that will maintain a single space outside of them + // non-empty tags that will maintain whitespace around them var inlineTags = createMapFromString('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'); + // non-empty tags that will maintain whitespace within them + var inlineTextTags = createMapFromString('a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var'); + // self-closing tags that will maintain whitespace around them var selfClosingInlineTags = createMapFromString('comment,img,input'); function collapseWhitespaceSmart(str, prevTag, nextTag, options) { - var trimLeft = prevTag && !selfClosingInlineTags(prevTag) && - (options.collapseInlineTagWhitespace || prevTag.charAt(0) !== '/' || !inlineTags(prevTag.substr(1))); - var trimRight = nextTag && !selfClosingInlineTags(nextTag) && - (options.collapseInlineTagWhitespace || nextTag.charAt(0) === '/' || !inlineTags(nextTag)); + var trimLeft = prevTag && !selfClosingInlineTags(prevTag); + if (trimLeft && !options.collapseInlineTagWhitespace) { + trimLeft = prevTag.charAt(0) === '/' ? !inlineTags(prevTag.substr(1)) : !inlineTextTags(prevTag); + } + var trimRight = nextTag && !selfClosingInlineTags(nextTag); + if (trimRight && !options.collapseInlineTagWhitespace) { + trimRight = nextTag.charAt(0) === '/' ? !inlineTextTags(nextTag.substr(1)) : !inlineTags(nextTag); + } return collapseWhitespace(str, options, trimLeft, trimRight, prevTag && nextTag); } @@ -720,6 +727,7 @@ buffer = [ ], charsPrevTag, currentChars = '', + hasChars, currentTag = '', currentAttrs = [], stackNoTrimWhitespace = [], @@ -810,7 +818,10 @@ currentTag = tag; charsPrevTag = tag; - currentChars = ''; + if (!inlineTextTags(tag)) { + currentChars = ''; + } + hasChars = false; currentAttrs = attrs; var optional = options.removeOptionalTags; @@ -914,7 +925,7 @@ var isElementEmpty = false; if (tag === currentTag) { currentTag = ''; - isElementEmpty = currentChars === ''; + isElementEmpty = !hasChars; } if (options.removeOptionalTags) { @@ -944,7 +955,9 @@ results.push.apply(results, buffer); buffer = ['']; charsPrevTag = '/' + tag; - currentChars = ''; + if (!inlineTextTags(tag)) { + currentChars = ''; + } } }, chars: function(text, prevTag, nextTag) { @@ -957,7 +970,7 @@ if (removed) { prevTag = charsPrevTag; } - if (buffer.length > 1 && (removed || currentChars.charAt(currentChars.length - 1) === ' ')) { + if (buffer.length > 1 && (removed || / $/.test(currentChars))) { var charsIndex = buffer.length - 2; buffer[charsIndex] = buffer[charsIndex].replace(/\s+$/, function(trailingSpaces) { text = trailingSpaces + text; @@ -965,6 +978,9 @@ }); } } + if (prevTag && inlineTextTags(prevTag.charAt(0) === '/' ? prevTag.substr(1) : prevTag)) { + text = collapseWhitespace(text, options, /(?:^| )$/.test(currentChars)); + } text = prevTag || nextTag ? collapseWhitespaceSmart(text, prevTag, nextTag, options) : trimWhitespace(text); } if (!stackNoCollapseWhitespace.length) { @@ -1007,6 +1023,9 @@ } charsPrevTag = /^\s*$/.test(text) ? prevTag : 'comment'; currentChars += text; + if (text) { + hasChars = true; + } if (lint) { lint.testChars(text); } diff --git a/tests/minifier.js b/tests/minifier.js index 4d7fecf..b5f839d 100644 --- a/tests/minifier.js +++ b/tests/minifier.js @@ -127,10 +127,21 @@ equal(minify(input, { collapseWhitespace: true }), output); // tags from collapseWhitespaceSmart() [ - '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' + 'a', 'abbr', 'acronym', 'b', 'big', 'del', 'em', 'font', 'i', 'ins', 'kbd', + 'mark', 's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', + 'time', 'tt', 'u', 'var' + ].forEach(function(el) { + equal(minify('

foo <' + el + '>baz bar

', { collapseWhitespace: true }), '

foo <' + el + '>baz bar

'); + equal(minify('

foo<' + el + '>bazbar

', { collapseWhitespace: true }), '

foo<' + el + '>bazbar

'); + equal(minify('

foo <' + el + '>bazbar

', { collapseWhitespace: true }), '

foo <' + el + '>bazbar

'); + equal(minify('

foo<' + el + '>baz bar

', { collapseWhitespace: true }), '

foo<' + el + '>baz bar

'); + equal(minify('

foo <' + el + '> baz bar

', { collapseWhitespace: true }), '

foo <' + el + '>baz bar

'); + equal(minify('

foo<' + el + '> baz bar

', { collapseWhitespace: true }), '

foo<' + el + '> baz bar

'); + equal(minify('

foo <' + el + '> baz bar

', { collapseWhitespace: true }), '

foo <' + el + '>baz bar

'); + equal(minify('

foo<' + el + '> baz bar

', { collapseWhitespace: true }), '

foo<' + el + '> baz bar

'); + }); + [ + 'bdi', 'bdo', 'button', 'cite', 'code', 'dfn', 'math', 'q', 'rt', 'rp', 'svg' ].forEach(function(el) { equal(minify('

foo <' + el + '>baz bar

', { collapseWhitespace: true }), '

foo <' + el + '>baz bar

'); equal(minify('

foo<' + el + '>bazbar

', { collapseWhitespace: true }), '

foo<' + el + '>bazbar

'); @@ -658,7 +669,7 @@ equal(minify(input, { collapseWhitespace: true }), output); input = '

foo blah 22 bar

'; - output = '

foo blah 22 bar

'; + output = '

foo blah 22 bar

'; equal(minify(input, { collapseWhitespace: true }), output); input = ''; @@ -1114,7 +1125,7 @@ '{{ form.name }}' + '{% if form.name.errors %}' + '{% for error in form.name.errors %} ' + - '{{ error }} ' + + '{{ error }} ' + '{% endfor %}' + '{% endif %}' + '

'; @@ -1576,7 +1587,7 @@ test('processScripts', function() { input = ''; - output = ''; + output = ''; equal(minify(input, { collapseWhitespace: true, @@ -1591,7 +1602,7 @@ '
\n test foo \n\n
'; output = '
\n test foo \n\n
' + - '
test foo
'; + '
test foo
'; equal(minify(input, { collapseWhitespace: true }), output); @@ -1823,12 +1834,10 @@ // trailing

removed by minifier, but not by PHPTAL ['

foo bar baz', '

foo \t bar\n\n\n baz

'], ['

foo bar

  \tfoo\t   \nbar
', '

foo \t\n bar

  \tfoo\t   \nbar
'], - /* needs to handle whitespace within and around ['

foo bar baz', '

foo bar baz

'], ['

foo bar baz', '

foo bar baz

'], ['

foo bar baz', '

foo bar baz

'], ['

foo bar baz', '

foo bar baz

'], - */ ['

foo
', '

foo

'], // PHPTAL remove whitespace after 'foo' - problematic if is used as icon font ['

foo ', '

foo

'], -- 2.34.1