Fix the detection of shot pages (#2780)

Previously Screenshots was not disabled on shot pages Also simplify a regular expression slightly
mozilla-services · Apr 28, 2017 · 32d45bc · 32d45bc
1 parent a405bd4
commit 32d45bc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
@@ -162,11 +162,11 @@ this.main = (function() {
     if (!url.startsWith(backend)) {
       return false;
     }
-    let path = url.substr(backend.length).replace(/^\/*/, "").replace(/#.*/, "").replace(/\?.*/, "");
+    let path = url.substr(backend.length).replace(/^\/*/, "").replace(/[?#].*/, "");
     if (path == "shots") {
       return true;
     }
-    if (/^[^/]+\/[^/]+$/.test(url)) {
+    if (/^[^/]+\/[^/]+$/.test(path)) {
       // Blocks {:id}/{:domain}, but not /, /privacy, etc
       return true;
     }