Update and fix editor might not sync scrolling from edit mode to both mode
This commit is contained in:
parent
e9b0ce8e04
commit
d90acf88e3
2 changed files with 17 additions and 14 deletions
|
@ -721,6 +721,7 @@ function windowResizeInner(callback) {
|
||||||
//refresh editor
|
//refresh editor
|
||||||
if (loaded) {
|
if (loaded) {
|
||||||
if (editor.getOption('scrollbarStyle') === 'native') {
|
if (editor.getOption('scrollbarStyle') === 'native') {
|
||||||
|
setTimeout(function () {
|
||||||
clearMap();
|
clearMap();
|
||||||
if (editorHasFocus()) {
|
if (editorHasFocus()) {
|
||||||
syncScrollToView();
|
syncScrollToView();
|
||||||
|
@ -730,6 +731,7 @@ function windowResizeInner(callback) {
|
||||||
updateScrollspy();
|
updateScrollspy();
|
||||||
if (callback && typeof callback === 'function')
|
if (callback && typeof callback === 'function')
|
||||||
callback();
|
callback();
|
||||||
|
}, 1);
|
||||||
} else {
|
} else {
|
||||||
// force it load all docs at once to prevent scroll knob blink
|
// force it load all docs at once to prevent scroll knob blink
|
||||||
editor.setOption('viewportMargin', Infinity);
|
editor.setOption('viewportMargin', Infinity);
|
||||||
|
@ -1031,6 +1033,11 @@ function changeMode(type) {
|
||||||
syncScrollToView();
|
syncScrollToView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (lastMode == modeType.both && currentMode != modeType.both) {
|
||||||
|
preventSyncScrollToView = false;
|
||||||
|
preventSyncScrollToEdit = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (lastMode != modeType.edit && currentMode == modeType.edit) {
|
if (lastMode != modeType.edit && currentMode == modeType.edit) {
|
||||||
editor.refresh();
|
editor.refresh();
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,11 +120,7 @@ var viewScrollingDebounce = 200;
|
||||||
var editScrolling = false;
|
var editScrolling = false;
|
||||||
var editScrollingDebounce = 200;
|
var editScrollingDebounce = 200;
|
||||||
|
|
||||||
if (editor.getOption('scrollbarStyle') === 'native') {
|
|
||||||
ui.area.codemirrorScroll.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
|
ui.area.codemirrorScroll.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
|
||||||
} else {
|
|
||||||
editor.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
|
|
||||||
}
|
|
||||||
ui.area.view.on('scroll', _.throttle(syncScrollToEdit, viewScrollThrottle));
|
ui.area.view.on('scroll', _.throttle(syncScrollToEdit, viewScrollThrottle));
|
||||||
|
|
||||||
var scrollMap, lineHeightMap, viewTop, viewBottom;
|
var scrollMap, lineHeightMap, viewTop, viewBottom;
|
||||||
|
|
Loading…
Reference in a new issue