fix usercss redirection

openstyles · Oct 30, 2024 · b3bfe0e · b3bfe0e
1 parent 9328adc
commit b3bfe0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/background/usercss-install-helper.js b/src/background/usercss-install-helper.js
@@ -41,9 +41,9 @@ function toggle(key, val) {
     updateDNR([{
       id: DNR_ID_INSTALLER,
       condition: {
-        regexFilter: val
-          ? /^.*\.user\.(?:css|less|styl)(?:\?.*)?$/.source
-          : /^.*\.user\.css$/.source,
+        regexFilter: (val
+          ? /^.*\.user\.(?:css|less|styl)(?:\?.*)?$/
+          : /^.*\.user\.css$/).source,
         requestDomains: val
           ? undefined
           : [...new Set(urls.map(u => u.split('/')[2]))],

diff --git a/src/edit/load-style.js b/src/edit/load-style.js
@@ -6,11 +6,6 @@ import * as MozDocMapper from '/js/sections-util';
 import {clipString, sessionStore, tryURL} from '/js/util';
 import editor from './editor';
 
-if (process.env.MV3 && /#\d+$/.test(location.hash)) {
-  history.replaceState(history.state, '',
-    `${location.href.split('#')[0]}?id=${location.hash.slice(1)}`);
-}
-
 const params = new URLSearchParams(location.search);
 let id = +params.get('id');
 

diff --git a/src/js/get-client-data.js b/src/js/get-client-data.js
@@ -1,5 +1,10 @@
 import {isCssDarkScheme, makePropertyPopProxy} from './util';
 
+if (/#\d+$/.test(location.hash)) { // redirected from devtools -> "open in a new tab"
+  history.replaceState(history.state, '',
+    `${location.href.split('#')[0]}?id=${location.hash.slice(1)}`);
+}
+
 self[process.env.CLIENT_DATA] = makePropertyPopProxy();
 document.write(`<script src="?clientData&${new URLSearchParams({
   dark: +isCssDarkScheme(),