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

Merge branch 'master' of github.com:ajaxorg/ace

Browse source
This commit is contained in:
Eddy Bruel 2011-02-15 13:17:47 +01:00
commit 695a2420a6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ace/editor.js
View file

@ -219,9 +219,9 @@ var Editor =function(renderer, session) {
} }
this.$highlightBrackets = function() { this.$highlightBrackets = function() {
if (this.$bracketHighlight) { if (this.session.$bracketHighlight) {
this.session.removeMarker(this.$bracketHighlight); this.session.removeMarker(this.session.$bracketHighlight);
this.$bracketHighlight = null; this.session.$bracketHighlight = null;
} }
if (this.$highlightPending) { if (this.$highlightPending) {
@ -237,7 +237,7 @@ var Editor =function(renderer, session) {
var pos = self.session.findMatchingBracket(self.getCursorPosition()); var pos = self.session.findMatchingBracket(self.getCursorPosition());
if (pos) { if (pos) {
var range = new Range(pos.row, pos.column, pos.row, pos.column+1); var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
self.$bracketHighlight = self.session.addMarker(range, "ace_bracket"); self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket");
} }
}, 10); }, 10);
}; };

2
lib/ace/worker/mirror.js
View file

@ -14,7 +14,7 @@ var Mirror = exports.Mirror = function(sender) {
sender.on("change", function(e) { sender.on("change", function(e) {
doc.applyDeltas([e.data]); doc.applyDeltas([e.data]);
deferredUpdate.schedule(_self.$timeout); deferredUpdate.schedule(_self.$timeout);
}) });
}; };
(function() { (function() {