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

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

View file

@ -219,9 +219,9 @@ var Editor =function(renderer, session) {
}
this.$highlightBrackets = function() {
if (this.$bracketHighlight) {
this.session.removeMarker(this.$bracketHighlight);
this.$bracketHighlight = null;
if (this.session.$bracketHighlight) {
this.session.removeMarker(this.session.$bracketHighlight);
this.session.$bracketHighlight = null;
}
if (this.$highlightPending) {
@ -237,7 +237,7 @@ var Editor =function(renderer, session) {
var pos = self.session.findMatchingBracket(self.getCursorPosition());
if (pos) {
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);
};

View file

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