jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for node test runner

Browse source
This commit is contained in:
nightwing 2012-05-05 14:30:18 +04:00
commit 13ca06d82b
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ace/edit_session.js
View file

@ -761,6 +761,9 @@ var EditSession = function(text, mode) {
this.$modes = {}; this.$modes = {};
this._loadMode = function(mode, callback) { this._loadMode = function(mode, callback) {
if (!this.$modes["null"])
this.$modes["null"] = this.$modes["ace/mode/text"] = new TextMode();
if (this.$modes[mode]) if (this.$modes[mode])
return callback(this.$modes[mode]); return callback(this.$modes[mode]);
@ -804,11 +807,7 @@ var EditSession = function(text, mode) {
}; };
this.$setModePlaceholder = function() { this.$setModePlaceholder = function() {
var textModeId = "ace/mode/text" this.$mode = this.$modes["null"];
if (!this.$modes[textModeId])
this.$modes[textModeId] = new TextMode();
this.$mode = this.$modes[textModeId];
var tokenizer = this.$mode.getTokenizer(); var tokenizer = this.$mode.getTokenizer();
if (!this.bgTokenizer) { if (!this.bgTokenizer) {
@ -820,7 +819,7 @@ var EditSession = function(text, mode) {
} else { } else {
this.bgTokenizer.setTokenizer(tokenizer); this.bgTokenizer.setTokenizer(tokenizer);
} }
this.bgTokenizer.setDocument(this.getDocument()); this.bgTokenizer.setDocument(this.getDocument());
this.tokenRe = this.$mode.tokenRe; this.tokenRe = this.$mode.tokenRe;
this.nonTokenRe = this.$mode.nonTokenRe; this.nonTokenRe = this.$mode.nonTokenRe;
@ -836,7 +835,7 @@ var EditSession = function(text, mode) {
this.$mode = null; this.$mode = null;
this.$modeId = null; this.$modeId = null;
this.setMode = function(mode) { this.setMode = function(mode) {
mode = mode || "ace/mode/text"; mode = mode || "null";
// load on demand // load on demand
if (typeof mode === "string") { if (typeof mode === "string") {
if (this.$modeId == mode) if (this.$modeId == mode)