aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/php/php.js
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 11:42:09 -0700
committerJonathan Duran2012-07-17 11:42:09 -0700
commitb4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/mode/php/php.js
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/php/php.js')
-rw-r--r--imports/codemirror/mode/php/php.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/php/php.js b/imports/codemirror/mode/php/php.js
index 5406a5ce..e35922fd 100644
--- a/imports/codemirror/mode/php/php.js
+++ b/imports/codemirror/mode/php/php.js
@@ -143,7 +143,7 @@
143 143
144 electricChars: "/{}:" 144 electricChars: "/{}:"
145 } 145 }
146 }); 146 }, "xml", "clike", "javascript", "css");
147 CodeMirror.defineMIME("application/x-httpd-php", "php"); 147 CodeMirror.defineMIME("application/x-httpd-php", "php");
148 CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true}); 148 CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
149 CodeMirror.defineMIME("text/x-php", phpConfig); 149 CodeMirror.defineMIME("text/x-php", phpConfig);