Blah

From 3ab98e86434857511dc33a68b32d9e8b9c334378 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Thu, 18 Feb 2016 04:41:16 +0800 Subject: [PATCH] integrate tag omission rules from WhatWG fixes #497 --- dist/htmlminifier.js | 68 +++++++++++++++++++++++++++++++--------- dist/htmlminifier.min.js | 2 +- src/htmlminifier.js | 68 +++++++++++++++++++++++++++++++--------- tests/minifier.js | 60 ++++++++++++++++++++++++++++++----- 4 files changed, 160 insertions(+), 38 deletions(-) diff --git a/dist/htmlminifier.js b/dist/htmlminifier.js index 49061fc..5fedfe0 100644 --- a/dist/htmlminifier.js +++ b/dist/htmlminifier.js @@ -922,17 +922,48 @@ return text.replace(reStartDelimiter[tag], '').replace(reEndDelimiter[tag], ''); } - // Tag omission rules from http://www.w3.org/TR/html5/syntax.html#optional-tags - var optionalStartTags = createMapFromString('html,head,body'); - var optionalEndTags = createMapFromString('html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,thead,tbody,tfoot,tr,td,th'); - var headerTags = createMapFromString('meta,link,script,style,template'); + // Tag omission rules from https://html.spec.whatwg.org/multipage/syntax.html#optional-tags + // with the following deviations: + // - retain if followed by

