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

fix #505

Browse source
This commit is contained in:
Fabian Jakobs 2011-11-15 18:11:00 +01:00
commit be69263d31
4 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/edit_session.js
View file

@ -393,7 +393,7 @@ var EditSession = function(text, mode) {
};
this.getAnnotations = function() {
return this.$annotations;
return this.$annotations || {};
};
this.clearAnnotations = function() {

27
lib/ace/editor_change_document_test.js
View file

@ -46,6 +46,8 @@ var EditSession = require("./edit_session").EditSession;
var Editor = require("./editor").Editor;
var Text = require("./mode/text").Mode;
var JavaScriptMode = require("./mode/javascript").Mode;
var CssMode = require("./mode/css").Mode;
var HtmlMode = require("./mode/html").Mode;
var MockRenderer = require("./test/mockrenderer").MockRenderer;
var assert = require("./test/assertions");
@ -157,6 +159,31 @@ module.exports = {
this.session2.setMode(new JavaScriptMode());
assert.ok(called);
},
"test: should use stop worker of old document" : function(next) {
var self = this;
// 1. Open an editor and set the session to CssMode
self.editor.setSession(self.session1);
self.session1.setMode(new CssMode());
// 2. Add a line or two of valid CSS.
self.session1.setValue("DIV { color: red; }");
// 3. Clear the session value.
self.session1.setValue("");
// 4. Set the session to HtmlMode
self.session1.setMode(new HtmlMode());
// 5. Try to type valid HTML
self.session1.insert({row: 0, column: 0}, "<html></html>");
setTimeout(function() {
assert.equal(Object.keys(self.session1.getAnnotations()).length, 0);
next();
}, 600);
}
};

4
lib/ace/mode/coffee.js
View file

@ -106,7 +106,9 @@ oop.inherits(Mode, TextMode);
worker.on("ok", function(e) {
session.clearAnnotations();
});
});
return worker;
};
}).call(Mode.prototype);

1
lib/ace/mode/css.js
View file

@ -95,6 +95,7 @@ oop.inherits(Mode, TextMode);
session.setAnnotations(errors);
});
return worker;
};
}).call(Mode.prototype);