aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/javascript
diff options
context:
space:
mode:
authorJonathan Duran2012-03-06 17:08:55 -0800
committerJonathan Duran2012-03-06 17:08:55 -0800
commitbb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch)
tree6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /imports/codemirror/mode/javascript
parent2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/javascript')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/javascript/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/javascript/javascript.js4
2 files changed, 2 insertions, 2 deletions
diff --git a/imports/codemirror/mode/javascript/index.html b/imports/codemirror/mode/javascript/index.html
index c3ab91dc..c3ab91dc 100755..100644
--- a/imports/codemirror/mode/javascript/index.html
+++ b/imports/codemirror/mode/javascript/index.html
diff --git a/imports/codemirror/mode/javascript/javascript.js b/imports/codemirror/mode/javascript/javascript.js
index be2a0698..b9388bc9 100755..100644
--- a/imports/codemirror/mode/javascript/javascript.js
+++ b/imports/codemirror/mode/javascript/javascript.js
@@ -69,7 +69,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
69 else if (state.reAllowed) { 69 else if (state.reAllowed) {
70 nextUntilUnescaped(stream, "/"); 70 nextUntilUnescaped(stream, "/");
71 stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla 71 stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
72 return ret("regexp", "string"); 72 return ret("regexp", "string-2");
73 } 73 }
74 else { 74 else {
75 stream.eatWhile(isOperatorChar); 75 stream.eatWhile(isOperatorChar);
@@ -230,7 +230,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
230 if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator); 230 if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
231 if (type == "function") return cont(functiondef); 231 if (type == "function") return cont(functiondef);
232 if (type == "keyword c") return cont(maybeexpression); 232 if (type == "keyword c") return cont(maybeexpression);
233 if (type == "(") return cont(pushlex(")"), expression, expect(")"), poplex, maybeoperator); 233 if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
234 if (type == "operator") return cont(expression); 234 if (type == "operator") return cont(expression);
235 if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator); 235 if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator);
236 if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator); 236 if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);