aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/javascript
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/mode/javascript
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
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 },