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

use _emit iso _dispatchEvent

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-19 12:03:57 +01:00
commit d2a783f824
13 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/anchor.js
View file

@ -155,7 +155,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
this.row = pos.row; this.row = pos.row;
this.column = pos.column; this.column = pos.column;
this._dispatchEvent("change", { this._emit("change", {
old: old, old: old,
value: pos value: pos
}); });

2
lib/ace/background_tokenizer.js
View file

@ -100,7 +100,7 @@ var BackgroundTokenizer = function(tokenizer, editor) {
first: firstRow, first: firstRow,
last: lastRow last: lastRow
}; };
this._dispatchEvent("update", {data: data}); this._emit("update", {data: data});
}; };
this.start = function(startRow) { this.start = function(startRow) {

12
lib/ace/document.js
View file

@ -207,7 +207,7 @@ var Document = function(text) {
range: range, range: range,
lines: lines lines: lines
}; };
this._dispatchEvent("change", { data: delta }); this._emit("change", { data: delta });
return range.end; return range.end;
}; };
@ -228,7 +228,7 @@ var Document = function(text) {
range: Range.fromPoints(position, end), range: Range.fromPoints(position, end),
text: this.getNewLineCharacter() text: this.getNewLineCharacter()
}; };
this._dispatchEvent("change", { data: delta }); this._emit("change", { data: delta });
return end; return end;
}; };
@ -252,7 +252,7 @@ var Document = function(text) {
range: Range.fromPoints(position, end), range: Range.fromPoints(position, end),
text: text text: text
}; };
this._dispatchEvent("change", { data: delta }); this._emit("change", { data: delta });
return end; return end;
}; };
@ -304,7 +304,7 @@ var Document = function(text) {
range: range, range: range,
text: removed text: removed
}; };
this._dispatchEvent("change", { data: delta }); this._emit("change", { data: delta });
return range.start; return range.start;
}; };
@ -325,7 +325,7 @@ var Document = function(text) {
nl: this.getNewLineCharacter(), nl: this.getNewLineCharacter(),
lines: removed lines: removed
}; };
this._dispatchEvent("change", { data: delta }); this._emit("change", { data: delta });
return removed; return removed;
}; };
@ -343,7 +343,7 @@ var Document = function(text) {
range: range, range: range,
text: this.getNewLineCharacter() text: this.getNewLineCharacter()
}; };
this._dispatchEvent("change", { data: delta }); this._emit("change", { data: delta });
}; };
this.replace = function(range, text) { this.replace = function(range, text) {

38
lib/ace/edit_session.js
View file

@ -142,7 +142,7 @@ var EditSession = function(text, mode) {
} }
this.bgTokenizer.start(delta.range.start.row); this.bgTokenizer.start(delta.range.start.row);
this._dispatchEvent("change", e); this._emit("change", e);
}; };
this.setValue = function(text) { this.setValue = function(text) {
@ -275,7 +275,7 @@ var EditSession = function(text, mode) {
this.$modified = true; this.$modified = true;
this.$tabSize = tabSize; this.$tabSize = tabSize;
this._dispatchEvent("changeTabSize"); this._emit("changeTabSize");
}; };
this.getTabSize = function() { this.getTabSize = function() {
@ -291,7 +291,7 @@ var EditSession = function(text, mode) {
if (this.$overwrite == overwrite) return; if (this.$overwrite == overwrite) return;
this.$overwrite = overwrite; this.$overwrite = overwrite;
this._dispatchEvent("changeOverwrite"); this._emit("changeOverwrite");
}; };
this.getOverwrite = function() { this.getOverwrite = function() {
@ -311,22 +311,22 @@ var EditSession = function(text, mode) {
for (var i=0; i<rows.length; i++) { for (var i=0; i<rows.length; i++) {
this.$breakpoints[rows[i]] = true; this.$breakpoints[rows[i]] = true;
} }
this._dispatchEvent("changeBreakpoint", {}); this._emit("changeBreakpoint", {});
}; };
this.clearBreakpoints = function() { this.clearBreakpoints = function() {
this.$breakpoints = []; this.$breakpoints = [];
this._dispatchEvent("changeBreakpoint", {}); this._emit("changeBreakpoint", {});
}; };
this.setBreakpoint = function(row) { this.setBreakpoint = function(row) {
this.$breakpoints[row] = true; this.$breakpoints[row] = true;
this._dispatchEvent("changeBreakpoint", {}); this._emit("changeBreakpoint", {});
}; };
this.clearBreakpoint = function(row) { this.clearBreakpoint = function(row) {
delete this.$breakpoints[row]; delete this.$breakpoints[row];
this._dispatchEvent("changeBreakpoint", {}); this._emit("changeBreakpoint", {});
}; };
this.getBreakpoints = function() { this.getBreakpoints = function() {
@ -346,10 +346,10 @@ var EditSession = function(text, mode) {
if (inFront) { if (inFront) {
this.$frontMarkers[id] = marker; this.$frontMarkers[id] = marker;
this._dispatchEvent("changeFrontMarker") this._emit("changeFrontMarker")
} else { } else {
this.$backMarkers[id] = marker; this.$backMarkers[id] = marker;
this._dispatchEvent("changeBackMarker") this._emit("changeBackMarker")
} }
return id; return id;
@ -363,7 +363,7 @@ var EditSession = function(text, mode) {
var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers; var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers;
if (marker) { if (marker) {
delete (markers[markerId]); delete (markers[markerId]);
this._dispatchEvent(marker.inFront ? "changeFrontMarker" : "changeBackMarker"); this._emit(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
} }
}; };
@ -390,7 +390,7 @@ var EditSession = function(text, mode) {
else else
this.$annotations[row] = [annotation]; this.$annotations[row] = [annotation];
} }
this._dispatchEvent("changeAnnotation", {}); this._emit("changeAnnotation", {});
}; };
this.getAnnotations = function() { this.getAnnotations = function() {
@ -399,7 +399,7 @@ var EditSession = function(text, mode) {
this.clearAnnotations = function() { this.clearAnnotations = function() {
this.$annotations = {}; this.$annotations = {};
this._dispatchEvent("changeAnnotation", {}); this._emit("changeAnnotation", {});
}; };
this.$detectNewLine = function(text) { this.$detectNewLine = function(text) {
@ -480,7 +480,7 @@ var EditSession = function(text, mode) {
this.onReloadTokenizer = function(e) { this.onReloadTokenizer = function(e) {
var rows = e.data; var rows = e.data;
this.bgTokenizer.start(rows.first); this.bgTokenizer.start(rows.first);
this._dispatchEvent("tokenizerUpdate", e); this._emit("tokenizerUpdate", e);
}; };
this.$mode = null; this.$mode = null;
@ -504,7 +504,7 @@ var EditSession = function(text, mode) {
this.bgTokenizer = new BackgroundTokenizer(tokenizer); this.bgTokenizer = new BackgroundTokenizer(tokenizer);
var _self = this; var _self = this;
this.bgTokenizer.addEventListener("update", function(e) { this.bgTokenizer.addEventListener("update", function(e) {
_self._dispatchEvent("tokenizerUpdate", e); _self._emit("tokenizerUpdate", e);
}); });
} else { } else {
this.bgTokenizer.setTokenizer(tokenizer); this.bgTokenizer.setTokenizer(tokenizer);
@ -518,7 +518,7 @@ var EditSession = function(text, mode) {
this.$setFolding(mode.foldingRules); this.$setFolding(mode.foldingRules);
this._dispatchEvent("changeMode"); this._emit("changeMode");
}; };
this.$stopWorker = function() { this.$stopWorker = function() {
@ -551,7 +551,7 @@ var EditSession = function(text, mode) {
if (this.$scrollTop === scrollTopRow) return; if (this.$scrollTop === scrollTopRow) return;
this.$scrollTop = scrollTopRow; this.$scrollTop = scrollTopRow;
this._dispatchEvent("changeScrollTop"); this._emit("changeScrollTop");
}; };
this.getScrollTopRow = function() { this.getScrollTopRow = function() {
@ -920,7 +920,7 @@ var EditSession = function(text, mode) {
this.$updateWrapData(0, len - 1); this.$updateWrapData(0, len - 1);
} }
this._dispatchEvent("changeWrapMode"); this._emit("changeWrapMode");
} }
}; };
@ -938,7 +938,7 @@ var EditSession = function(text, mode) {
this.$wrapLimitRange.max = max; this.$wrapLimitRange.max = max;
this.$modified = true; this.$modified = true;
// This will force a recalculation of the wrap limit // This will force a recalculation of the wrap limit
this._dispatchEvent("changeWrapMode"); this._emit("changeWrapMode");
} }
}; };
@ -952,7 +952,7 @@ var EditSession = function(text, mode) {
if (this.$useWrapMode) { if (this.$useWrapMode) {
this.$updateWrapData(0, this.getLength() - 1); this.$updateWrapData(0, this.getLength() - 1);
this.$resetRowCache(0) this.$resetRowCache(0)
this._dispatchEvent("changeWrapLimit"); this._emit("changeWrapLimit");
} }
return true; return true;
} }

4
lib/ace/edit_session/folding.js
View file

@ -342,7 +342,7 @@ function Folding() {
// Notify that fold data has changed. // Notify that fold data has changed.
this.$modified = true; this.$modified = true;
this._dispatchEvent("changeFold", { data: fold }); this._emit("changeFold", { data: fold });
return fold; return fold;
}; };
@ -400,7 +400,7 @@ function Folding() {
// Notify that fold data has changed. // Notify that fold data has changed.
this.$modified = true; this.$modified = true;
this._dispatchEvent("changeFold", { data: fold }); this._emit("changeFold", { data: fold });
}; };
this.removeFolds = function(folds) { this.removeFolds = function(folds) {

2
lib/ace/layer/text.js
View file

@ -83,7 +83,7 @@ var Text = function(parentEl) {
var size = this.$measureSizes(); var size = this.$measureSizes();
if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) { if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) {
this.$characterSize = size; this.$characterSize = size;
this._dispatchEvent("changeCharaterSize", {data: size}); this._emit("changeCharaterSize", {data: size});
} }
}; };

