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

This commit is contained in:
Peter Xiao 2013-08-14 15:27:01 -07:00
commit 23f62e015b
10 changed files with 2401 additions and 2109 deletions

View file

@ -81,7 +81,7 @@ var Document = function(text) {
};
/**
* Returns all the lines in the document as a single string, split by the new line character.
* Returns all the lines in the document as a single string, joined by the new line character.
**/
this.getValue = function() {
return this.getAllLines().join(this.getNewLineCharacter());
@ -191,7 +191,7 @@ var Document = function(text) {
};
/**
* Returns all lines in the document as string array. Warning: The caller should not modify this array!
* Returns all lines in the document as string array.
**/
this.getAllLines = function() {
return this.getLines(0, this.getLength());

View file

@ -2370,6 +2370,7 @@ config.defineOptions(Editor.prototype, "editor", {
wrapBehavioursEnabled: {initialValue: true},
hScrollBarAlwaysVisible: "renderer",
vScrollBarAlwaysVisible: "renderer",
highlightGutterLine: "renderer",
animatedScroll: "renderer",
showInvisibles: "renderer",

File diff suppressed because it is too large Load diff

View file

@ -738,9 +738,10 @@ var VirtualRenderer = function(container, theme) {
this.$changes |= changes;
return;
}
if (!this.$size.width)
if (!this.$size.width) {
this.$changes |= changes;
return this.onResize(true);
}
// this.$logChanges(changes);
this._signal("beforeRender");