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

daleharvey · Feb 15, 2011 · 695a242 · 695a242
2 parents 7ce9cee + ba244bc
commit 695a242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
@@ -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);
     };

diff --git a/lib/ace/worker/mirror.js b/lib/ace/worker/mirror.js
@@ -14,7 +14,7 @@ var Mirror = exports.Mirror = function(sender) {
     sender.on("change", function(e) {
         doc.applyDeltas([e.data]);        
         deferredUpdate.schedule(_self.$timeout);
-    })
+    });
 };
 
 (function() {