Merge pull request #9 from NanoAdblocker/master

v1.0.0.57
LiCybora · Jul 18, 2018 · f11e4c6 · f11e4c6
2 parents 3753915 + 5ae6c2f
commit f11e4c6
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 92 deletions.
diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json
@@ -3,10 +3,10 @@
   "[email protected]": {
    "updates": [
     {
-     "version": "1.16.11.102",
+     "version": "1.16.13.101",
      "applications": { "gecko": { "strict_min_version": "52" } },
-     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.16.11rc2",
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.16.11rc2/uBlock0.firefox.signed.xpi"
+     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.16.13rc1",
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.16.13rc1/uBlock0.firefox.signed.xpi"
     }
    ]
   }

diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-1.16.12
+1.16.14
diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json
@@ -352,7 +352,7 @@
     "description": "English: Apply changes"
   },
   "3pGroupDefault": {
-    "message": "Interní",
+    "message": "Integrované",
     "description": "Header for the uBlock filters section in 'Filter lists pane'"
   },
   "3pGroupAds": {
@@ -388,7 +388,7 @@
     "description": "The label for the checkbox used to import external filter lists"
   },
   "3pExternalListsHint": {
-    "message": "Jedna URL adresa na řádek. Řádky začínající vykřičníkem „!“ budou ignorovány. Neplatné URL adresy budou tiše ignorovány.",
+    "message": "Jedna URL adresa na řádek. Neplatné URL adresy budou tiše ignorovány.",
     "description": "Short information about how to use the textarea to import external filter lists by URL"
   },
   "3pExternalListObsolete": {
@@ -600,7 +600,7 @@
     "description": "A link for where to get support"
   },
   "aboutIssues": {
-    "message": "Issue tracker",
+    "message": "Evidence problémů",
     "description": "Text for a link to official issue tracker"
   },
   "aboutCode": {

diff --git a/src/_locales/fil/messages.json b/src/_locales/fil/messages.json
@@ -48,11 +48,11 @@
     "description": "English: Click: disable\/enable uBlock₀ for this site.\n\nCtrl+click: disable uBlock₀ only on this page."
   },
   "popupPowerSwitchInfo1": {
-    "message": "Click to disable uBlock₀ for this site.\n\nCtrl+click to disable uBlock₀ only on this page.",
+    "message": "Click: paganahin ang uBlock₀ para sa websayt na ito.\n\nCtrl+click: 'wag paganahin ang uBlock₀ para lang sa pahina na to.",
     "description": "Message to be read by screen readers"
   },
   "popupPowerSwitchInfo2": {
-    "message": "Click to enable uBlock₀ for this site.",
+    "message": "Click para paganahin ang uBlock₀ sa websayt na ito.",
     "description": "Message to be read by screen readers"
   },
   "popupBlockedRequestPrompt": {
@@ -96,47 +96,47 @@
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups1": {
-    "message": "Click to block all popups on this site",
+    "message": "Click para ihinto ang lahat ng popups sa websayt na ito",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups2": {
-    "message": "Click to no longer block all popups on this site",
+    "message": "Click para hindi na ihinto ang lahat ng popups sa websayt na ito",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoLargeMedia": {
     "message": "Palit-ayos sa paghalang ng mga malaking media element sa site",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia1": {
-    "message": "Click to block large media elements on this site",
+    "message": "Click para ihinto ang may malalaking media elements sa website na ito",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia2": {
-    "message": "Click to no longer block large media elements on this site",
+    "message": "Click para ihinto ang may malalaking media elements sa websayt na ito",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoCosmeticFiltering": {
     "message": "Palit-ayos ng panala ng itsura para sa site na ito",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering1": {
-    "message": "Click to disable cosmetic filtering on this site",
+    "message": "Click para ihinto ang cosmetic filtering sa websayt na ito",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering2": {
-    "message": "Click to enable cosmetic filtering on this site",
+    "message": "Click para hindi ihinto ang cosmetic filtering sa websayt na ito",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoRemoteFonts": {
     "message": "Palit-ayos sa paghalang ng malayuang itsura ng titik para sa site na ito",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoRemoteFonts1": {
-    "message": "Click to block remote fonts on this site",
+    "message": "Click para ihinto ang remote fonts sa websayt na ito",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoRemoteFonts2": {
-    "message": "Click to no longer block remote fonts on this site",
+    "message": "Click para hindi na ihinto ang remote fonts sa websayt na ito",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipGlobalRules": {

diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json
@@ -76,7 +76,7 @@
     "description": "English: or"
   },
   "popupTipDashboard": {
-    "message": "Aprire il cruscotto",
+    "message": "Apri la dashboard",
     "description": "English: Click to open the dashboard"
   },
   "popupTipZapper": {
@@ -264,7 +264,7 @@
     "description": "English: "
   },
   "settingsHyperlinkAuditingDisabledPrompt": {
-    "message": "Disattivare l' auditing del collegamento ipertestuale",
+    "message": "Disattivare l'auditing del collegamento ipertestuale",
     "description": "English: "
   },
   "settingsWebRTCIPAddressHiddenPrompt": {

diff --git a/src/_locales/te/messages.json b/src/_locales/te/messages.json
@@ -352,7 +352,7 @@
     "description": "English: Apply changes"
   },
   "3pGroupDefault": {
-    "message": "Built-in",
+    "message": "అంతర్నిర్మితం",
     "description": "Header for the uBlock filters section in 'Filter lists pane'"
   },
   "3pGroupAds": {
@@ -384,7 +384,7 @@
     "description": "English: Custom"
   },
   "3pImport": {
-    "message": "Import...",
+    "message": "దిగుమతించు...",
     "description": "The label for the checkbox used to import external filter lists"
   },
   "3pExternalListsHint": {
@@ -600,7 +600,7 @@
     "description": "A link for where to get support"
   },
   "aboutIssues": {
-    "message": "Issue tracker",
+    "message": "ఇష్యూ ట్రాకర్",
     "description": "Text for a link to official issue tracker"
   },
   "aboutCode": {

diff --git a/src/_locales/vi/messages.json b/src/_locales/vi/messages.json
@@ -392,7 +392,7 @@
     "description": "Short information about how to use the textarea to import external filter lists by URL"
   },
   "3pExternalListObsolete": {
-    "message": "đã cũ",
+    "message": "Đã cũ.",
     "description": "used as a tooltip for the out-of-date icon beside a list"
   },
   "3pLastUpdate": {

diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json
@@ -8,7 +8,7 @@
     "description": "this will be in the chrome web store: must be 132 characters or less"
   },
   "dashboardName": {
-    "message": "uBlock₀ 控制面板",
+    "message": "uBlock₀ — 控制面板",
     "description": "English: uBlock₀ — Dashboard"
   },
   "settingsPageName": {
@@ -32,7 +32,7 @@
     "description": "appears as tab name in dashboard"
   },
   "statsPageName": {
-    "message": "uBlock₀ 网络请求日志",
+    "message": "uBlock₀ — 网络请求日志",
     "description": "Title for the logger window"
   },
   "aboutPageName": {

diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json
@@ -1,6 +1,6 @@
 {
   "extName": {
-    "message": "uBlock Origin",
+    "message": "uBlock₀",
     "description": "extension name."
   },
   "extShortDesc": {

diff --git a/src/js/assets.js b/src/js/assets.js
@@ -228,7 +228,13 @@ api.fetchFilterList = function(mainlistURL, onLoad, onError) {
         onLoad(details);
     };
 
+    // https://github.com/AdguardTeam/FiltersRegistry/issues/82
+    //   Not checking for `errored` status was causing repeated notifications
+    //   to the caller. This can happen when more than one out of multiple
+    //   sublists can't be fetched.
     var onLocalLoadError = function(details) {
+        if ( errored ) { return; }
+
         errored = true;
         details.url = mainlistURL;
         details.content = '';

diff --git a/src/js/codemirror/search.js b/src/js/codemirror/search.js
@@ -79,31 +79,27 @@
         );
     }
 
-    function searchWidgetTimerHandler(cm) {
-        var state = getSearchState(cm);
-        state.queryTimer = null;
-        findCommit(cm);
-    }
-
     function searchWidgetInputHandler(cm) {
-        var state = getSearchState(cm);
-        if ( queryTextFromSearchWidget(cm) !== state.queryText ) {
-            if ( state.queryTimer !== null ) {
-                clearTimeout(state.queryTimer);
-            }
-            state.queryTimer = setTimeout(
-                searchWidgetTimerHandler.bind(null, cm),
-                350
-            );
+        let state = getSearchState(cm);
+        if ( queryTextFromSearchWidget(cm) === state.queryText ) { return; }
+        if ( state.queryTimer !== null ) {
+            clearTimeout(state.queryTimer);
         }
+        state.queryTimer = setTimeout(
+            () => {
+                state.queryTimer = null;
+                findCommit(cm, 0);
+            },
+            350
+        );
     }
 
     function searchWidgetClickHandler(cm, ev) {
         var tcl = ev.target.classList;
         if ( tcl.contains('cm-search-widget-up') ) {
-            findNext(cm, true);
+            findNext(cm, -1);
         } else if ( tcl.contains('cm-search-widget-down') ) {
-            findNext(cm, false);
+            findNext(cm, 1);
         }
         if ( ev.target.localName !== 'input' ) {
             ev.preventDefault();
@@ -156,7 +152,7 @@
             return true;
         }
         if ( queryText.length !== 0 ) {
-            findNext(cm, command === 'findPrev');
+            findNext(cm, command === 'findPrev' ? -1 : 1);
         }
         return true;
     }
@@ -223,22 +219,23 @@
         }
     }
 
-    function findNext(cm, rev, callback) {
+    function findNext(cm, dir, callback) {
         cm.operation(function() {
             var state = getSearchState(cm);
             if ( !state.query ) { return; }
             var cursor = getSearchCursor(
                 cm,
                 state.query,
-                rev ? cm.getCursor('from') : cm.getCursor('to')
+                dir <= 0 ? cm.getCursor('from') : cm.getCursor('to')
             );
-            if (!cursor.find(rev)) {
+            let previous = dir < 0;
+            if (!cursor.find(previous)) {
                 cursor = getSearchCursor(
                     cm,
                     state.query,
-                    rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0)
+                    previous ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0)
                 );
-                if (!cursor.find(rev)) return;
+                if (!cursor.find(previous)) return;
             }
             cm.setSelection(cursor.from(), cursor.to());
             cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 20);
@@ -270,7 +267,7 @@
         });
     }
 
