Merge pull request #124 in EXTENSIONS/browser-extension from feature/…

…issues/917-2 to master * commit 'c58f6e9f6195c51b4310f771f4d8670c0eb624a0': #917 filter directives #917 filter directives
AdguardTeam · Apr 23, 2018 · 5d057e4 · 5d057e4
2 parents 0e463d3 + c58f6e9
commit 5d057e4
Show file tree

Hide file tree

Showing 7 changed files with 413 additions and 54 deletions.
diff --git a/Extension/browser/chrome/background.html b/Extension/browser/chrome/background.html
@@ -6,6 +6,7 @@
     <script type="text/javascript" src="lib/libs/deferred.min.js"></script>
     <script type="text/javascript" src="lib/utils/sha256.patched.js"></script>
     <script type="text/javascript" src="lib/utils/punycode.js"></script>
+    <script type="text/javascript" src="lib/libs/filter-downloader.js"></script>
 
     <!--Adguard Global and preferences-->
     <script type="text/javascript" src="lib/adguard.js"></script>

diff --git a/Extension/browser/firefox/background.html b/Extension/browser/firefox/background.html
@@ -6,6 +6,7 @@
     <script type="text/javascript" src="lib/libs/deferred.min.js"></script>
     <script type="text/javascript" src="lib/utils/sha256.patched.js"></script>
     <script type="text/javascript" src="lib/utils/punycode.js"></script>
+    <script type="text/javascript" src="lib/libs/filter-downloader.js"></script>
 
     <!--Adguard Global and preferences-->
     <script type="text/javascript" src="lib/adguard.js"></script>

diff --git a/Extension/browser/firefox_webext/background.html b/Extension/browser/firefox_webext/background.html
@@ -6,6 +6,7 @@
     <script type="text/javascript" src="lib/libs/deferred.min.js"></script>
     <script type="text/javascript" src="lib/utils/sha256.patched.js"></script>
     <script type="text/javascript" src="lib/utils/punycode.js"></script>
+    <script type="text/javascript" src="lib/libs/filter-downloader.js"></script>
 
     <!--Adguard Global and preferences-->
     <script type="text/javascript" src="lib/adguard.js"></script>

diff --git a/Extension/browser/safari/background.html b/Extension/browser/safari/background.html
@@ -6,6 +6,7 @@
     <script type="text/javascript" src="lib/libs/deferred.min.js"></script>
     <script type="text/javascript" src="lib/utils/sha256.patched.js"></script>
     <script type="text/javascript" src="lib/utils/punycode.js"></script>
+    <script type="text/javascript" src="lib/libs/filter-downloader.js"></script>
 
     <!--Adguard Global and preferences-->
     <script type="text/javascript" src="lib/adguard.js"></script>

diff --git a/Extension/lib/filter/antibanner.js b/Extension/lib/filter/antibanner.js
@@ -1004,8 +1004,8 @@ adguard.antiBannerService = (function (adguard) {
             callback(true);
         };
 
-        var errorCallback = function (request, cause) {
-            adguard.console.error("Error retrieved response from server for filter {0}, cause: {1} {2}", filter.filterId, request.statusText, cause || "");
+        var errorCallback = function (cause) {
+            adguard.console.error("Error retrieved response from server for filter {0}, cause: {1}", filter.filterId, cause || "");
             delete filter._isDownloading;
             adguard.listeners.notifyListeners(adguard.listeners.ERROR_DOWNLOAD_FILTER, filter);
             callback(false);
@@ -1606,7 +1606,7 @@ adguard.filters = (function (adguard) {
                 var rules = adguard.userrules.addRules(rulesText);
                 loadCallback(rules.length);
             }, function (request, cause) {
-                adguard.console.error("Error download subscription by url {0}, cause: {1} {2}", subscriptionUrl, request.statusText, cause || "");
+                adguard.console.error("Error download subscription by url {0}, cause: {1}", subscriptionUrl, cause || "");
             });
         }
     };