depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert 85e00cb2ef, it's needed for checking if cursor related element reach the viewport edge

Browse source
This commit is contained in:
Cheng-Han, Wu 2016-06-17 15:55:27 +08:00
parent fb87de74a5
commit 30c8420e30
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
public/js/index.js
View file

@ -2279,6 +2279,8 @@ function checkCursorTag(coord, ele) {
// get coord position // get coord position
var left = coord.left; var left = coord.left;
var top = coord.top; var top = coord.top;
// get doc top offset (to workaround with viewport)
var docTopOffset = ui.area.codemirrorSizerInner.position().top;
// set offset // set offset
var offsetLeft = -3; var offsetLeft = -3;
var offsetTop = defaultTextHeight; var offsetTop = defaultTextHeight;
@ -2290,7 +2292,7 @@ function checkCursorTag(coord, ele) {
} }
// flip y when element bottom bound larger than doc height // flip y when element bottom bound larger than doc height
// and element top position is larger than element height // and element top position is larger than element height
if (top + height + offsetTop + tagBottomMargin > Math.max(editor.doc.height, editorHeight) && top > height + tagBottomMargin) { if (top + docTopOffset + height + offsetTop + tagBottomMargin > Math.max(editor.doc.height, editorHeight) && top + docTopOffset > height + tagBottomMargin) {
offsetTop = -(height); offsetTop = -(height);
} }
} }
@ -2876,6 +2878,8 @@ function checkCursorMenuInner() {
}, 'windows'); }, 'windows');
var left = coord.left; var left = coord.left;
var top = coord.top; var top = coord.top;
// get doc top offset (to workaround with viewport)
var docTopOffset = ui.area.codemirrorSizerInner.position().top;
// set offset // set offset
var offsetLeft = 0; var offsetLeft = 0;
var offsetTop = defaultTextHeight; var offsetTop = defaultTextHeight;
@ -2886,7 +2890,7 @@ function checkCursorMenuInner() {
offsetLeft = -(left + width - docWidth + menuRightMargin); offsetLeft = -(left + width - docWidth + menuRightMargin);
// flip y when element bottom bound larger than doc height // flip y when element bottom bound larger than doc height
// and element top position is larger than element height // and element top position is larger than element height
if (top + height + offsetTop + menuBottomMargin > Math.max(editor.doc.height, editorHeight) && top > height + menuBottomMargin) { if (top + docTopOffset + height + offsetTop + menuBottomMargin > Math.max(editor.doc.height, editorHeight) && top + docTopOffset > height + menuBottomMargin) {
offsetTop = -(height + menuBottomMargin); offsetTop = -(height + menuBottomMargin);
// reverse sort menu because upSideDown // reverse sort menu because upSideDown
dropdown.html(reverseSortCursorMenu(dropdown)); dropdown.html(reverseSortCursorMenu(dropdown));