Skip to content

Commit d436d71

Browse files
committed
rename document to session
1 parent a08f880 commit d436d71

11 files changed

+147
-139
lines changed

build_support/boot.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ var ace = {
5151
var env = require("pilot/environment").create();
5252
var catalog = require("pilot/plugin_manager").catalog;
5353
catalog.startupPlugins({ env: env }).then(function() {
54-
var Document = require("ace/document").Document;
54+
var EditSession = require("ace/edit_session").EditSession;
5555
var JavaScriptMode = require("ace/mode/javascript").Mode;
5656
var UndoManager = require("ace/undomanager").UndoManager;
5757
var Editor = require("ace/editor").Editor;
5858
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
5959
var theme = require("ace/theme/textmate");
6060

61-
var doc = new Document(el.innerHTML);
61+
var doc = new EditSession(el.innerHTML);
6262
el.innerHTML = '';
6363
doc.setMode(new JavaScriptMode());
6464
doc.setUndoManager(new UndoManager());
6565
env.document = doc;
6666
env.editor = new Editor(new Renderer(el, theme));
67-
env.editor.setDocument(doc);
67+
env.editor.setSession(doc);
6868
env.editor.resize();
6969
window.addEventListener("resize", function() {
7070
env.editor.resize();

demo/startup.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ exports.launch = function(env) {
102102

103103
var modeEl = document.getElementById("mode");
104104
function setMode() {
105-
env.editor.getDocument().setMode(modes[modeEl.value] || modes.text);
105+
env.editor.getSession().setMode(modes[modeEl.value] || modes.text);
106106
}
107107
modeEl.onchange = setMode;
108108
setMode();
@@ -120,7 +120,7 @@ exports.launch = function(env) {
120120
var docEl = document.getElementById("doc");
121121
function onDocChange() {
122122
var doc = docs[docEl.value];
123-
env.editor.setDocument(doc);
123+
env.editor.setSession(doc);
124124

125125
var mode = doc.getMode();
126126
if (mode instanceof JavaScriptMode) {
@@ -240,7 +240,7 @@ exports.launch = function(env) {
240240
env.editor.onTextInput(reader.result);
241241

242242
modeEl.value = mode;
243-
env.editor.getDocument().setMode(modes[mode]);
243+
env.editor.getSession().setMode(modes[mode]);
244244
};
245245
reader.readAsText(file);
246246
}

lib/ace/edit_session.js

+4
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ var EditSession = function(text, mode) {
7777
doc.on("change", this.onChange.bind(this));
7878
};
7979

80+
this.getDocument = function() {
81+
return this.doc;
82+
};
83+
8084
this.onChange = function(e) {
8185
var delta = e.data;
8286
this.$modified = true;

0 commit comments

Comments
 (0)