From 120f2698304d9108659c4dc746510e5943a2b23e Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Wed, 14 Oct 2015 09:02:19 -0700 Subject: [PATCH] Handle tags in htmlmixed mode (fixes mozilla bug 1214663) --- mode/htmlmixed/htmlmixed.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js index 670fd62bf1..cb04246ec8 100644 --- a/mode/htmlmixed/htmlmixed.js +++ b/mode/htmlmixed/htmlmixed.js @@ -91,10 +91,11 @@ function html(stream, state) { var tagName = state.htmlState.tagName; var tagInfo = tagName && tags[tagName.toLowerCase()]; + var isTagInfoArray = Object.prototype.toString.call(tagInfo) === "[object Array]"; var style = htmlMode.token(stream, state.htmlState), modeSpec; - if (tagInfo && /\btag\b/.test(style) && stream.current() === ">" && + if (isTagInfoArray && /\btag\b/.test(style) && stream.current() === ">" && (modeSpec = findMatchingMode(tagInfo, stream))) { var mode = CodeMirror.getMode(config, modeSpec); var endTagA = getTagRegexp(tagName, true), endTag = getTagRegexp(tagName, false);