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

only fire change events if selection/cursor really changes

Browse source
This commit is contained in:
Fabian Jakobs 2010-04-22 19:02:38 +02:00
commit 39433d0733
4 changed files with 52 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/Selection.js
View file

@ -16,14 +16,6 @@ ace.Selection = function(doc) {
ace.implement(this, ace.MEventEmitter); ace.implement(this, ace.MEventEmitter);
this.updateCursor = function() {
this.$dispatchEvent("changeCursor", { data: this.getCursor() });
};
this.updateSelection = function() {
this.$dispatchEvent("changeSelection", {});
};
this.isEmpty = function() { this.isEmpty = function() {
return (this.selectionAnchor == null); return (this.selectionAnchor == null);
}; };
@ -94,8 +86,10 @@ ace.Selection = function(doc) {
}; };
this.clearSelection = function() { this.clearSelection = function() {
this.selectionAnchor = null; if (this.selectionAnchor) {
this.updateSelection(); this.selectionAnchor = null;
this.$dispatchEvent("changeSelection", {});
}
}; };
@ -109,12 +103,22 @@ ace.Selection = function(doc) {
}; };
this.$moveSelection = function(mover) { this.$moveSelection = function(mover) {
var changed = false;
if (!this.selectionAnchor) { if (!this.selectionAnchor) {
changed = true;
this.selectionAnchor = this.$clone(this.selectionLead); this.selectionAnchor = this.$clone(this.selectionLead);
} }
var cursor = this.$clone(this.selectionLead);
mover.call(this); mover.call(this);
this.updateSelection();
if (cursor.row !== this.selectionLead.row || cursor.column !== this.selectionLead.column) {
changed = true;
}
if (changed)
this.$dispatchEvent("changeSelection", {});
}; };
this.selectTo = function(row, column) { this.selectTo = function(row, column) {
@ -349,8 +353,12 @@ ace.Selection = function(doc) {
}; };
this.moveCursorTo = function(row, column) { this.moveCursorTo = function(row, column) {
this.selectionLead = this.$clipPositionToDocument(row, column); var cursor = this.$clipPositionToDocument(row, column);
this.updateCursor();
if (cursor.row !== this.selectionLead.row || cursor.column !== this.selectionLead.column) {
this.selectionLead = cursor;
this.$dispatchEvent("changeCursor", { data: this.getCursor() });
}
}; };
this.moveCursorUp = function() { this.moveCursorUp = function() {

0
test/TextDocumentTest.js → test/DocumentTest.js
View file

2
test/NavigationTest.js
View file

@ -21,7 +21,7 @@ var NavigationTest = TestCase("NavigationTest",
var doc = this.createTextDocument(200, 10); var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc); var editor = new ace.Editor(new MockRenderer(), doc);
editor.scrollToRow(editor.getLastVisibleRow() + 20); editor.moveCursorTo(editor.getLastVisibleRow() + 20);
editor.navigateFileStart(); editor.navigateFileStart();
assertEquals(0, editor.getFirstVisibleRow()); assertEquals(0, editor.getFirstVisibleRow());

30
test/SelectionTest.js
View file

@ -216,5 +216,35 @@ var SelectionTest = TestCase("SelectionTest",
var range = selection.getRange(); var range = selection.getRange();
assertPosition(0, 4, range.start); assertPosition(0, 4, range.start);
assertPosition(0, 6, range.end); assertPosition(0, 6, range.end);
},
"test: moving cursor should fire a 'changeCursor' event" : function() {
var doc = new ace.Document("Juhu Kinners");
var selection = doc.getSelection();
selection.moveCursorTo(0, 5);
var called = false;
selection.addEventListener("changeCursor", function() {
called = true;
});
selection.moveCursorTo(0, 6);
assertTrue(called);
},
"test: calling setCursor with the same position should not fire an event": function() {
var doc = new ace.Document("Juhu Kinners");
var selection = doc.getSelection();
selection.moveCursorTo(0, 5);
var called = false;
selection.addEventListener("changeCursor", function() {
called = true;
});
selection.moveCursorTo(0, 5);
assertFalse(called);
} }
}); });