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

Merge branch 'origin/master' into misc

Browse source 
Conflicts:
	lib/ace/virtual_renderer.js
This commit is contained in:
nightwing 2013-07-30 22:17:38 +04:00
commit 844502fae6
4 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ace/virtual_renderer.js
View file

@ -335,7 +335,7 @@ var VirtualRenderer = function(container, theme) {
// }.bind(this), 500)
if (!this.$size.scrollerHeight)
if (!this.$size.scrollerHeight || (!width && !height))
return this.resizing = 0;
if (force)
@ -344,7 +344,7 @@ var VirtualRenderer = function(container, theme) {
if (force)
this.$renderChanges(changes, true);
else
this.$loop.schedule(changes);
this.$loop.schedule(changes || this.$changes);
if (this.resizing)
this.resizing = 0;
@ -730,14 +730,14 @@ var VirtualRenderer = function(container, theme) {
};
this.$renderChanges = function(changes, force) {
if ((!this.session || !this.container.offsetWidth) || (!changes && !force)) {
this.$changes |= changes;
return;
}
if (this.$changes) {
changes |= this.$changes;
this.$changes = 0;
}
if ((!this.session || !this.container.offsetWidth) || (!changes && !force)) {
this.$changes |= changes;
return;
}
if (!this.$size.width)
return this.onResize(true);