2
lib/ace/lib/event_emitter_test.js
View file

@ -59,7 +59,7 @@ module.exports = {
assert.equal(e.type, "juhu"); assert.equal(e.type, "juhu");
}); });
emitter._dispatchEvent("juhu"); emitter._emit("juhu");
assert.ok(called); assert.ok(called);
} }
}; };

6
lib/ace/mouse/mouse_handler.js
View file

@ -86,7 +86,7 @@ var MouseHandler = function(editor) {
}; };
this.onMouseEvent = function(name, e) { this.onMouseEvent = function(name, e) {
this.editor._dispatchEvent(name, new MouseEvent(e, this.editor)); this.editor._emit(name, new MouseEvent(e, this.editor));
}; };
this.$dragDelay = 250; this.$dragDelay = 250;
@ -104,7 +104,7 @@ var MouseHandler = function(editor) {
if (!listeners || !listeners.length) if (!listeners || !listeners.length)
return; return;
this.editor._dispatchEvent(name, new MouseEvent(e, this.editor)); this.editor._emit(name, new MouseEvent(e, this.editor));
}; };
this.onMouseWheel = function(name, e) { this.onMouseWheel = function(name, e) {
@ -113,7 +113,7 @@ var MouseHandler = function(editor) {
mouseEvent.wheelX = e.wheelX; mouseEvent.wheelX = e.wheelX;
mouseEvent.wheelY = e.wheelY; mouseEvent.wheelY = e.wheelY;
this.editor._dispatchEvent(name, mouseEvent); this.editor._emit(name, mouseEvent);
}; };
}).call(MouseHandler.prototype); }).call(MouseHandler.prototype);

