web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maintain scroll position on remote changes

Browse Source
This commit is contained in:
ansuz
2016-07-22 11:57:04 +02:00
parent c267dd6a88
commit 70f8837681
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/code/main.js
View File

@@ -453,6 +453,7 @@ define([
var onRemote = config.onRemote = function (info) { var onRemote = config.onRemote = function (info) {
if (initializing) { return; } if (initializing) { return; }
var scroll = editor.getScrollInfo();
var oldDoc = canonicalize($textarea.val()); var oldDoc = canonicalize($textarea.val());
var shjson = module.realtime.getUserDoc(); var shjson = module.realtime.getUserDoc();
@@ -475,6 +476,7 @@ define([
var selects = ['selectionStart', 'selectionEnd'].map(function (attr) { var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
return TextPatcher.transformCursor(oldCursor[attr], op); return TextPatcher.transformCursor(oldCursor[attr], op);
}); });
if(selects[0] === selects[1]) { if(selects[0] === selects[1]) {
editor.setCursor(posToCursor(selects[0], remoteDoc)); editor.setCursor(posToCursor(selects[0], remoteDoc));
} }
@@ -482,6 +484,8 @@ define([
editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc)); editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
} }
editor.scrollTo(scroll.left, scroll.top);
var localDoc = canonicalize($textarea.val()); var localDoc = canonicalize($textarea.val());
var hjson2 = { var hjson2 = {
content: localDoc, content: localDoc,