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

src/ace/Document.js

@@ -116,7 +116,7 @@ var Document = function(text, mode) {
 
     this.$tabSize = 4;
     this.setTabSize = function(tabSize) {
-        if (this.$tabSize === tabSize) return;
+        if (isNaN(tabSize) || this.$tabSize === tabSize) return;
 
         this.modified = true;
         this.$tabSize = tabSize;

src/ace/Editor.js

@@ -481,7 +481,7 @@ var Editor = function(renderer, doc) {
     };
 
     this.getReadOnly = function() {
-        return this.readOnly;
+        return this.$readOnly;
     };
 
     this.removeRight = function() {

src/ace/VirtualRenderer.js

@@ -67,6 +67,8 @@ var VirtualRenderer = function(container, theme) {
         column : 0
     };
 
+    this.showInvisibles = false;
+
     var self = this;
     this.$textLayer.addEventListener("changeCharaterSize", function() {
         self.characterWidth = textLayer.getCharacterWidth();

src/ace/layer/Text.js

@@ -123,7 +123,7 @@ var Text = function(parentEl) {
 
             var lineElement = lineElements[i - layerConfig.firstRow];
             lineElement.innerHTML = html.join("");
-        };
+        }
     };
 
     this.scrollLines = function(config) {