Fixed editor changes will cause syncScrollToView

This commit is contained in:
Cheng-Han, Wu 2016-04-20 16:16:07 +08:00
parent 85078fd328
commit 3718238277
2 changed files with 5 additions and 6 deletions

View file

@ -2139,10 +2139,6 @@ editor.on('paste', function() {
});
editor.on('changes', function (cm, changes) {
updateHistory();
preventSyncScroll = true;
var scrollInfo = editor.getScrollInfo();
editor.scrollTo(null, scrollInfo.top - 1);
editor.scrollTo(null, scrollInfo.top);
var docLength = editor.getValue().length;
//workaround for big documents
var newViewportMargin = 20;

View file

@ -115,8 +115,11 @@ var viewScrollingDelay = 200;
var viewScrollingTimer = null;
//editor.on('scroll', _.throttle(syncScrollToView, editorScrollThrottle));
editor.on('scroll', syncScrollToView);
ui.area.codemirrorScroll.on('scroll', syncScrollToView);
if (editor.getOption('scrollbarStyle') === 'native') {
ui.area.codemirrorScroll.on('scroll', syncScrollToView);
} else {
editor.on('scroll', syncScrollToView);
}
ui.area.view.on('scroll', function () {
viewScrolling = true;
clearTimeout(viewScrollingTimer);