From 7dd60738c1b8ad445cbcc809607737b3c6b222ba Mon Sep 17 00:00:00 2001 From: Deathamns Date: Mon, 16 Feb 2015 18:17:26 +0100 Subject: [PATCH] Save mouse position only in top document ... for the element picker. This way, right click/block element in an iframe won't select the wrong element in the top document. Instead, it will allow the user to pick the element manually. --- src/js/contentscript-end.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/contentscript-end.js b/src/js/contentscript-end.js index 8d3180c11..d60ead379 100644 --- a/src/js/contentscript-end.js +++ b/src/js/contentscript-end.js @@ -127,7 +127,7 @@ var messager = vAPI.messaging.channel('contentscript-end.js'); }; // https://github.com/gorhill/uBlock/issues/452 - // This needs to be executed *after* the response from our query is + // This needs to be executed *after* the response from our query is // received, not at `DOMContentLoaded` time, or else there is a good // likeliness to outrun contentscript-start.js, which may still be waiting // on a response from its own query. @@ -749,6 +749,9 @@ var messager = vAPI.messaging.channel('contentscript-end.js'); // Ref.: https://developer.mozilla.org/en-US/docs/Web/Events/contextmenu (function() { + if ( window !== window.top ) { + return; + } var onContextMenu = function(ev) { messager.send({ what: 'contextMenuEvent',