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

Merge remote branch 'origin/master'

Browse source 
Conflicts:
	lib/ace/editor.js
	lib/ace/test/change_document_test.js
	lib/ace/test/event_emitter_test.js
	lib/ace/test/text_edit_test.js
	lib/ace/test/virtual_renderer_test.js
This commit is contained in:
Joe Walker 2010-12-02 11:21:09 +00:00
commit 864eb77d4d
5 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/editor.js
View file

@ -965,8 +965,8 @@ var Editor =function(renderer, doc) {
if (!ranges.length) if (!ranges.length)
return; return;
this.clearSelection(); this.clearSelection();
this.selection.moveCursorTo(0, 0); this.selection.moveCursorTo(0, 0);
for (var i = ranges.length - 1; i >= 0; --i) for (var i = ranges.length - 1; i >= 0; --i)
this.$tryReplace(ranges[i], replacement); this.$tryReplace(ranges[i], replacement);

1
lib/ace/test/event_emitter_test.js
View file

@ -41,7 +41,6 @@ var oop = require("../lib/oop");
MEventEmitter = require("../event_emitter"), MEventEmitter = require("../event_emitter"),
assert = require("./assertions"); assert = require("./assertions");
var EventEmitter = function() {}; var EventEmitter = function() {};
oop.implement(EventEmitter.prototype, EventEmitter); oop.implement(EventEmitter.prototype, EventEmitter);

2
lib/ace/test/text_edit_test.js
View file

@ -48,7 +48,7 @@ global.location = browser.location;
var Document = require("../document"), var Document = require("../document"),
Editor = require("../editor"), Editor = require("../editor"),
JavaScriptMode = require("../mode/javascript"), JavaScriptMode = require("../mode/javascript").JavaScript,
MockRenderer = require("./mockrenderer"), MockRenderer = require("./mockrenderer"),
assert = require("./assertions"); assert = require("./assertions");

1
lib/ace/test/virtual_renderer_test.js
View file

@ -35,7 +35,6 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
require("../../../support/paths"); require("../../../support/paths");
var Document = "../document", var Document = "../document",

4
lib/ace/virtual_renderer.js
View file

@ -373,10 +373,6 @@ var VirtualRenderer = function(container, theme) {
else if (changes & this.CHANGE_LINES) { else if (changes & this.CHANGE_LINES) {
this.$updateLines(); this.$updateLines();
this.$updateScrollBar(); this.$updateScrollBar();
}
else if (changes & this.CHANGE_SCROLL) {
this.$textLayer.scrollLines(this.layerConfig);
this.showGutter && this.$gutterLayer.update(this.layerConfig);
} if (changes & this.CHANGE_GUTTER) { } if (changes & this.CHANGE_GUTTER) {
this.showGutter && this.$gutterLayer.update(this.layerConfig); this.showGutter && this.$gutterLayer.update(this.layerConfig);
} }