aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/javascript/javascript.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-04 15:31:40 -0700
committerValerio Virgillito2012-05-04 15:31:40 -0700
commit3ebed34665fa73b0ce613b400f3029ebf4476439 (patch)
tree09a3c592035030bda7bb62d1f908ce263377d74c /imports/codemirror/mode/javascript/javascript.js
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'imports/codemirror/mode/javascript/javascript.js')
-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 },