summaryrefslogtreecommitdiff
path: root/public/vendor/codemirror/addon/mode
diff options
context:
space:
mode:
Diffstat (limited to 'public/vendor/codemirror/addon/mode')
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/mode/loadmode.js0
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/mode/multiplex.js6
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/mode/multiplex_test.js2
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/mode/overlay.js0
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/mode/simple.js2
5 files changed, 5 insertions, 5 deletions
diff --git a/public/vendor/codemirror/addon/mode/loadmode.js b/public/vendor/codemirror/addon/mode/loadmode.js
index 10117ec2..10117ec2 100755..100644
--- a/public/vendor/codemirror/addon/mode/loadmode.js
+++ b/public/vendor/codemirror/addon/mode/loadmode.js
diff --git a/public/vendor/codemirror/addon/mode/multiplex.js b/public/vendor/codemirror/addon/mode/multiplex.js
index fe48c7fb..3d8b34c4 100755..100644
--- 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
index d3394342..24e5e670 100755..100644
--- 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
index e1b9ed37..e1b9ed37 100755..100644
--- a/public/vendor/codemirror/addon/mode/overlay.js
+++ b/public/vendor/codemirror/addon/mode/overlay.js
diff --git a/public/vendor/codemirror/addon/mode/simple.js b/public/vendor/codemirror/addon/mode/simple.js
index 795328b8..df663365 100755..100644
--- 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) {