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

Merge pull request #1395 from ajaxorg/fix/searchAll

Browse source 
Fix for replaceAll in a range. Fix for no session ace
This commit is contained in:
Harutyun Amirjanyan 2013-04-25 03:07:30 -07:00
commit ce9adfe4ee
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ace/search.js
View file

@ -177,7 +177,12 @@ var Search = function() {
while (i < j && ranges[j].end.column > endColumn && ranges[j].end.row == range.end.row) while (i < j && ranges[j].end.column > endColumn && ranges[j].end.row == range.end.row)
j--; j--;
return ranges.slice(i, j + 1);
ranges = ranges.slice(i, j + 1);
for (i = 0, j = ranges.length; i < j; i++) {
ranges[i].start.row += range.start.row;
ranges[i].end.row += range.start.row;
}
} }
return ranges; return ranges;

4
lib/ace/virtual_renderer.js
View file

@ -297,7 +297,7 @@ var VirtualRenderer = function(container, theme) {
changes = this.CHANGE_SIZE; changes = this.CHANGE_SIZE;
size.scrollerHeight = this.scroller.clientHeight; size.scrollerHeight = this.scroller.clientHeight;
if (!size.scrollerHeight) { if (force || !size.scrollerHeight) {
size.scrollerHeight = size.height; size.scrollerHeight = size.height;
if (this.$horizScroll) if (this.$horizScroll)
size.scrollerHeight -= this.scrollBar.getWidth(); size.scrollerHeight -= this.scrollBar.getWidth();
@ -322,7 +322,7 @@ var VirtualRenderer = function(container, theme) {
size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth()); size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth());
this.scroller.style.right = this.scrollBar.getWidth() + "px"; this.scroller.style.right = this.scrollBar.getWidth() + "px";
if (this.session.getUseWrapMode() && this.adjustWrapLimit() || force) if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
changes = changes | this.CHANGE_FULL; changes = changes | this.CHANGE_FULL;
} }