From b63415a3db03ceb1fb446a7fcb1f7980bf12def2 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Thu, 4 Nov 2021 11:48:07 -0400 Subject: [PATCH] Fix breaking navigation through links [regression] Regression from: - https://github.com/uBlockOrigin/uBlock-issues/issues/1797 --- src/js/scriptlets/subscriber.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/js/scriptlets/subscriber.js b/src/js/scriptlets/subscriber.js index 1f0ae40b5..ee8cf5989 100644 --- a/src/js/scriptlets/subscriber.js +++ b/src/js/scriptlets/subscriber.js @@ -61,14 +61,15 @@ const onMaybeSubscriptionLinkClicked = function(target) { } const location = subscribeURL.searchParams.get('location') || ''; const title = subscribeURL.searchParams.get('title') || ''; - if ( location === '' || title === '' ) { return; } + if ( location === '' || title === '' ) { return true; } // https://github.com/uBlockOrigin/uBlock-issues/issues/1797 - if ( /^(file|https?):\/\//.test(location) === false ) { return; } + if ( /^(file|https?):\/\//.test(location) === false ) { return true; } vAPI.messaging.send('scriptlets', { what: 'subscribeTo', location, title, }); + return true; } catch (_) { } }; @@ -80,9 +81,10 @@ document.addEventListener('click', ev => { if ( ev.button !== 0 || ev.isTrusted === false ) { return; } const target = ev.target.closest('a'); if ( target instanceof HTMLAnchorElement === false ) { return; } - onMaybeSubscriptionLinkClicked(target); - ev.stopPropagation(); - ev.preventDefault(); + if ( onMaybeSubscriptionLinkClicked(target) === true ) { + ev.stopPropagation(); + ev.preventDefault(); + } }); /******************************************************************************/