this fixes #1013, #1062 (draft)

uBlock-LLC · Mar 27, 2015 · f2ff0ed · f2ff0ed
1 parent 5f8fd22
commit f2ff0ed
Show file tree

Hide file tree

Showing 18 changed files with 496 additions and 124 deletions.
diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
@@ -55,6 +55,8 @@ vAPI.app.restart = function() {
 
 /******************************************************************************/
 
+// chrome.storage.local.get(null, function(bin){ console.debug('%o', bin); });
+
 vAPI.storage = chrome.storage.local;
 
 /******************************************************************************/
@@ -74,6 +76,7 @@ vAPI.noTabId = '-1';
 vAPI.tabs.registerListeners = function() {
     var onNavigationClient = this.onNavigation || noopFunc;
     var onPopupClient = this.onPopup || noopFunc;
+    var onUpdatedClient = this.onUpdated || noopFunc;
 
     // https://developer.chrome.com/extensions/webNavigation
     // [onCreatedNavigationTarget ->]
@@ -160,6 +163,13 @@ vAPI.tabs.registerListeners = function() {
         popupCandidateTest(details);
     };
 
+    var onUpdated = function(tabId, changeInfo, tab) {
+        if ( changeInfo.url && popupCandidateTest({ tabId: tabId, url: changeInfo.url }) ) {
+            return;
+        }
+        onUpdatedClient(tabId, changeInfo, tab);
+    };
+
     var onCommitted = function(details) {
         if ( details.frameId !== 0 ) {
             return;
@@ -175,10 +185,7 @@ vAPI.tabs.registerListeners = function() {
     chrome.webNavigation.onCreatedNavigationTarget.addListener(onCreatedNavigationTarget);
     chrome.webNavigation.onBeforeNavigate.addListener(onBeforeNavigate);
     chrome.webNavigation.onCommitted.addListener(onCommitted);
-
-    if ( typeof this.onUpdated === 'function' ) {
-        chrome.tabs.onUpdated.addListener(this.onUpdated);
-    }
+    chrome.tabs.onUpdated.addListener(onUpdated);
 
     if ( typeof this.onClosed === 'function' ) {
         chrome.tabs.onRemoved.addListener(this.onClosed);
@@ -308,6 +315,37 @@ vAPI.tabs.open = function(details) {
 
 /******************************************************************************/
 
+// Replace the URL of a tab. Noop if the tab does not exist.
+
+vAPI.tabs.replace = function(tabId, url) {
+    var targetURL = url;
+    if ( typeof targetURL !== 'string' || targetURL === '' ) {
+        return;
+    }
+
+    // extension pages
+    if ( /^[\w-]{2,}:/.test(targetURL) !== true ) {
+        targetURL = vAPI.getURL(targetURL);
+    }
+
+    if ( typeof tabId !== 'number' ) {
+        tabId = parseInt(tabId, 10);
+        if ( isNaN(tabId) ) {
+            return;
+        }
+    }
+
+    chrome.tabs.update(tabId, { url: targetURL }, function() {
+        // this prevent console error
+        if ( chrome.runtime.lastError ) {
+            return;
+        }
+
+    });
+};
+
+/******************************************************************************/
+
 vAPI.tabs.remove = function(tabId) {
     var onTabRemoved = function() {
         if ( vAPI.lastError() ) {

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
@@ -710,6 +710,24 @@ vAPI.tabs.open = function(details) {
 
 /******************************************************************************/
 
+// Replace the URL of a tab. Noop if the tab does not exist.
+
+vAPI.tabs.replace = function(tabId, url) {
+    var targetURL = url;
+
+    // extension pages
+    if ( /^[\w-]{2,}:/.test(targetURL) !== true ) {
+        targetURL = vAPI.getURL(targetURL);
+    }
+
+    var tab = this.getTabsForIds(tabId);
+    if ( tab ) {
+        getBrowserForTab(tab).loadURI(targetURL);
+    }
+};
+
+/******************************************************************************/
+
 vAPI.tabs._remove = function(tab, tabBrowser) {
     if ( vAPI.fennec ) {
         tabBrowser.closeTab(tab);
@@ -1138,18 +1156,13 @@ var httpObserver = {
             return true;
         }
 
-        if ( result.redirectUrl ) {
-            if ( type === 'main_frame' ) {
-                channel.cancel(this.ABORT);
-                vAPI.tabs.open({ tabId: details.tabId, url: result.redirectUrl });
-                return true;
-            }
-            /*channel.redirectionLimit = 1;
+        /*if ( result.redirectUrl ) {
+            channel.redirectionLimit = 1;
             channel.redirectTo(
                 Services.io.newURI(result.redirectUrl, null, null)
             );
-            return true;*/
-        }
+            return true;
+        }*/
 
         return false;
     },

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -75,85 +75,13 @@
     "message":"Go to request log",
     "description":"English: Go to request log"
   },
-  "popupSiteInlineScriptEnabled":{
-    "message":"Inline <code>script<\/code> tags are <b>allowed<\/b> on this site",
-    "description":""
-  },
-  "popupSiteInlineScriptDisabled":{
-    "message":"Inline <code>script<\/code> tags are <b>blocked<\/b> on this site",
-    "description":""
-  },
-  "popupSite1pScriptEnabled":{
-    "message":"1st-party scripts are <b>allowed<\/b> on this site",
-    "description":""
-  },
-  "popupSite1pScriptDisabled":{
-    "message":"1st-party scripts are <b>blocked<\/b> on this site",
-    "description":""
-  },
-  "popupSite3pScriptEnabled":{
-    "message":"3rd-party scripts are <b>allowed<\/b> on this site",
-    "description":""
-  },
-  "popupSite3pScriptDisabled":{
-    "message":"3rd-party scripts are <b>blocked<\/b> on this site",
-    "description":""
-  },
-  "popupSite1pFrameEnabled":{
-    "message":"1st-party frames are <b>allowed<\/b> on this site",
-    "description":""
-  },
-  "popupSite1pFrameDisabled":{
-    "message":"1st-party frames are <b>blocked<\/b> on this site",
-    "description":""
-  },
-  "popupSite3pFrameEnabled":{
-    "message":"3rd-party frames are <b>allowed<\/b> on this site",
-    "description":""
-  },
-  "popupSite3pFrameDisabled":{
-    "message":"3rd-party frames are <b>blocked<\/b> on this site",
-    "description":""
+  "popupTipDoBlockAllPopups":{
+    "message":"Block all popups for this site",
+    "description":"English: Block all popups for this site"
   },
-  "popupDefaultInlineScriptEnabled":{
-    "message":"Inline <code>script</code> tags are <b>allowed<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefaultInlineScriptDisabled":{
-    "message":"Inline <code>script</code> tags are <b>blocked<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault1pScriptEnabled":{
-    "message":"1st-party scripts are <b>allowed<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault1pScriptDisabled":{
-    "message":"1st-party scripts are <b>blocked<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault3pScriptEnabled":{
-    "message":"3rd-party scripts are <b>allowed<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault3pScriptDisabled":{
-    "message":"3rd-party scripts are <b>blocked<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault1pFrameEnabled":{
-    "message":"1st-party frames are <b>allowed<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault1pFrameDisabled":{
-    "message":"1st-party frames are <b>blocked<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault3pFrameEnabled":{
-    "message":"3rd-party frames are <b>allowed<\/b> everywhere by default",
-    "description":""
-  },
-  "popupDefault3pFrameDisabled":{
-    "message":"3rd-party frames are <b>blocked<\/b> everywhere by default",
-    "description":""
+  "popupTipDontBlockDoc":{
+    "message":"Disable strict blocking for this site",
+    "description":"English: Disable strict blocking for this site"
   },
   "popupAnyRulePrompt":{
     "message":"all",

diff --git a/src/background.html b/src/background.html
@@ -19,6 +19,7 @@
 <script src="js/dynamic-net-filtering.js"></script>
 <script src="js/static-net-filtering.js"></script>
 <script src="js/cosmetic-filtering.js"></script>
+<script src="js/hnswitches.js"></script>
 <script src="js/ublock.js"></script>
 <script src="js/messaging.js"></script>
 <script src="js/profiler.js"></script>

diff --git a/src/css/common.css b/src/css/common.css
@@ -25,6 +25,7 @@ body:not(.advancedUser) [data-tip]:after {
     box-shadow: 1px 1px 3px gray;
     color: black;
     content: attr(data-tip);
+    display: none;
     font: 12px sans-serif;
     left: 0;
     line-height: 130%;
@@ -38,7 +39,8 @@ body:not(.advancedUser) [data-tip]:after {
     pointer-events: none;
     opacity: 0;
     }
-[data-tip]:hover:after {
+body [data-tip]:hover:after {
+    display: initial;
     opacity: 1 !important;
     -webkit-transition: opacity 0.2s 0.4s;
     transition: opacity 0.2s 0.4s;
@@ -60,6 +62,13 @@ body[dir=rtl] [data-tip][data-tip-anchor="top"]:hover:after {
     right: -500%;
     }
 
+body [data-tip][data-tip-anchor="topcenter"]:hover:after {
+    bottom: 140%;
+    left: -225%;
+    right: -225%;
+    top: auto;
+    }
+
 .hiddenFileInput {
     visibility: hidden;
     width: 0;

diff --git a/src/css/popup.css b/src/css/popup.css
@@ -80,7 +80,7 @@ body[dir="rtl"] #panes > div:nth-of-type(2) {
     }
 #panes > div:nth-of-type(1) {
     min-width: 150px;
-    padding: 4px 1px;
+    padding: 0;
     }
 p {
     text-align: center;
@@ -131,6 +131,33 @@ body.off #switch .fa {
 .tool:hover {
     color: #444;
     }
+#extraTools {
+    background-color: #eee;
+    border: 0;
+    color: #aaa;
+    font-weight: normal;
+    margin:  1em 0 0 0;
+    padding: 4px 0 2px 0;
+    text-align: center;
+    }
+#extraTools > span {
+    cursor: pointer;
+    font-size: 18px;
+    margin: 0 0.5em;
+    position: relative;
+    }
+#extraTools > span.on > span {
+    color: #e00;
+    font-size: 20px;
+    left: 0;
+    position: absolute;
+    text-align: center;
+    top: 0;
+    width: 100%;
+    }
+#extraTools > span.on > span:after {
+    content: '\2715';
+    }
 
 body.advancedUser h2 {
     cursor: pointer;

diff --git a/src/document-blocked.html b/src/document-blocked.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <title></title>
+<link rel="stylesheet" href="css/common.css" type="text/css">
 <style>
 body {
     font-family: sans-serif;
@@ -33,21 +34,22 @@
     padding: 0.25em 0.5em;
     font-size: inherit;
     }
-img {
-    height: 60vh;
-    left: 10vw;
-    opacity: 0.05;
+#warningSign {
+    margin: 1e, 0;
+    opacity: 1;
     pointer-events: none;
-    position: fixed;
-    bottom: 5vh;
-    width: 80vw;
+    width: 100%;
+    }
+#warningSign > span {
+    color: #f2a500;
+    font-size: 180px;
     }
 </style>
 </head>
 <body>
 <!-- http://commons.wikimedia.org/wiki/File:Caution_sign_used_on_roads_pn.svg
      Public domain. I removed the shadow.
---><img src="img/Caution_sign_used_on_roads_pn.svg" />
+--><div id="warningSign"><span class="fa">&#xf071;</span></div>
 <div>
     <p data-i18n="docblockedPrompt1"></p>
     <p class="what code"></p>

diff --git a/src/js/background.js b/src/js/background.js
@@ -57,7 +57,6 @@ return {
         autoUpdate: true,
         collapseBlocked: true,
         contextMenuEnabled: true,
-        dynamicFilteringString: '',
         dynamicFilteringEnabled: false,
         experimentalEnabled: false,
         externalLists: defaultExternalLists,
@@ -88,7 +87,7 @@ return {
 
     // read-only
     systemSettings: {
-        compiledMagic: 'squafjaywuba',
+        compiledMagic: 'perhodsoahya',
         selfieMagic: 'spqmeuaftfra'
     },