third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js - Issue 2772343006: DevTools: Roll CodeMirror to 5.25.1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js

Issue 2772343006: DevTools: Roll CodeMirror to 5.25.1 (Closed)

Patch Set: stray space Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/cm_web_modes/css.js ('k') | third_party/WebKit/Source/devtools/front_end/cm_web_modes/javascript.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js

diff --git a/third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js b/third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js

index d74083ee1a3609f668321f3945c1ad540bb721d9..16b4f139fd400cee86d5e10dda864881cf8b20a3 100644

--- a/third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js

+++ b/third_party/WebKit/Source/devtools/front_end/cm_web_modes/htmlmixed.js

@@ -14,7 +14,7 @@

var defaultTags = {

script: [

["lang", /(javascript|babel)/i, "javascript"],

- ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],

+ ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],

["type", /./, "text/plain"],

[null, null, "javascript"]

@@ -46,7 +46,7 @@

function getAttrValue(text, attr) {

var match = text.match(getAttrRegexp(attr))

- return match ? match[2] : ""

+ return match ? /^\s*(.*?)\s*$/.exec(match[2])[1] : ""

}

function getTagRegexp(tagName, anchored) {