caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed weird behavior in scroll link extension

Browse Source
This commit is contained in:
benweet 2014-03-19 23:06:17 +00:00
parent d445ccfec8
commit 3f8d96eb48
1 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/res/extensions/scrollLink.js
View File

@ -183,8 +183,8 @@ define([
lastPreviewScrollTop = previewScrollTop; lastPreviewScrollTop = previewScrollTop;
return; return;
} }
$previewElt.stop('scrollLinkFx', true).animate({ scrollingHelper.stop('scrollLinkFx', true).css('value', 0).animate({
scrollTop: destScrollTop value: destScrollTop - previewScrollTop
}, { }, {
easing: 'easeOutSine', easing: 'easeOutSine',
duration: 200, duration: 200,
@ -192,11 +192,12 @@ define([
step: function(now) { step: function(now) {
isPreviewMoving = true; isPreviewMoving = true;
lastPreviewScrollTop = previewScrollTop + now; lastPreviewScrollTop = previewScrollTop + now;
$previewElt.scrollTop(lastPreviewScrollTop);
}, },
done: function() { done: function() {
setTimeout(function() { _.defer(function() {
isPreviewMoving = false; isPreviewMoving = false;
}, 100); });
}, },
}).dequeue('scrollLinkFx'); }).dequeue('scrollLinkFx');
} }
@ -227,25 +228,6 @@ define([
lastEditorScrollTop = editorScrollTop; lastEditorScrollTop = editorScrollTop;
return; return;
} }
if(window.lightMode) {
$textareaElt.stop('scrollLinkFx', true).animate({
scrollTop: destScrollTop
}, {
easing: 'easeOutSine',
duration: 200,
queue: 'scrollLinkFx',
step: function(now) {
isEditorMoving = true;
lastEditorScrollTop = editorScrollTop + now;
},
done: function() {
setTimeout(function() {
isEditorMoving = false;
}, 100);
},
}).dequeue('scrollLinkFx');
}
else {
scrollingHelper.stop('scrollLinkFx', true).css('value', 0).animate({ scrollingHelper.stop('scrollLinkFx', true).css('value', 0).animate({
value: destScrollTop - editorScrollTop value: destScrollTop - editorScrollTop
}, { }, {
@ -255,7 +237,8 @@ define([
step: function(now) { step: function(now) {
isEditorMoving = true; isEditorMoving = true;
lastEditorScrollTop = editorScrollTop + now; lastEditorScrollTop = editorScrollTop + now;
aceEditor.session.setScrollTop(lastEditorScrollTop); window.lightMode || aceEditor.session.setScrollTop(lastEditorScrollTop);
window.lightMode && $textareaElt.scrollTop(lastEditorScrollTop);
}, },
done: function() { done: function() {
_.defer(function() { _.defer(function() {
@ -264,7 +247,6 @@ define([
}, },
}).dequeue('scrollLinkFx'); }).dequeue('scrollLinkFx');
} }
}
}, 100); }, 100);
scrollLink.onLayoutResize = function() { scrollLink.onLayoutResize = function() {