From eaa8ccaccb1091820d0a8d1223996a6dd057347d Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Sun, 17 Jan 2016 14:28:04 -0600
Subject: Upgrade CodeMirror to 5.10.1 and now support fullscreen, jump-to-line
 in editor

---
 public/vendor/codemirror/addon/mode/loadmode.js       | 0
 public/vendor/codemirror/addon/mode/multiplex.js      | 6 +++---
 public/vendor/codemirror/addon/mode/multiplex_test.js | 2 +-
 public/vendor/codemirror/addon/mode/overlay.js        | 0
 public/vendor/codemirror/addon/mode/simple.js         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 public/vendor/codemirror/addon/mode/loadmode.js
 mode change 100755 => 100644 public/vendor/codemirror/addon/mode/multiplex.js
 mode change 100755 => 100644 public/vendor/codemirror/addon/mode/multiplex_test.js
 mode change 100755 => 100644 public/vendor/codemirror/addon/mode/overlay.js
 mode change 100755 => 100644 public/vendor/codemirror/addon/mode/simple.js

(limited to 'public/vendor/codemirror/addon/mode')

diff --git a/public/vendor/codemirror/addon/mode/loadmode.js b/public/vendor/codemirror/addon/mode/loadmode.js
old mode 100755
new mode 100644
diff --git a/public/vendor/codemirror/addon/mode/multiplex.js b/public/vendor/codemirror/addon/mode/multiplex.js
old mode 100755
new mode 100644
index fe48c7fb..3d8b34c4
--- a/public/vendor/codemirror/addon/mode/multiplex.js
+++ b/public/vendor/codemirror/addon/mode/multiplex.js
@@ -51,7 +51,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
             if (!other.parseDelimiters) stream.match(other.open);
             state.innerActive = other;
             state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
-            return other.delimStyle;
+            return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
           } else if (found != -1 && found < cutOff) {
             cutOff = found;
           }
@@ -70,7 +70,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         if (found == stream.pos && !curInner.parseDelimiters) {
           stream.match(curInner.close);
           state.innerActive = state.inner = null;
-          return curInner.delimStyle;
+          return curInner.delimStyle && (curInner.delimStyle + " " + curInner.delimStyle + "-close");
         }
         if (found > -1) stream.string = oldContent.slice(0, found);
         var innerToken = curInner.mode.token(stream, state.inner);
@@ -80,7 +80,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           state.innerActive = state.inner = null;
 
         if (curInner.innerStyle) {
-          if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
+          if (innerToken) innerToken = innerToken + " " + curInner.innerStyle;
           else innerToken = curInner.innerStyle;
         }
 
diff --git a/public/vendor/codemirror/addon/mode/multiplex_test.js b/public/vendor/codemirror/addon/mode/multiplex_test.js
old mode 100755
new mode 100644
index d3394342..24e5e670
--- a/public/vendor/codemirror/addon/mode/multiplex_test.js
+++ b/public/vendor/codemirror/addon/mode/multiplex_test.js
@@ -29,5 +29,5 @@
 
   MT(
     "stexInsideMarkdown",
-    "[strong **Equation:**] [delim $][inner&tag \\pi][delim $]");
+    "[strong **Equation:**] [delim&delim-open $][inner&tag \\pi][delim&delim-close $]");
 })();
diff --git a/public/vendor/codemirror/addon/mode/overlay.js b/public/vendor/codemirror/addon/mode/overlay.js
old mode 100755
new mode 100644
diff --git a/public/vendor/codemirror/addon/mode/simple.js b/public/vendor/codemirror/addon/mode/simple.js
old mode 100755
new mode 100644
index 795328b8..df663365
--- a/public/vendor/codemirror/addon/mode/simple.js
+++ b/public/vendor/codemirror/addon/mode/simple.js
@@ -60,7 +60,7 @@
 
   function ensureState(states, name) {
     if (!states.hasOwnProperty(name))
-      throw new Error("Undefined state " + name + "in simple mode");
+      throw new Error("Undefined state " + name + " in simple mode");
   }
 
   function toRegex(val, caret) {
-- 
cgit v1.2.3