diff options
author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
tree | ceb527713554f506c537168e36a10452cd09ad10 /imports/codemirror/mode/javascript | |
parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/javascript')
-rw-r--r-- | imports/codemirror/mode/javascript/javascript.js | 6 |
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 | }, |