external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-11 17:41:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

this fixes #810

Browse source
This commit is contained in:
gorhill 2015-03-09 10:11:22 -04:00
parent ba689f7929
commit 1525a828c1
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/js/element-picker.js
View file

@ -135,6 +135,7 @@ var localMessager = vAPI.messaging.channel('element-picker.js');
var svgOcean = null; var svgOcean = null;
var svgIslands = null; var svgIslands = null;
var svgRoot = null;
var dialog = null; var dialog = null;
var taCandidate = null; var taCandidate = null;
@ -170,20 +171,6 @@ var safeQuerySelectorAll = function(node, selector) {
/******************************************************************************/ /******************************************************************************/
var pausePicker = function() {
dialog.parentNode.classList.add('paused');
svgListening(false);
};
/******************************************************************************/
var unpausePicker = function() {
dialog.parentNode.classList.remove('paused');
svgListening(true);
};
/******************************************************************************/
var highlightElements = function(elems, force) { var highlightElements = function(elems, force) {
// To make mouse move handler more efficient // To make mouse move handler more efficient
if ( !force && elems.length === targetElements.length ) { if ( !force && elems.length === targetElements.length ) {
@ -670,6 +657,13 @@ var onSvgHovered = function(ev) {
/******************************************************************************/ /******************************************************************************/
var onSvgClicked = function(ev) { var onSvgClicked = function(ev) {
// https://github.com/gorhill/uBlock/issues/810#issuecomment-74600694
// Unpause picker if user click outside dialog
if ( dialog.parentNode.classList.contains('paused') ) {
unpausePicker();
return;
}
var elem = elementFromPoint(ev.clientX, ev.clientY); var elem = elementFromPoint(ev.clientX, ev.clientY);
if ( elem === null ) { if ( elem === null ) {
return; return;
@ -681,10 +675,8 @@ var onSvgClicked = function(ev) {
/******************************************************************************/ /******************************************************************************/
var svgListening = function(on) { var svgListening = function(on) {
var svg = dialog.ownerDocument.body.querySelector('svg');
var action = (on ? 'add' : 'remove') + 'EventListener'; var action = (on ? 'add' : 'remove') + 'EventListener';
svg[action]('mousemove', onSvgHovered); svgRoot[action]('mousemove', onSvgHovered);
svg[action]('click', onSvgClicked);
}; };
/******************************************************************************/ /******************************************************************************/
@ -709,6 +701,20 @@ var onScrolled = function() {
/******************************************************************************/ /******************************************************************************/
var pausePicker = function() {
dialog.parentNode.classList.add('paused');
svgListening(false);
};
/******************************************************************************/
var unpausePicker = function() {
dialog.parentNode.classList.remove('paused');
svgListening(true);
};
/******************************************************************************/
// Let's have the element picker code flushed from memory when no longer // Let's have the element picker code flushed from memory when no longer
// in use: to ensure this, release all local references. // in use: to ensure this, release all local references.
@ -724,11 +730,12 @@ var stopPicker = function() {
taCandidate.removeEventListener('input', onCandidateChanged); taCandidate.removeEventListener('input', onCandidateChanged);
dialog.removeEventListener('click', onDialogClicked); dialog.removeEventListener('click', onDialogClicked);
svgListening(false); svgListening(false);
svgRoot.removeEventListener('click', onSvgClicked);
pickerRoot.parentNode.removeChild(pickerRoot); pickerRoot.parentNode.removeChild(pickerRoot);
pickerRoot.onload = null; pickerRoot.onload = null;
pickerRoot = pickerRoot =
dialog = dialog =
svgOcean = svgIslands = svgRoot = svgOcean = svgIslands =
taCandidate = null; taCandidate = null;
localMessager.close(); localMessager.close();
@ -759,9 +766,10 @@ var startPicker = function(details) {
taCandidate = dialog.querySelector('textarea'); taCandidate = dialog.querySelector('textarea');
taCandidate.addEventListener('input', onCandidateChanged); taCandidate.addEventListener('input', onCandidateChanged);
var svgRoot = frameDoc.body.querySelector('svg'); svgRoot = frameDoc.body.querySelector('svg');
svgOcean = svgRoot.firstChild; svgOcean = svgRoot.firstChild;
svgIslands = svgRoot.lastChild; svgIslands = svgRoot.lastChild;
svgRoot.addEventListener('click', onSvgClicked);
svgListening(true); svgListening(true);
window.addEventListener('scroll', onScrolled, true); window.addEventListener('scroll', onScrolled, true);