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/xml/index.html | 6 +++++-
public/vendor/codemirror/mode/xml/xml.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
(limited to 'public/vendor/codemirror/mode/xml')
diff --git a/public/vendor/codemirror/mode/xml/index.html b/public/vendor/codemirror/mode/xml/index.html
index 7149f06b..c56b8b6e 100644
--- a/public/vendor/codemirror/mode/xml/index.html
+++ b/public/vendor/codemirror/mode/xml/index.html
@@ -42,12 +42,16 @@
lineNumbers: true
});
-
The XML mode supports two configuration parameters:
+ The XML mode supports these configuration parameters:
htmlMode (boolean)
- This switches the mode to parse HTML instead of XML. This
means attributes do not have to be quoted, and some elements
(such as
br
) do not require a closing tag.
+ matchClosing (boolean)
+ - Controls whether the mode checks that close tags match the
+ corresponding opening tag, and highlights mismatches as errors.
+ Defaults to true.
alignCDATA (boolean)
- Setting this to true will force the opening tag of CDATA
blocks to not be indented.
diff --git a/public/vendor/codemirror/mode/xml/xml.js b/public/vendor/codemirror/mode/xml/xml.js
index 014f7d84..f987a3a3 100644
--- a/public/vendor/codemirror/mode/xml/xml.js
+++ b/public/vendor/codemirror/mode/xml/xml.js
@@ -237,7 +237,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
if (state.context && state.context.tagName != tagName &&
config.implicitlyClosed.hasOwnProperty(state.context.tagName))
popContext(state);
- if (state.context && state.context.tagName == tagName) {
+ if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
setStyle = "tag";
return closeState;
} else {
--
cgit v1.2.3