8
lib/ace/placeholder.js
View file

@ -163,9 +163,9 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
}.bind(this), 0); }.bind(this), 0);
} }
} }
this.pos._dispatchEvent("change", {value: this.pos}); this.pos._emit("change", {value: this.pos});
for (var i = 0; i < this.others.length; i++) { for (var i = 0; i < this.others.length; i++) {
this.others[i]._dispatchEvent("change", {value: this.others[i]}); this.others[i]._emit("change", {value: this.others[i]});
} }
} }
}; };
@ -174,10 +174,10 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
var pos = this.session.selection.getCursor(); var pos = this.session.selection.getCursor();
if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) { if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) {
this.showOtherMarkers(); this.showOtherMarkers();
this._dispatchEvent("cursorEnter", event); this._emit("cursorEnter", event);
} else { } else {
this.hideOtherMarkers(); this.hideOtherMarkers();
this._dispatchEvent("cursorLeave", event); this._emit("cursorLeave", event);
} }
}; };

2
lib/ace/scrollbar.js
View file

@ -67,7 +67,7 @@ var ScrollBar = function(parent) {
oop.implement(this, EventEmitter); oop.implement(this, EventEmitter);
this.onScroll = function() { this.onScroll = function() {
this._dispatchEvent("scroll", {data: this.element.scrollTop}); this._emit("scroll", {data: this.element.scrollTop});
}; };
this.getWidth = function() { this.getWidth = function() {

10
lib/ace/selection.js
View file

@ -60,16 +60,16 @@ var Selection = function(session) {
var _self = this; var _self = this;
this.selectionLead.on("change", function(e) { this.selectionLead.on("change", function(e) {
_self._dispatchEvent("changeCursor"); _self._emit("changeCursor");
if (!_self.$isEmpty) if (!_self.$isEmpty)
_self._dispatchEvent("changeSelection"); _self._emit("changeSelection");
if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column) if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column)
_self.$updateDesiredColumn(); _self.$updateDesiredColumn();
}); });
this.selectionAnchor.on("change", function() { this.selectionAnchor.on("change", function() {
if (!_self.$isEmpty) if (!_self.$isEmpty)
_self._dispatchEvent("changeSelection"); _self._emit("changeSelection");
}); });
}; };
@ -101,7 +101,7 @@ var Selection = function(session) {
if (this.$isEmpty) { if (this.$isEmpty) {
this.$isEmpty = false; this.$isEmpty = false;
this._dispatchEvent("changeSelection"); this._emit("changeSelection");
} }
}; };
@ -161,7 +161,7 @@ var Selection = function(session) {
this.clearSelection = function() { this.clearSelection = function() {
if (!this.$isEmpty) { if (!this.$isEmpty) {
this.$isEmpty = true; this.$isEmpty = true;
this._dispatchEvent("changeSelection"); this._emit("changeSelection");
} }
}; };

8
lib/ace/worker/worker.js
View file

@ -41,7 +41,7 @@ var require = function(parentId, id) {
var chunks = id.split("/"); var chunks = id.split("/");
chunks[0] = require.tlns[chunks[0]] || chunks[0]; chunks[0] = require.tlns[chunks[0]] || chunks[0];
path = chunks.join("/") + ".js"; var path = chunks.join("/") + ".js";
require.id = id; require.id = id;
importScripts(path); importScripts(path);
@ -64,7 +64,7 @@ var define = function(id, deps, factory) {
var req = function(deps, factory) { var req = function(deps, factory) {
return require(id, deps, factory); return require(id, deps, factory);
} };
require.modules[id] = { require.modules[id] = {
factory: function() { factory: function() {
@ -118,7 +118,7 @@ function initSender() {
var main; var main;
var sender; var sender;
onmessage = function(e) { var onmessage = function(e) {
var msg = e.data; var msg = e.data;
if (msg.command) { if (msg.command) {
main[msg.command].apply(main, msg.args); main[msg.command].apply(main, msg.args);
@ -131,6 +131,6 @@ onmessage = function(e) {
main = new clazz(sender); main = new clazz(sender);
} }
else if (msg.event && sender) { else if (msg.event && sender) {
sender._dispatchEvent(msg.event, msg.data); sender._emit(msg.event, msg.data);
} }
}; };

8
lib/ace/worker/worker_client.js
View file

@ -46,11 +46,11 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
if (window.require.packaged) { if (window.require.packaged) {
var base = this.$guessBasePath(); var base = this.$guessBasePath();
var worker = this.$worker = new Worker(base + packagedJs); this.$worker = new Worker(base + packagedJs);
} }
else { else {
var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_")); var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
var worker = this.$worker = new Worker(workerUrl); this.$worker = new Worker(workerUrl);
var tlns = {}; var tlns = {};
for (var i=0; i<topLevelNamespaces.length; i++) { for (var i=0; i<topLevelNamespaces.length; i++) {
@ -84,7 +84,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
break; break;
case "event": case "event":
_self._dispatchEvent(msg.name, {data: msg.data}); _self._emit(msg.name, {data: msg.data});
break; break;
case "call": case "call":
@ -136,7 +136,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
}; };
this.terminate = function() { this.terminate = function() {
this._dispatchEvent("terminate", {}); this._emit("terminate", {});
this.$worker.terminate(); this.$worker.terminate();
this.$worker = null; this.$worker = null;
this.$doc.removeEventListener("change", this.changeListener); this.$doc.removeEventListener("change", this.changeListener);