diff options
| author | Ananya Sen | 2012-07-17 14:25:53 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-17 14:25:53 -0700 |
| commit | 09457e39532e9b35afb9c635266755bfcb9b488a (patch) | |
| tree | 665dcbd41377b98dcab15ff995e9434d9db1a462 /imports/codemirror/mode/php/php.js | |
| parent | f2dbca782bbaca3bed96dff808693693ba083ea9 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-09457e39532e9b35afb9c635266755bfcb9b488a.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
Diffstat (limited to 'imports/codemirror/mode/php/php.js')
| -rw-r--r-- | imports/codemirror/mode/php/php.js | 2 |
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); |