Update CodeMirror to 5.13.5

This commit is contained in:
Cheng-Han, Wu
2016-04-20 18:11:40 +08:00
parent edc3a31dfd
commit 8bf516263c
84 changed files with 2837 additions and 504 deletions

View File

@@ -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>

View File

@@ -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));
}