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

simplify animateScroll a little

Browse source
This commit is contained in:
nightwing 2012-04-26 10:27:02 +04:00
commit fb2be29d5e
2 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/ace/editor.js
View file

@ -979,11 +979,13 @@ var Editor = function(renderer, session) {
} }
this.$blockScrolling--; this.$blockScrolling--;
this.renderer.animateScrolling(function() { var scrollTop = renderer.scrollTop;
renderer.scrollBy(0, rows * config.lineHeight);
if (select != null) renderer.scrollBy(0, rows * config.lineHeight);
renderer.scrollCursorIntoView(null, 0.5); if (select != null)
}, this); renderer.scrollCursorIntoView(null, 0.5);
renderer.animateScrolling(scrollTop);
}; };
this.selectPageDown = function() { this.selectPageDown = function() {
@ -1141,17 +1143,17 @@ var Editor = function(renderer, session) {
}; };
this.navigateFileEnd = function() { this.navigateFileEnd = function() {
this.renderer.animateScrolling(function() { var scrollTop = this.renderer.scrollTop;
this.selection.moveCursorFileEnd(); this.selection.moveCursorFileEnd();
this.clearSelection(); this.clearSelection();
}, this); this.renderer.animateScrolling(scrollTop);
}; };
this.navigateFileStart = function() { this.navigateFileStart = function() {
this.renderer.animateScrolling(function() { var scrollTop = this.renderer.scrollTop;
this.selection.moveCursorFileStart(); this.selection.moveCursorFileStart();
this.clearSelection(); this.clearSelection();
}, this); this.renderer.animateScrolling(scrollTop);
}; };
this.navigateWordRight = function() { this.navigateWordRight = function() {
@ -1261,9 +1263,9 @@ var Editor = function(renderer, session) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
this.renderer.animateScrolling(function() { var scrollTop = this.renderer.scrollTop;
this.renderer.scrollSelectionIntoView(range.start, range.end, 0.5); this.renderer.scrollSelectionIntoView(range.start, range.end, 0.5);
}, this); this.renderer.animateScrolling(scrollTop);
} }
}; };

15
lib/ace/virtual_renderer.js
View file

@ -757,18 +757,13 @@ var VirtualRenderer = function(container, theme) {
if (center) if (center)
offset -= this.$size.scrollerHeight / 2; offset -= this.$size.scrollerHeight / 2;
if (animate !== false) { var initialScroll = this.scrollTop;
this.animateScrolling(function() { this.session.setScrollTop(offset);
this.session.setScrollTop(offset); if (animate !== false)
}, this, callback); this.animateScrolling(initialScroll, callback);
} else {
this.session.setScrollTop(offset);
}
}; };
this.animateScrolling = function(scrollFunc, self, callback) { this.animateScrolling = function(fromValue, callback) {
var fromValue = this.scrollTop;
scrollFunc.call(self);
var toValue = this.scrollTop; var toValue = this.scrollTop;
if (this.$animatedScroll && Math.abs(fromValue - toValue) < 100000) { if (this.$animatedScroll && Math.abs(fromValue - toValue) < 100000) {
var _self = this; var _self = this;