From 8bf516263c6582771e7576e8484ca8cfaa8cb9cb Mon Sep 17 00:00:00 2001
From: Cheng-Han, Wu
Date: Wed, 20 Apr 2016 18:11:40 +0800
Subject: Update CodeMirror to 5.13.5

---
 public/vendor/codemirror/mode/jsx/jsx.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'public/vendor/codemirror/mode/jsx/jsx.js')

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")
-})
+});
-- 
cgit v1.2.3