summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2021-07-02 11:54:34 +0200
committerWojtek Kosior <koszko@koszko.org>2021-07-02 11:54:34 +0200
commit8708ddd3fc564c0af3d66b50ead77e211a911254 (patch)
tree680493573f9b1cd224b3ccdfcca73042c3ad281c /content
parentb428239892337553afb2b7236e9323c3e4d33d63 (diff)
downloadbrowser-extension-8708ddd3fc564c0af3d66b50ead77e211a911254.tar.gz
browser-extension-8708ddd3fc564c0af3d66b50ead77e211a911254.zip
move parsing of url with targets to misc.js
Diffstat (limited to 'content')
-rw-r--r--content/main.js17
1 files changed, 7 insertions, 10 deletions
diff --git a/content/main.js b/content/main.js
index 8525961..65ac008 100644
--- a/content/main.js
+++ b/content/main.js
@@ -9,6 +9,7 @@
* IMPORTS_START
* IMPORT handle_page_actions
* IMPORT url_item
+ * IMPORT url_extract_target
* IMPORT gen_unique
* IMPORT csp_rule
* IMPORT sanitize_attributes
@@ -39,18 +40,14 @@ function needs_blocking()
if (url.startsWith("https://") || url.startsWith("http://"))
return false;
- let url_re = /^([^#]*)((#[^#]*)(#.*)?)?$/;
- let match = url_re.exec(document.URL);
- let base_url = match[1];
- let first_target = match[3];
- let second_target = match[4];
+ const parsed_url = url_extract_target(document.URL);
- if (first_target !== undefined &&
- first_target === '#' + unique) {
- if (second_target !== undefined)
- window.location.href = base_url + second_target;
+ if (parsed_url.target !== undefined &&
+ parsed_url.target === '#' + unique) {
+ if (parsed_url.target2 !== undefined)
+ window.location.href = parsed_url.base_url + parsed_url.target2;
else
- history.replaceState(null, "", base_url);
+ history.replaceState(null, "", parsed_url.base_url);
console.log(["allowing whitelisted", document.URL]);
return false;