Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 09:37:12 +02:00
Code Issues Releases Wiki Activity

Prevent element picker from throwing when targeting html/body

Browse Source 
Occurred when element picker was launched from context menu
as a result of clicking on `html` or `body` elements.
This commit is contained in:
Raymond Hill 2023-12-16 11:23:58 -05:00
parent c2b5fb1fda
commit ebd9d93666
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/scriptlets/epicker.js
View File

@ -1140,13 +1140,16 @@ const quitPicker = function() {
self.removeEventListener('resize', onViewportChanged, { passive: true });
self.removeEventListener('keydown', onKeyPressed, true);
vAPI.shutdown.remove(quitPicker);
pickerFramePort.close();
pickerFramePort = undefined;
if ( pickerFramePort !== null ) {
pickerFramePort.close();
pickerFramePort = null;
}
if ( pickerRoot !== null ) {
pickerRoot.remove();
pickerRoot = null;
}
vAPI.userStylesheet.remove(pickerCSS);
vAPI.userStylesheet.apply();
if ( pickerRoot === null ) { return; }
pickerRoot.remove();
pickerRoot = null;
self.focus();
};
@ -1156,6 +1159,7 @@ const onDialogMessage = function(msg) {
switch ( msg.what ) {
case 'start':
startPicker();
if ( pickerFramePort === null ) { break; }
if ( targetElements.length === 0 ) {
highlightElements([], true);
}
@ -1301,7 +1305,7 @@ document.documentElement.append(pickerRoot);
vAPI.shutdown.add(quitPicker);
let pickerFramePort;
let pickerFramePort = null;
{
const url = new URL(pickerBootArgs.pickerURL);