diff options
| author | Yukai Huang | 2016-10-11 18:39:15 +0800 |
|---|---|---|
| committer | Yukai Huang | 2016-10-11 18:40:23 +0800 |
| commit | 6e651c8108783d224c5f40d1bb8047a9ebbeff00 (patch) | |
| tree | c7d501cc6ebb46399c397768b3f58ef05034c522 /public/vendor/codemirror/mode/jsx/jsx.js | |
| parent | 21028c57735028574c769fb6650322eb3f0cb924 (diff) | |
| parent | cd9f8fe36b707ff5a9f8f7be4d55145ddee97f3a (diff) | |
Merge branch 'master' into webpack-frontend
Diffstat (limited to 'public/vendor/codemirror/mode/jsx/jsx.js')
| -rw-r--r-- | public/vendor/codemirror/mode/jsx/jsx.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/vendor/codemirror/mode/jsx/jsx.js b/public/vendor/codemirror/mode/jsx/jsx.js index aff01b8d..45c3024a 100644 --- a/public/vendor/codemirror/mode/jsx/jsx.js +++ b/public/vendor/codemirror/mode/jsx/jsx.js @@ -144,4 +144,5 @@ }, "xml", "javascript") CodeMirror.defineMIME("text/jsx", "jsx") + CodeMirror.defineMIME("text/typescript-jsx", {name: "jsx", base: {name: "javascript", typescript: true}}) }); |