summaryrefslogtreecommitdiff
path: root/public/vendor/codemirror/mode/jsx/jsx.js
diff options
context:
space:
mode:
authorCheng-Han, Wu2016-04-20 18:11:40 +0800
committerCheng-Han, Wu2016-04-20 18:11:40 +0800
commit8bf516263c6582771e7576e8484ca8cfaa8cb9cb (patch)
treeaba81172f554a50466a762db99f25e3650d7ff45 /public/vendor/codemirror/mode/jsx/jsx.js
parentedc3a31dfdb03e910d7355144280e281eeb582d5 (diff)
Update CodeMirror to 5.13.5
Diffstat (limited to 'public/vendor/codemirror/mode/jsx/jsx.js')
-rw-r--r--public/vendor/codemirror/mode/jsx/jsx.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/public/vendor/codemirror/mode/jsx/jsx.js b/public/vendor/codemirror/mode/jsx/jsx.js
index bc2ea797..aff01b8d 100644
--- a/public/vendor/codemirror/mode/jsx/jsx.js
+++ b/public/vendor/codemirror/mode/jsx/jsx.js
@@ -25,9 +25,9 @@
context.prev && copyContext(context.prev))
}
- CodeMirror.defineMode("jsx", function(config) {
+ CodeMirror.defineMode("jsx", function(config, modeConfig) {
var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false})
- var jsMode = CodeMirror.getMode(config, "javascript")
+ var jsMode = CodeMirror.getMode(config, modeConfig && modeConfig.base || "javascript")
function flatXMLIndent(state) {
var tagName = state.tagName
@@ -144,4 +144,4 @@
}, "xml", "javascript")
CodeMirror.defineMIME("text/jsx", "jsx")
-})
+});