suzanne.soy/scribble-math
1
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixes scroll position and involuntary mouse interaction.

Browse Source
This commit is contained in:
zorkow 2015-08-31 21:50:27 +01:00
parent 2143219d9b
commit ad8a8704d4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unpacked/extensions/MathMenu.js
View File

@ -341,9 +341,17 @@
} }
menu.style.left = x+"px"; menu.style.top = y+"px"; menu.style.left = x+"px"; menu.style.top = y+"px";
if (document.selection && document.selection.empty) {document.selection.empty()} if (document.selection && document.selection.empty) {document.selection.empty()}
// Focusing while keeping the scroll position.
var oldX = window.pageXOffset || document.documentElement.scrollLeft;
var oldY = window.pageYOffset || document.documentElement.scrollTop;
MENU.Focus(menu); MENU.Focus(menu);
if (event.type === 'keydown') {
MENU.skipMouseoverFromKey = true;
setTimeout(function() {delete MENU.skipMouseoverFromKey;}, CONFIG.delay);
}
window.scrollTo(oldX, oldY);
return FALSE(event); return FALSE(event);
}, },
@ -429,6 +437,10 @@
}, },
Event: function (event,menu,type,force) { Event: function (event,menu,type,force) {
if (MENU.skipMouseover && type === "Mouseover" && !force) {return FALSE(event)} if (MENU.skipMouseover && type === "Mouseover" && !force) {return FALSE(event)}
if (MENU.skipMouseoverFromKey && type === "Mouseover") {
delete MENU.skipMouseoverFromKey;
return FALSE(event);
}
if (MENU.skipUp) { if (MENU.skipUp) {
if (type.match(/Mouseup|Touchend/)) {delete MENU.skipUp; return FALSE(event)} if (type.match(/Mouseup|Touchend/)) {delete MENU.skipUp; return FALSE(event)}
if (type === "Touchstart" || if (type === "Touchstart" ||
@ -797,7 +809,8 @@
}, },
Timer: function (event,menu) { Timer: function (event,menu) {
this.ClearTimer(); this.ClearTimer();
event = {clientX: event.clientX, clientY: event.clientY}; // MSIE can't pass the event below event = {type: event.type,
clientX: event.clientX, clientY: event.clientY}; // MSIE can't pass the event below
this.timer = setTimeout(CALLBACK(["Mouseup",this,event,menu]),CONFIG.delay); this.timer = setTimeout(CALLBACK(["Mouseup",this,event,menu]),CONFIG.delay);
}, },
ClearTimer: function() { ClearTimer: function() {
@ -1115,7 +1128,6 @@
W = Math.max(100,Math.min(Math.floor(.5*screen.width),table.offsetWidth+W+25)); W = Math.max(100,Math.min(Math.floor(.5*screen.width),table.offsetWidth+W+25));
H = Math.max(40,Math.min(Math.floor(.5*screen.height),table.offsetHeight+H+25)); H = Math.max(40,Math.min(Math.floor(.5*screen.height),table.offsetHeight+H+25));
if (MENU.prototype.msieHeightBug) {H += 35}; // for title bar in XP if (MENU.prototype.msieHeightBug) {H += 35}; // for title bar in XP
console.log(W + ' ' + H);
w.resizeTo(W,H); w.resizeTo(W,H);
var X; try {X = event.screenX} catch (e) {}; // IE8 throws an error accessing screenX var X; try {X = event.screenX} catch (e) {}; // IE8 throws an error accessing screenX
if (event && X != null) { if (event && X != null) {