-    function findCommit(cm) {
+    function findCommit(cm, dir) {
         var state = getSearchState(cm);
         if ( state.queryTimer !== null ) {
             clearTimeout(state.queryTimer);
@@ -284,7 +281,7 @@
         } else {
             cm.operation(function() {
                 startSearch(cm, state);
-                findNext(cm, false);
+                findNext(cm, dir);
             });
         }
     }
@@ -300,17 +297,17 @@
             cm.setCursor(word.anchor);
         }
         queryTextToSearchWidget(cm, queryText);
-        findCommit(cm);
+        findCommit(cm, 1);
     }
 
     function findNextCommand(cm) {
         var state = getSearchState(cm);
-        if ( state.query ) { return findNext(cm, false); }
+        if ( state.query ) { return findNext(cm, 1); }
     }
 
     function findPrevCommand(cm) {
         var state = getSearchState(cm);
-        if ( state.query ) { return findNext(cm, true); }
+        if ( state.query ) { return findNext(cm, -1); }
     }
 
     CodeMirror.commands.find = findCommand;

diff --git a/src/js/cosmetic-filtering.js b/src/js/cosmetic-filtering.js
@@ -554,7 +554,9 @@ FilterContainer.prototype.freeze = function() {
         }
     }
     this.highlyGeneric.simple.str = Array.from(this.highlyGeneric.simple.dict).join(',\n');
+    this.highlyGeneric.simple.mru.reset();
     this.highlyGeneric.complex.str = Array.from(this.highlyGeneric.complex.dict).join(',\n');
+    this.highlyGeneric.complex.mru.reset();
 
     this.frozen = true;
 };

diff --git a/src/js/messaging.js b/src/js/messaging.js
@@ -107,10 +107,6 @@ var onMessage = function(request, sender, callback) {
 
     case 'cosmeticFiltersInjected':
         µb.cosmeticFilteringEngine.addToSelectorCache(request);
-        // Net-based cosmetic filters are of no interest for logging purpose.
-        if ( µb.logger.isEnabled() && request.type !== 'net' ) {
-            µb.logCosmeticFilters(tabId);
-        }
         break;
 
     case 'createUserFilter':
@@ -539,8 +535,8 @@ var onMessage = function(request, sender, callback) {
         if ( µb.canInjectScriptletsNow === false ) {
             response.scriptlets = µb.scriptletFilteringEngine.retrieve(request);
         }
-        if ( request.isRootFrame && µb.logger.isEnabled() ) {
-            µb.logCosmeticFilters(tabId);
+        if ( response.noCosmeticFiltering !== true ) {
+            µb.logCosmeticFilters(tabId, frameId);
         }
         break;