mirror of https://github.com/status-im/codimd.git
Update and fix editor might not sync scrolling from edit mode to both mode
This commit is contained in:
parent
e9b0ce8e04
commit
d90acf88e3
|
@ -721,15 +721,17 @@ function windowResizeInner(callback) {
|
|||
//refresh editor
|
||||
if (loaded) {
|
||||
if (editor.getOption('scrollbarStyle') === 'native') {
|
||||
clearMap();
|
||||
if (editorHasFocus()) {
|
||||
syncScrollToView();
|
||||
} else {
|
||||
syncScrollToEdit();
|
||||
}
|
||||
updateScrollspy();
|
||||
if (callback && typeof callback === 'function')
|
||||
callback();
|
||||
setTimeout(function () {
|
||||
clearMap();
|
||||
if (editorHasFocus()) {
|
||||
syncScrollToView();
|
||||
} else {
|
||||
syncScrollToEdit();
|
||||
}
|
||||
updateScrollspy();
|
||||
if (callback && typeof callback === 'function')
|
||||
callback();
|
||||
}, 1);
|
||||
} else {
|
||||
// force it load all docs at once to prevent scroll knob blink
|
||||
editor.setOption('viewportMargin', Infinity);
|
||||
|
@ -1030,6 +1032,11 @@ function changeMode(type) {
|
|||
preventSyncScrollToEdit = 2;
|
||||
syncScrollToView();
|
||||
}
|
||||
|
||||
if (lastMode == modeType.both && currentMode != modeType.both) {
|
||||
preventSyncScrollToView = false;
|
||||
preventSyncScrollToEdit = false;
|
||||
}
|
||||
|
||||
if (lastMode != modeType.edit && currentMode == modeType.edit) {
|
||||
editor.refresh();
|
||||
|
|
|
@ -120,11 +120,7 @@ var viewScrollingDebounce = 200;
|
|||
var editScrolling = false;
|
||||
var editScrollingDebounce = 200;
|
||||
|
||||
if (editor.getOption('scrollbarStyle') === 'native') {
|
||||
ui.area.codemirrorScroll.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
|
||||
} else {
|
||||
editor.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
|
||||
}
|
||||
ui.area.codemirrorScroll.on('scroll', _.throttle(syncScrollToView, editScrollThrottle));
|
||||
ui.area.view.on('scroll', _.throttle(syncScrollToEdit, viewScrollThrottle));
|
||||
|
||||
var scrollMap, lineHeightMap, viewTop, viewBottom;
|
||||
|
|
Loading…
Reference in New Issue