aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/javascript
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/javascript
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports/codemirror/mode/javascript')
-rw-r--r--imports/codemirror/mode/javascript/javascript.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/imports/codemirror/mode/javascript/javascript.js b/imports/codemirror/mode/javascript/javascript.js
index b9388bc9..462f4863 100644
--- a/imports/codemirror/mode/javascript/javascript.js
+++ b/imports/codemirror/mode/javascript/javascript.js
@@ -319,8 +319,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
319 kwAllowed: true, 319 kwAllowed: true,
320 cc: [], 320 cc: [],
321 lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), 321 lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
322 localVars: null, 322 localVars: parserConfig.localVars,
323 context: null, 323 context: parserConfig.localVars && {vars: parserConfig.localVars},
324 indented: 0 324 indented: 0
325 }; 325 };
326 }, 326 },
@@ -334,7 +334,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
334 if (stream.eatSpace()) return null; 334 if (stream.eatSpace()) return null;
335 var style = state.tokenize(stream, state); 335 var style = state.tokenize(stream, state);
336 if (type == "comment") return style; 336 if (type == "comment") return style;
337 state.reAllowed = type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/); 337 state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/));
338 state.kwAllowed = type != '.'; 338 state.kwAllowed = type != '.';
339 return parseJS(state, style, type, content, stream); 339 return parseJS(state, style, type, content, stream);
340 }, 340 },