, <style> or <template> - if (optionalStartTag && (optionalStartTag !== 'body' || !headerTags(tag))) { + // <colgroup> may be omitted if first thing inside is <col> + // <tbody> may be omitted if first thing inside is <tr> + if (canRemoveParentTag(optionalStartTag, tag)) { removeStartTag(); } optionalStartTag = ''; // end-tag-followed-by-start-tag omission rules if (canRemovePrecedingTag(optionalEndTag, tag)) { removeEndTag(); + // <colgroup> cannot be omitted if preceding </colgroup> is omitted + // <tbody> cannot be omitted if preceding </tbody>, </thead> or </tfoot> is omitted + optional = !isStartTagMandatory(optionalEndTag, tag); } optionalEndTag = ''; } @@ -1370,7 +1408,7 @@ buffer.push.apply(buffer, parts); } // start tag must never be omitted if it has any attributes - else if (options.removeOptionalTags && optionalStartTags(tag)) { + else if (optional && optionalStartTags(tag)) { optionalStartTag = tag; } @@ -1389,7 +1427,7 @@ // </head> may be omitted if not followed by space or comment // </p> may be omitted if no more content in non-</a> parent // except for </dt> or </thead>, end tags may be omitted if no more content in parent element - if (optionalEndTag && optionalEndTag !== 'dt' && optionalEndTag !== 'thead' && (optionalEndTag !== 'p' || tag !== 'a')) { + if (optionalEndTag && optionalEndTag !== 'dt' && optionalEndTag !== 'thead' && (optionalEndTag !== 'p' || !pInlineTags(tag))) { removeEndTag(); } optionalEndTag = optionalEndTags(tag) ? tag : ''; @@ -1493,8 +1531,8 @@ } optionalStartTag = ''; // </html> or </body> may be omitted if not followed by comment - // </head> or </colgroup> may be omitted if not followed by space or comment - if (optionalEndTag === 'html' || optionalEndTag === 'body' || (optionalEndTag === 'head' || optionalEndTag === 'colgroup') && !/^\s/.test(text)) { + // </head>, </colgroup> or </caption> may be omitted if not followed by space or comment + if (optionalEndTag === 'html' || optionalEndTag === 'body' || (optionalEndTag === 'head' || optionalEndTag === 'colgroup' || optionalEndTag === 'caption') && !/^\s/.test(text)) { removeEndTag(); } optionalEndTag = ''; @@ -1540,7 +1578,7 @@ if (options.removeOptionalTags) { // <html> may be omitted if first thing inside is not comment // <head> or <body> may be omitted if empty - if (optionalStartTag) { + if (topLevelTags(optionalStartTag)) { removeStartTag(); } // except for </dt> or </thead>, end tags may be omitted if no more content in parent element diff --git a/dist/htmlminifier.min.js b/dist/htmlminifier.min.js index 2a19ea5..357ae1c 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("(?:\\s*[\\w:\\.-]+(?:\\s*(?:"+d(a)+")\\s*(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>\\s]+))?)*");if(a.customAttrSurround){for(var e=[],f=a.customAttrSurround.length-1;f>=0;f--)e[f]="(?:\\s*"+a.customAttrSurround[f][0].source+"\\s*"+c.source+"\\s*"+a.customAttrSurround[f][1].source+")";e.unshift(c.source),b=new RegExp("((?:"+e.join("|")+")*)")}else b=new RegExp("("+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<c.length;d++)b[c[d]]=!0,b[c[d].toUpperCase()]=!0;return b}var f=/([\w:\.-]+)/,g=/=/,h=[g],i=[/"((?:\\.|[^"])*)"/.source,/'((?:\\.|[^'])*)'/.source,/([^>\s]+)/.source],j=/^<([\w:-]+)/,k=/\s*(\/?)>/,l=/^<\/([\w:-]+)[^>]*>/,m=/\/>$/,n=/^<!DOCTYPE [^>]+>/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]*?)</"+p+"[^>]*>","i")),a=a.replace(q,function(a,b){return"script"!==p&&"style"!==p&&"noscript"!==p&&(b=b.replace(//g,"$1").replace(/<!\[CDATA\[([\s\S]*?)\]\]>/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(/^<!\[/.test(a)&&(g=a.indexOf("]>"),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(/^</.test(a)&&(h=a.match(z))){a=a.substring(h[0].length),h[0].replace(z,e),i=h[1].toLowerCase();continue}g=a.indexOf("<");var B=0>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<c.length;e++)b+=" "+c[e].name+'="'+(c[e].value||"").replace(/"/g,""")+'"';b+=(d?"/":"")+">"},end:function(a){b+="</"+a+">"},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,g){var h="",i="";return c&&(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?" ":"")),f&&(a=a.replace(/\s+$/,!i&&d?" ":"")),g&&(a=b(a)),h+a+i}function f(a,b,c,d){var f=b&&!S(b)&&(d.collapseInlineTagWhitespace||"/"!==b.charAt(0)||!R(b.substr(1))),g=c&&!S(c)&&(d.collapseInlineTagWhitespace||"/"===c.charAt(0)||!R(c));return e(a,d.preserveLineBreaks,d.conservativeCollapse,f,g,b&&c)}function g(a){return/\[if[^\]]+\]/.test(a)||/\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?Q(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"===Q(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=Q(b[c].value).split(/;/,2)[0].toLowerCase();return""===f||T(f)}}return!0}function o(a,b,c){return("style"===a||"link"===a)&&"type"===b&&"text/css"===Q(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=U[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=Q(d).replace(/^javascript:\s*/i,"").replace(/\s*;$/,""),e.minifyJS){var g=J(V+d+W,e.minifyJS);return g.slice(V.length,-W.length)}return d}return"class"===c?b(Q(d)):q(c,a)?(d=Q(d),e.minifyURLs&&!s(a,f)?I(d,e.minifyURLs):d):r(c,a)?Q(d):"style"===c?(d=Q(d),d&&(d=d.replace(/\s*;\s*$/,"")),e.minifyCSS?K(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*(<!\[endif\])$/,"$1")}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 M(a,b);return a}function A(a,b){return a.replace(X[b],"").replace(Y[b],"")}function B(a,b){switch(a){case"html":case"head":case"body":case"colgroup":return!0;case"li":case"optgroup":case"tr":return b===a;case"dt":case"dd":return aa(b);case"p":return ba(b);case"rb":case"rt":case"rp":return ca(b);case"rtc":return da(b);case"option":return ea(b);case"thead":case"tbody":return fa(b);case"tfoot":return"tbody"===b;case"td":case"th":return ga(b)}return!1}function C(a,b,c){var d=!c||/^\s*$/.test(c);return d?"input"===a&&"value"===b||ha.test(b):!1}function D(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 E(a){return!/^(?:script|style|pre|textarea)$/.test(a)}function F(a){return!/^(?:pre|textarea)$/.test(a)}function G(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&&C(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 H(a){for(var b=["canCollapseWhitespace","canTrimWhitespace"],c=0,d=b.length;d>c;c++)a[b[c]]||(a[b[c]]=function(){return!1})}function I(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){O(e)}return b}function J(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){O(j)}return b}function K(a,b,c){"object"!=typeof b&&(b={}),"undefined"==typeof b.advanced&&(b.advanced=!1);try{var d;if("undefined"!=typeof CleanCSS)d=new CleanCSS(b);else if("function"==typeof require){var e=require("clean-css");d=new e(b)}return c?w(d.minify(v(a)).styles):d.minify(a).styles}catch(f){O(f)}return a}function L(a){var b;do b=Math.random().toString(36).slice(2);while(~a.indexOf(b));return b}function M(a,c){function d(a,b){return E(a)||c.canCollapseWhitespace(a,b)}function i(a,b){return F(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=a}c=c||{};var l=[];a=Q(a),H(c);var m,o,p,q=[],r=[],s="",t="",u=[],v=[],w=[],C="",I="",M=c.lint,R=Date.now(),S=[],T=[];~a.indexOf("")&&(o="",a=a.replace(/([\s\S]*?)/g,function(a,b){return S.push(b),o}));var U=(c.ignoreCustomFragments||[/<%[\s\S]*?%>/,/<\?[\s\S]*?\?>/]).map(function(a){return a.source});if(U.length){var V=new RegExp("\\s*(?:"+U.join("|")+")\\s*","g");a=a.replace(V,function(b){return p||(p=L(a)),T.push(b)," "+p+" "})}new P(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,c.removeOptionalTags&&(!C||"body"===C&&_(a)||j(),C="",B(I,a)&&k(),I=""),c.collapseWhitespace&&(i(a,b)||v.push(a),d(a,b)||w.push(a));var o="<"+a,p=f&&c.keepClosingSlash;r.push(o),M&&M.testElement(a);for(var q,x=[],y=!0,z=b.length;--z>=0;)M&&M.testAttribute(a,b[z].name.toLowerCase(),b[z].value),q=G(b[z],b,a,p,z,c,y),q&&(y=!1,x.unshift(q));x.length>0?(r.push(" "),r.push.apply(r,x)):c.removeOptionalTags&&Z(a)&&(C=a),r.push(r.pop()+(p?"/":"")+">")},end:function(a,b){var d=a.toLowerCase();if("svg"===d&&(c=l.pop()),a=c.caseSensitive?a:d,c.removeOptionalTags&&(!I||"dt"===I||"thead"===I||"p"===I&&"a"===a||k(),I=$(a)?a:""),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.removeEmptyElements&&g&&D(a,b)?(j(),C="",I=""):(q.push.apply(q,r),r=["</"+a+">"],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):Q(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=J(a,c.minifyJS),";"===a.charAt(a.length-1)&&(a=a.slice(0,-1))),"style"===t&&c.minifyCSS&&(a=K(a,c.minifyCSS)),c.removeOptionalTags&&a&&(("html"===C||"body"===C&&!/^\s/.test(a))&&j(),C="","html"!==I&&"body"!==I&&("head"!==I&&"colgroup"!==I||/^\s/.test(a))||k(),I=""),m=/^\s*$/.test(a)?d:"comment",s+=a,M&&M.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&&(C="",I=""),r.push(a)},doctype:function(a){r.push(c.useShortDoctype?"<!DOCTYPE html>":b(a))},customAttrAssign:c.customAttrAssign,customAttrSurround:c.customAttrSurround}),c.removeOptionalTags&&(C&&j(),I&&"dt"!==I&&"thead"!==I&&k()),q.push.apply(q,r);var W=N(q,c);return p&&(W=W.replace(new RegExp("(\\s*)"+p+"(\\s*)","g"),function(a,b,d){var f=T.shift();return c.collapseWhitespace?e(b+f+d,c.preserveLineBreaks,!0,!0,!0):f})),o&&(W=W.replace(new RegExp(o,"g"),function(){return S.shift()})),O("minified in: "+(Date.now()-R)+"ms"),W}function N(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 Q(c)}var O,P;O=a.console&&a.console.log?function(b){a.console.log(b)}:function(){},a.HTMLParser?P=a.HTMLParser:"function"==typeof require&&(P=require("./htmlparser").HTMLParser);var Q=function(a){return"string"!=typeof a?a:a.replace(/^\s+/,"").replace(/\s+$/,"")};String.prototype.trim&&(Q=function(a){return"string"!=typeof a?a:a.trim()});var R=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"),S=d("comment,img,input"),T=c(["text/javascript","text/ecmascript","text/jscript","application/javascript","application/x-javascript","application/ecmascript"]),U={draggable:["true","false"]},V="!function(){",W="}();",X={script:/^\s*(?:\/\/)?\s*\s*$/,style:/\s*-->\s*$/},Z=d("html,head,body"),$=d("html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,thead,tbody,tfoot,tr,td,th"),_=d("meta,link,script,style,template"),aa=d("dt,dd"),ba=d("address,article,aside,blockquote,div,dl,fieldset,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,main,nav,ol,p,pre,section,table,ul"),ca=d("rb,rt,rtc,rp"),da=d("rb,rtc,rp"),ea=d("option,optgroup"),fa=d("tbody,tfoot"),ga=d("td,th"),ha=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=M:a.minify=M}("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><'+a+"></code></strong> element"):b(a)?this.log.push('Found <span class="presentational-element">presentational</span> <strong><code><'+a+"></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><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><"+a+"></code></strong> element."):f(a,b)?this.log.push('Found <span class="deprecated-attribute">deprecated</span> <strong>'+b+"</strong> attribute on <strong><code><"+a+"></code></strong> element."):e(b)?this.log.push('Found <span class="style-attribute">style attribute</span> on <strong><code><'+a+"></code></strong> element."):g(b,c)&&this.log.push('Found <span class="inaccessible-attribute">inaccessible attribute</span> (on <strong><code><'+a+"></code></strong> element).")},h.prototype.testChars=function(a){this._lastElement="",/( \s*){2,}/.test(a)&&this.log.push("Found repeating <strong><code>&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(/</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("(?:\\s*[\\w:\\.-]+(?:\\s*(?:"+d(a)+")\\s*(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>\\s]+))?)*");if(a.customAttrSurround){for(var e=[],f=a.customAttrSurround.length-1;f>=0;f--)e[f]="(?:\\s*"+a.customAttrSurround[f][0].source+"\\s*"+c.source+"\\s*"+a.customAttrSurround[f][1].source+")";e.unshift(c.source),b=new RegExp("((?:"+e.join("|")+")*)")}else b=new RegExp("("+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<c.length;d++)b[c[d]]=!0,b[c[d].toUpperCase()]=!0;return b}var f=/([\w:\.-]+)/,g=/=/,h=[g],i=[/"((?:\\.|[^"])*)"/.source,/'((?:\\.|[^'])*)'/.source,/([^>\s]+)/.source],j=/^<([\w:-]+)/,k=/\s*(\/?)>/,l=/^<\/([\w:-]+)[^>]*>/,m=/\/>$/,n=/^<!DOCTYPE [^>]+>/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]*?)</"+p+"[^>]*>","i")),a=a.replace(q,function(a,b){return"script"!==p&&"style"!==p&&"noscript"!==p&&(b=b.replace(//g,"$1").replace(/<!\[CDATA\[([\s\S]*?)\]\]>/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(/^<!\[/.test(a)&&(g=a.indexOf("]>"),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(/^</.test(a)&&(h=a.match(z))){a=a.substring(h[0].length),h[0].replace(z,e),i=h[1].toLowerCase();continue}g=a.indexOf("<");var B=0>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<c.length;e++)b+=" "+c[e].name+'="'+(c[e].value||"").replace(/"/g,""")+'"';b+=(d?"/":"")+">"},end:function(a){b+="</"+a+">"},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,g){var h="",i="";return c&&(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?" ":"")),f&&(a=a.replace(/\s+$/,!i&&d?" ":"")),g&&(a=b(a)),h+a+i}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.preserveLineBreaks,d.conservativeCollapse,f,g,b&&c)}function g(a){return/\[if[^\]]+\]/.test(a)||/\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?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*(<!\[endif\])$/,"$1")}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 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||ma.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(a,b,c){"object"!=typeof b&&(b={}),"undefined"==typeof b.advanced&&(b.advanced=!1);try{var d;if("undefined"!=typeof CleanCSS)d=new CleanCSS(b);else if("function"==typeof require){var e=require("clean-css");d=new e(b)}return c?w(d.minify(v(a)).styles):d.minify(a).styles}catch(f){Q(f)}return a}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=a}c=c||{};var l=[];a=S(a),J(c);var m,o,p,q=[],r=[],s="",t="",u=[],v=[],w=[],E="",K="",O=c.lint,T=Date.now(),U=[],V=[];~a.indexOf("")&&(o="",a=a.replace(/([\s\S]*?)/g,function(a,b){return U.push(b),o}));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){return p||(p=N(a)),V.push(b)," "+p+" "})}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;o&&(B(E,a)&&j(),E="",D(K,a)&&(k(),o=!C(K,a)),K=""),c.collapseWhitespace&&(i(a,b)||v.push(a),d(a,b)||w.push(a));var p="<"+a,q=f&&c.keepClosingSlash;r.push(p),O&&O.testElement(a);for(var x,y=[],z=!0,A=b.length;--A>=0;)O&&O.testAttribute(a,b[A].name.toLowerCase(),b[A].value),x=I(b[A],b,a,q,A,c,z),x&&(z=!1,y.unshift(x));y.length>0?(r.push(" "),r.push.apply(r,y)):o&&_(a)&&(E=a),r.push(r.pop()+(q?"/":"")+">")},end:function(a,b){var d=a.toLowerCase();if("svg"===d&&(c=l.pop()),a=c.caseSensitive?a:d,c.removeOptionalTags&&(!K||"dt"===K||"thead"===K||"p"===K&&ea(a)||k(),K=aa(a)?a:""),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.removeEmptyElements&&g&&F(a,b)?(j(),E="",K=""):(q.push.apply(q,r),r=["</"+a+">"],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="","html"!==K&&"body"!==K&&("head"!==K&&"colgroup"!==K&&"caption"!==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?"<!DOCTYPE html>":b(a))},customAttrAssign:c.customAttrAssign,customAttrSurround:c.customAttrSurround}),c.removeOptionalTags&&(la(E)&&j(),K&&"dt"!==K&&"thead"!==K&&k()),q.push.apply(q,r);var Y=P(q,c);return p&&(Y=Y.replace(new RegExp("(\\s*)"+p+"(\\s*)","g"),function(a,b,d){var f=V.shift();return c.collapseWhitespace?e(b+f+d,c.preserveLineBreaks,!0,!0,!0):f})),o&&(Y=Y.replace(new RegExp(o,"g"),function(){return U.shift()})),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<d?g+=e:(f.push(g.replace(/^\n/,"")),g=e);f.push(g),c=f.join("\n")}else c=a.join("");return S(c)}var Q,R;Q=a.console&&a.console.log?function(b){a.console.log(b)}:function(){},a.HTMLParser?R=a.HTMLParser:"function"==typeof require&&(R=require("./htmlparser").HTMLParser);var S=function(a){return"string"!=typeof a?a:a.replace(/^\s+/,"").replace(/\s+$/,"")};String.prototype.trim&&(S=function(a){return"string"!=typeof a?a:a.trim()});var T=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"),U=d("comment,img,input"),V=c(["text/javascript","text/ecmascript","text/jscript","application/javascript","application/x-javascript","application/ecmascript"]),W={draggable:["true","false"]},X="!function(){",Y="}();",Z={script:/^\s*(?:\/\/)?\s*\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=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 <span class="deprecated-element">deprecated</span> <strong><code><'+a+"></code></strong> element"):b(a)?this.log.push('Found <span class="presentational-element">presentational</span> <strong><code><'+a+"></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><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><"+a+"></code></strong> element."):f(a,b)?this.log.push('Found <span class="deprecated-attribute">deprecated</span> <strong>'+b+"</strong> attribute on <strong><code><"+a+"></code></strong> element."):e(b)?this.log.push('Found <span class="style-attribute">style attribute</span> on <strong><code><'+a+"></code></strong> element."):g(b,c)&&this.log.push('Found <span class="inaccessible-attribute">inaccessible attribute</span> (on <strong><code><'+a+"></code></strong> element).")},h.prototype.testChars=function(a){this._lastElement="",/( \s*){2,}/.test(a)&&this.log.push("Found repeating <strong><code>&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(/</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 cb32ca5..15fef8f 100644 --- a/src/htmlminifier.js +++ b/src/htmlminifier.js @@ -383,17 +383,48 @@ return text.replace(reStartDelimiter[tag], '').replace(reEndDelimiter[tag], ''); } - // Tag omission rules from http://www.w3.org/TR/html5/syntax.html#optional-tags - var optionalStartTags = createMapFromString('html,head,body'); - var optionalEndTags = createMapFromString('html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,thead,tbody,tfoot,tr,td,th'); - var headerTags = createMapFromString('meta,link,script,style,template'); + // Tag omission rules from https://html.spec.whatwg.org/multipage/syntax.html#optional-tags + // with the following deviations: + // - retain <body> if followed by <noscript> + // - </rb>, </rt>, </rtc>, </rp> & </tfoot> follow http://www.w3.org/TR/html5/syntax.html#optional-tags + var optionalStartTags = createMapFromString('html,head,body,colgroup,tbody'); + var optionalEndTags = createMapFromString('html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,caption,thead,tbody,tfoot,tr,td,th'); + var headerTags = createMapFromString('meta,link,script,style,template,noscript'); var descriptionTags = createMapFromString('dt,dd'); - var pTag = createMapFromString('address,article,aside,blockquote,div,dl,fieldset,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,main,nav,ol,p,pre,section,table,ul'); + var pBlockTags = createMapFromString('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'); + var pInlineTags = createMapFromString('a,audio,del,ins,map,noscript,video'); var rubyTags = createMapFromString('rb,rt,rtc,rp'); var rtcTag = createMapFromString('rb,rtc,rp'); var optionTag = createMapFromString('option,optgroup'); - var tableTags = createMapFromString('tbody,tfoot'); + var tableContentTags = createMapFromString('tbody,tfoot'); + var tableSectionTags = createMapFromString('thead,tbody,tfoot'); var cellTags = createMapFromString('td,th'); + var topLevelTags = createMapFromString('html,head,body'); + + function canRemoveParentTag(optionalStartTag, tag) { + switch (optionalStartTag) { + case 'html': + case 'head': + return true; + case 'body': + return !headerTags(tag); + case 'colgroup': + return tag === 'col'; + case 'tbody': + return tag === 'tr'; + } + return false; + } + + function isStartTagMandatory(optionalEndTag, tag) { + switch (tag) { + case 'colgroup': + return optionalEndTag === 'colgroup'; + case 'tbody': + return tableSectionTags(optionalEndTag); + } + return false; + } function canRemovePrecedingTag(optionalEndTag, tag) { switch (optionalEndTag) { @@ -401,6 +432,7 @@ case 'head': case 'body': case 'colgroup': + case 'caption': return true; case 'li': case 'optgroup': @@ -410,7 +442,7 @@ case 'dd': return descriptionTags(tag); case 'p': - return pTag(tag); + return pBlockTags(tag); case 'rb': case 'rt': case 'rp': @@ -421,7 +453,7 @@ return optionTag(tag); case 'thead': case 'tbody': - return tableTags(tag); + return tableContentTags(tag); case 'tfoot': return tag === 'tbody'; case 'td': @@ -780,17 +812,23 @@ currentChars = ''; currentAttrs = attrs; - if (options.removeOptionalTags) { + var optional = options.removeOptionalTags; + if (optional) { // <html> may be omitted if first thing inside is not comment // <head> may be omitted if first thing inside is an element // <body> may be omitted if first thing inside is not space, comment, <meta>, <link>, <script>, <style> or <template> - if (optionalStartTag && (optionalStartTag !== 'body' || !headerTags(tag))) { + // <colgroup> may be omitted if first thing inside is <col> + // <tbody> may be omitted if first thing inside is <tr> + if (canRemoveParentTag(optionalStartTag, tag)) { removeStartTag(); } optionalStartTag = ''; // end-tag-followed-by-start-tag omission rules if (canRemovePrecedingTag(optionalEndTag, tag)) { removeEndTag(); + // <colgroup> cannot be omitted if preceding </colgroup> is omitted + // <tbody> cannot be omitted if preceding </tbody>, </thead> or </tfoot> is omitted + optional = !isStartTagMandatory(optionalEndTag, tag); } optionalEndTag = ''; } @@ -831,7 +869,7 @@ buffer.push.apply(buffer, parts); } // start tag must never be omitted if it has any attributes - else if (options.removeOptionalTags && optionalStartTags(tag)) { + else if (optional && optionalStartTags(tag)) { optionalStartTag = tag; } @@ -850,7 +888,7 @@ // </head> may be omitted if not followed by space or comment // </p> may be omitted if no more content in non-</a> parent // except for </dt> or </thead>, end tags may be omitted if no more content in parent element - if (optionalEndTag && optionalEndTag !== 'dt' && optionalEndTag !== 'thead' && (optionalEndTag !== 'p' || tag !== 'a')) { + if (optionalEndTag && optionalEndTag !== 'dt' && optionalEndTag !== 'thead' && (optionalEndTag !== 'p' || !pInlineTags(tag))) { removeEndTag(); } optionalEndTag = optionalEndTags(tag) ? tag : ''; @@ -954,8 +992,8 @@ } optionalStartTag = ''; // </html> or </body> may be omitted if not followed by comment - // </head> or </colgroup> may be omitted if not followed by space or comment - if (optionalEndTag === 'html' || optionalEndTag === 'body' || (optionalEndTag === 'head' || optionalEndTag === 'colgroup') && !/^\s/.test(text)) { + // </head>, </colgroup> or </caption> may be omitted if not followed by space or comment + if (optionalEndTag === 'html' || optionalEndTag === 'body' || (optionalEndTag === 'head' || optionalEndTag === 'colgroup' || optionalEndTag === 'caption') && !/^\s/.test(text)) { removeEndTag(); } optionalEndTag = ''; @@ -1001,7 +1039,7 @@ if (options.removeOptionalTags) { // <html> may be omitted if first thing inside is not comment // <head> or <body> may be omitted if empty - if (optionalStartTag) { + if (topLevelTags(optionalStartTag)) { removeStartTag(); } // except for </dt> or </thead>, end tags may be omitted if no more content in parent element diff --git a/tests/minifier.js b/tests/minifier.js index e341cc0..62ef392 100644 --- a/tests/minifier.js +++ b/tests/minifier.js @@ -812,24 +812,70 @@ input = '<html><head><title>a</title><link href="b.css" rel="stylesheet"/></head><body><a href="c.html"></a><div class="d"><input value="e"/></div></body></html>'; output = '<title>a</title><link href="b.css" rel="stylesheet"><a href="c.html"></a><div class="d"><input value="e"></div>'; equal(minify(input, { removeOptionalTags: true }), output); + + input = '<!DOCTYPE html><html><head><title>Blah</title></head><body><div><p>This is some text in a div</p><details>Followed by some details</details></div><div><p>This is some more text in a div</p></div></body></html>'; + output = '<!DOCTYPE html><title>Blah</title><div><p>This is some text in a div<details>Followed by some details</details></div><div><p>This is some more text in a div</div>'; + equal(minify(input, { removeOptionalTags: true }), output); + + input = '<!DOCTYPE html><html><head><title>Blah</title></head><body><noscript><p>This is some text in a noscript</p><details>Followed by some details</details>

'; + output = 'Blah'; + equal(minify(input, { removeOptionalTags: true }), output); }); test('removing optional tags in tables', function() { - input = '' + - '' + - '' + - '' + + ' ' + + '' + + '' + '

foo	bar
baz	qux
boo	moo
foo	bar	baz
boo	moo	loo
baz	qux	boo

'; + equal(minify(input), input); output = '' + - ' ' + + ' ' + + '

foo	bar' + - '
baz	qux' + - '
boo	moo' + + '
foo	bar	baz
boo	moo	loo
baz	qux	boo' + '

'; + equal(minify(input, { removeOptionalTags: true }), output); + + output = '' + + '

foo	bar	baz' + + '
boo	moo	loo' + + '
baz	qux	boo' + + '

'; + equal(minify(input, { collapseWhitespace: true, removeOptionalTags: true }), output); + + input = '' + + '' + + '' + + '' + + '' + + '' + + '

foo
bar	baz	qux

'; + equal(minify(input), input); + output = '' + + '' + + '' + + '' + + '' + + '

foo
bar	baz	qux' + + '

'; equal(minify(input, { removeOptionalTags: true }), output); + + output = '' + + '' + + '

foo' + + '
bar	baz	qux' + + '

'; + equal(minify(input, { removeComments: true, removeOptionalTags: true }), output); + + input = '' + + '' + + '

'; equal(minify(input), input); + + output = '

'; + equal(minify(input, { removeOptionalTags: true }), output); }); test('removing optional tags in options', function() { -- 2.34.1