reverted 4622 codemirror3 because broke zencoding and drops support for IE7, we do not use the new features anyway. Sorry

This commit is contained in:
mdipierro
2013-01-23 08:17:59 -06:00
parent b7f2991246
commit b1f77b9c4a
47 changed files with 4458 additions and 7601 deletions

View File

@@ -160,7 +160,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
var singleline = delimiter.length == 1;
var OUTCLASS = 'string';
function tokenString(stream, state) {
return function tokenString(stream, state) {
while (!stream.eol()) {
stream.eatWhile(/[^'"\\]/);
if (stream.eat('\\')) {
@@ -183,9 +183,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
}
}
return OUTCLASS;
}
tokenString.isString = true;
return tokenString;
};
}
function indent(stream, state, type) {
@@ -325,9 +323,9 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
return style;
},
indent: function(state) {
indent: function(state, textAfter) {
if (state.tokenize != tokenBase) {
return state.tokenize.isString ? CodeMirror.Pass : 0;
return 0;
}
return state.scopes[0].offset;