diff options
| author | Jon Reid | 2012-07-17 16:03:14 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-17 16:03:14 -0700 |
| commit | 42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch) | |
| tree | 67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/mode/php | |
| parent | a12cabc16273ffe04af4bce1f7438dc9326efa89 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/php')
| -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); |