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

more scrolling fixes

Browse source
This commit is contained in:
Fabian Jakobs 2012-04-12 16:40:58 +02:00
commit 24eccde63e
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/ace/editor.js
View file

@ -611,7 +611,7 @@ var Editor = function(renderer, session) {
}; };
this.getAnimatedScroll = function(){ this.getAnimatedScroll = function(){
this.renderer.getAnimatedScroll(); return this.renderer.getAnimatedScroll();
}; };
this.setShowInvisibles = function(showInvisibles) { this.setShowInvisibles = function(showInvisibles) {
@ -1243,15 +1243,18 @@ var Editor = function(renderer, session) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
var cursor = this.getCursorPosition(); if (this.getAnimatedScroll()) {
if (!this.isRowFullyVisible(cursor.row)) var cursor = this.getCursorPosition();
this.scrollToLine(cursor.row, true); if (!this.isRowFullyVisible(cursor.row))
this.scrollToLine(cursor.row, true);
//@todo scroll X //@todo scroll X
//if (!this.isRowFullyVisible(cursor.row)) //if (!this.isColumnFullyVisible(cursor.column))
//this.scrollToLine(cursor.row, true); //this.scrollToRow(cursor.column);
}
this.renderer.scrollSelectionIntoView(range.start, range.end); else {
this.renderer.scrollSelectionIntoView(range.start, range.end);
}
} }
}; };

2
lib/ace/virtual_renderer.js
View file

@ -287,7 +287,7 @@ var VirtualRenderer = function(container, theme) {
this.$animatedScroll = shouldAnimate; this.$animatedScroll = shouldAnimate;
}; };
this.getAnimatedScroll = function(){ this.getAnimatedScroll = function() {
return this.$animatedScroll; return this.$animatedScroll;
}; };