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/velocity/index.html  | 2 ++
 public/vendor/codemirror/mode/velocity/velocity.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/public/vendor/codemirror/mode/velocity/index.html b/public/vendor/codemirror/mode/velocity/index.html
index 27478786..7eba8f41 100644
--- a/public/vendor/codemirror/mode/velocity/index.html
+++ b/public/vendor/codemirror/mode/velocity/index.html
@@ -77,6 +77,8 @@ $someObject.getValues("this is a string split
 
 $someObject("This plus $something in the middle").method(7567).property
 
+#set($something = "Parseable string with '$quotes'!")
+
 #macro( tablerows $color $somelist )
     #foreach( $something in $somelist )
         <tr><td bgcolor=$color>$something</td></tr>
diff --git a/public/vendor/codemirror/mode/velocity/velocity.js b/public/vendor/codemirror/mode/velocity/velocity.js
index 8fc4f95d..12ee2212 100644
--- a/public/vendor/codemirror/mode/velocity/velocity.js
+++ b/public/vendor/codemirror/mode/velocity/velocity.js
@@ -34,7 +34,7 @@ CodeMirror.defineMode("velocity", function() {
         state.beforeParams = false;
         var ch = stream.next();
         // start of unparsed string?
-        if ((ch == "'") && state.inParams) {
+        if ((ch == "'") && !state.inString && state.inParams) {
             state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenString(ch));
         }
-- 
cgit v1.2.3