diff options
author | Wu Cheng-Han | 2015-07-04 11:31:01 +0800 |
---|---|---|
committer | Wu Cheng-Han | 2015-07-04 11:31:01 +0800 |
commit | 01685c255fda6e13f1cd2980130d2e388d52125c (patch) | |
tree | c329610e7011c0d77c55ef54f371181aeb362d13 /public/vendor/codemirror/mode/css | |
parent | 1d843c8ac257d512a96cf054ab24e6a3c2f34e26 (diff) |
Updated codemirror to 5.4.0
Diffstat (limited to 'public/vendor/codemirror/mode/css')
-rwxr-xr-x | public/vendor/codemirror/mode/css/css.js | 17 | ||||
-rwxr-xr-x | public/vendor/codemirror/mode/css/test.js | 7 |
2 files changed, 1 insertions, 23 deletions
diff --git a/public/vendor/codemirror/mode/css/css.js b/public/vendor/codemirror/mode/css/css.js index 7fc9098f..1e6d2ddb 100755 --- a/public/vendor/codemirror/mode/css/css.js +++ b/public/vendor/codemirror/mode/css/css.js @@ -329,7 +329,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) { if (type == "}") return popContext(state); if (type == "{" || type == ";") return popAndPass(type, stream, state); if (type == "word") override = "variable"; - else if (type != "variable") override = "error"; + else if (type != "variable" && type != "(" && type != ")") override = "error"; return "interpolation"; }; @@ -653,16 +653,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) { return ["comment", "comment"]; } - function tokenSGMLComment(stream, state) { - if (stream.skipTo("-->")) { - stream.match("-->"); - state.tokenize = null; - } else { - stream.skipToEnd(); - } - return ["comment", "comment"]; - } - CodeMirror.defineMIME("text/css", { documentTypes: documentTypes, mediaTypes: mediaTypes, @@ -674,11 +664,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) { colorKeywords: colorKeywords, valueKeywords: valueKeywords, tokenHooks: { - "<": function(stream, state) { - if (!stream.match("!--")) return false; - state.tokenize = tokenSGMLComment; - return tokenSGMLComment(stream, state); - }, "/": function(stream, state) { if (!stream.eat("*")) return false; state.tokenize = tokenCComment; diff --git a/public/vendor/codemirror/mode/css/test.js b/public/vendor/codemirror/mode/css/test.js index bef71561..55ae676e 100755 --- a/public/vendor/codemirror/mode/css/test.js +++ b/public/vendor/codemirror/mode/css/test.js @@ -76,13 +76,6 @@ MT("tagTwoPropertiesURL", "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }"); - MT("commentSGML", - "[comment <!--comment-->]"); - - MT("commentSGML2", - "[comment <!--comment]", - "[comment -->] [tag div] {}"); - MT("indent_tagSelector", "[tag strong], [tag em] {", " [property background]: [atom rgba](", |