Skip to content

Commit

Permalink
Merge branch 'master' into gh-406
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris authored Apr 19, 2017
2 parents f0b6bec + 386cb8b commit e1a1e65
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/validate/html/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import validateWindow from './validateWindow.js';

const svg = /^(?:altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform|circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix|feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern|image|line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata|missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor|stop|switch|symbol|text|textPath|title|tref|tspan|unknown|use|view|vkern)$/;

const meta = {
':Window': validateWindow
};
const meta = new Map([
[ ':Window', validateWindow ]
]);

export default function validateHtml ( validator, html ) {
let elementDepth = 0;
Expand All @@ -17,8 +17,8 @@ export default function validateHtml ( validator, html ) {
validator.warn( `<${node.name}> is an SVG element – did you forget to add { namespace: 'svg' } ?`, node.start );
}

if ( node.name in meta ) {
return meta[ node.name ]( validator, node );
if ( meta.has( node.name ) ) {
return meta.get( node.name )( validator, node );
}

elementDepth += 1;
Expand Down

0 comments on commit e1a1e65

Please sign in to comment.