dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed context menu bug in FF, #415

Browse Source
This commit is contained in:
Exodus4D
2017-01-25 19:26:05 +01:00
parent e0406ae98a
commit 1bc652d711
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
js/app/map/contextmenu.js
View File

@@ -52,12 +52,26 @@ define([
}).velocity(animationInType, {
duration: animationInDuration,
complete: function(){
// set context menu "click" observer
// Firefox has a "nested" originalEvent ?! -> #415
let posX = 0;
let posY = 0;
if(
originalEvent.offsetX &&
originalEvent.offsetY
){
// Chrome
posX = originalEvent.offsetX;
posY = originalEvent.offsetY ;
}else if(originalEvent.originalEvent){
// Firefox -> #415
posX = originalEvent.originalEvent.layerX;
posY = originalEvent.originalEvent.layerY ;
}
let position = {
x: originalEvent.offsetX || originalEvent.originalEvent.layerX,
y: originalEvent.offsetY || originalEvent.originalEvent.layerY
x: posX,
y: posY
};
$(this).off('click').one('click', {component: component, position: position}, function (e) {

22
public/js/v1.2.0/app/map/contextmenu.js
View File

@@ -52,12 +52,26 @@ define([
}).velocity(animationInType, {
duration: animationInDuration,
complete: function(){
// set context menu "click" observer
// Firefox has a "nested" originalEvent ?! -> #415
let posX = 0;
let posY = 0;
if(
originalEvent.offsetX &&
originalEvent.offsetY
){
// Chrome
posX = originalEvent.offsetX;
posY = originalEvent.offsetY ;
}else if(originalEvent.originalEvent){
// Firefox -> #415
posX = originalEvent.originalEvent.layerX;
posY = originalEvent.originalEvent.layerY ;
}
let position = {
x: originalEvent.offsetX || originalEvent.originalEvent.layerX,
y: originalEvent.offsetY || originalEvent.originalEvent.layerY
x: posX,
y: posY
};
$(this).off('click').one('click', {component: component, position: position}, function (e) {