https://github.com/AdguardTeam/AdguardBrowserExtension/issues/159

AdguardTeam · Feb 3, 2016 · 5cb4493 · 5cb4493
1 parent d5ee685
commit 5cb4493
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 75 deletions.
diff --git a/Extension/browser/chrome/lib/content-script/common-script.js b/Extension/browser/chrome/lib/content-script/common-script.js
@@ -1,3 +1,4 @@
+/* global chrome */
 /**
  * This file is part of Adguard Browser Extension (https://github.com/AdguardTeam/AdguardBrowserExtension).
  *
@@ -32,7 +33,7 @@ var BaseEvent, OnMessageEvent, SendMessageFunction;
 		if (chrome.runtime && chrome.runtime.sendMessage) {
 			return chrome.runtime.sendMessage;
 		} else if (chrome.extension.sendMessage) {
-			return chrome.extension.sendMessage
+			return chrome.extension.sendMessage;
 		} else {
 			return chrome.extension.sendRequest;
 		}

diff --git a/Extension/browser/safari/lib/background-page.js b/Extension/browser/safari/lib/background-page.js
@@ -249,6 +249,7 @@ var ext;
 			}
 		},
 		handlerBehaviorChanged: function () {
+            // Empty
 		},
 		onCompleted: emptyListener,
 		onErrorOccurred: emptyListener,

diff --git a/Extension/browser/safari/lib/content-script/common-script.js b/Extension/browser/safari/lib/content-script/common-script.js
@@ -1,3 +1,5 @@
+/* global SafariBrowserTab */
+/* global BrowserTab */
 /**
  * This file is part of Adguard Browser Extension (https://github.com/AdguardTeam/AdguardBrowserExtension).
  *
@@ -18,8 +20,7 @@ var BaseEvent, OnMessageEvent, SendMessageFunction, I18NSupport;
 
 (function () {
 
-	//Safari variable may be undefined in frame
-
+	// Safari variable may be undefined in a frame
 	(function () {
 		if (typeof safari === "undefined" && typeof chrome === "undefined") {
 			var w = window;
@@ -30,8 +31,7 @@ var BaseEvent, OnMessageEvent, SendMessageFunction, I18NSupport;
 		}
 	})();
 
-	//Event implementation
-
+	// Event implementation
 	BaseEvent = function (target, eventName, capture) {
 
 		this.eventListeners = [];
@@ -62,8 +62,7 @@ var BaseEvent, OnMessageEvent, SendMessageFunction, I18NSupport;
 		}
 	};
 
-	//OnMessage event implementation
-
+	// OnMessage event implementation
 	OnMessageEvent = function (target) {
 		BaseEvent.call(this, target, "message", false);
 	};
@@ -82,7 +81,9 @@ var BaseEvent, OnMessageEvent, SendMessageFunction, I18NSupport;
 				var sender = {};
 				var dispatcher;
 
-				if ("BrowserTab" in window && "SafariBrowserTab" in window && event.target instanceof SafariBrowserTab) {
+				if ("BrowserTab" in window && "SafariBrowserTab" in window && 
+                        event.target instanceof SafariBrowserTab) {
+
 					dispatcher = event.target.page;
 					sender.tab = new BrowserTab(event.target);
 				} else {
@@ -98,8 +99,7 @@ var BaseEvent, OnMessageEvent, SendMessageFunction, I18NSupport;
 	};
 
 
-	//Message passing implementation
-
+	// Messaging implementation
 	var nextRequestNumber = 0;
 
 	SendMessageFunction = function (message, responseCallback) {
@@ -117,8 +117,7 @@ var BaseEvent, OnMessageEvent, SendMessageFunction, I18NSupport;
 		this._messageDispatcher.dispatchMessage("request-" + requestId, message);
 	};
 
-	//I18n implementation
-
+	// I18n implementation
 	var I18n = function () {
 		this._uiLocale = this._getLocale();
 		this._messages = null;

diff --git a/Extension/browser/safari/lib/content-script/content-script.js b/Extension/browser/safari/lib/content-script/content-script.js
@@ -23,7 +23,7 @@
 		init: function() {
 			this.contentBlockerEnabled = this._isContentBlockerEnabled();
 
-			if(window === window.top){
+			if (window === window.top){
 				this._dispatchLoading();
 				this._sendMainFrameLoadedEvent(this.contentBlockerEnabled);
 			}

diff --git a/Extension/browser/webkit/background.js b/Extension/browser/webkit/background.js
@@ -1,3 +1,11 @@
+/* global RequestTypes */
+/* global UI */
+/* global AdguardApplication */
+/* global BrowserTabs */
+/* global FilteringLog */
+/* global WebRequestService */
+/* global ContentMessageHandler */
+/* global ext */
 /**
  * This file is part of Adguard Browser Extension (https://github.com/AdguardTeam/AdguardBrowserExtension).
  *

diff --git a/Extension/filters/filters.xml b/Extension/filters/filters.xml
@@ -1451,9 +1451,9 @@
     <name><![CDATA[EasyList]]></name>
     <description><![CDATA[EasyList is the primary subscription that removes adverts from English webpages.]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.51.89]]></version>
+    <version><![CDATA[1.0.51.92]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:00:53.982+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:00:32.992+04:00]]></timeUpdated>
     <displayNumber><![CDATA[101]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylist.txt]]></subscriptionUrl>
     <languages/>
@@ -1497,9 +1497,9 @@
     <name><![CDATA[EasyList China]]></name>
     <description><![CDATA[中文 supplement for EasyList]]></description>
     <homepage><![CDATA[http://abpchina.org/forum/]]></homepage>
-    <version><![CDATA[1.0.52.10]]></version>
+    <version><![CDATA[1.0.52.13]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:01:16.994+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:00:57.133+04:00]]></timeUpdated>
     <displayNumber><![CDATA[104]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistchina.txt]]></subscriptionUrl>
     <languages>
@@ -1530,9 +1530,9 @@
     <name><![CDATA[EasyList Dutch]]></name>
     <description><![CDATA[Nederlands supplement for EasyList]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.52]]></version>
+    <version><![CDATA[1.0.52.3]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:01:31.018+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:01:11.808+04:00]]></timeUpdated>
     <displayNumber><![CDATA[106]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistdutch.txt]]></subscriptionUrl>
     <languages/>
@@ -1544,9 +1544,9 @@
     <name><![CDATA[EasyList Germany]]></name>
     <description><![CDATA[Deutsch supplement for EasyList]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.52.11]]></version>
+    <version><![CDATA[1.0.52.14]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:01:39.044+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:01:19.682+04:00]]></timeUpdated>
     <displayNumber><![CDATA[107]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistgermany.txt]]></subscriptionUrl>
     <languages/>
@@ -1574,9 +1574,9 @@
     <name><![CDATA[EasyList Italy]]></name>
     <description><![CDATA[italiano supplement for EasyList]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.51.78]]></version>
+    <version><![CDATA[1.0.51.81]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:01:52.500+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:01:33.683+04:00]]></timeUpdated>
     <displayNumber><![CDATA[109]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistitaly.txt]]></subscriptionUrl>
     <languages>
@@ -1638,9 +1638,9 @@
     <name><![CDATA[Liste FR]]></name>
     <description><![CDATA[français supplement for EasyList]]></description>
     <homepage><![CDATA[http://adblock-listefr.com/]]></homepage>
-    <version><![CDATA[1.0.51.97]]></version>
+    <version><![CDATA[1.0.52]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:02:20.038+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:02:00.832+04:00]]></timeUpdated>
     <displayNumber><![CDATA[113]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/liste_fr.txt]]></subscriptionUrl>
     <languages>
@@ -1670,9 +1670,9 @@
     <name><![CDATA[RU AdList]]></name>
     <description><![CDATA[русский, українська supplement for EasyList]]></description>
     <homepage><![CDATA[https://code.google.com/p/ruadlist/]]></homepage>
-    <version><![CDATA[1.0.51.93]]></version>
+    <version><![CDATA[1.0.51.96]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:02:33.985+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:02:15.264+04:00]]></timeUpdated>
     <displayNumber><![CDATA[115]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/advblock.txt]]></subscriptionUrl>
     <languages/>
@@ -1714,9 +1714,9 @@
     <name><![CDATA[EasyPrivacy]]></name>
     <description><![CDATA[privacy protection supplement for EasyList]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.51.77]]></version>
+    <version><![CDATA[1.0.51.80]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:02:55.594+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:02:37.305+04:00]]></timeUpdated>
     <displayNumber><![CDATA[118]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easyprivacy.txt]]></subscriptionUrl>
     <languages/>
@@ -1776,9 +1776,9 @@
     <name><![CDATA[Fanboy's Annoyances]]></name>
     <description><![CDATA[removes online annoyances (includes Fanboy's Social Blocking List) supplement for EasyList]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.52.1]]></version>
+    <version><![CDATA[1.0.52.4]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:03:21.656+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:03:04.052+04:00]]></timeUpdated>
     <displayNumber><![CDATA[122]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt]]></subscriptionUrl>
     <languages/>
@@ -1790,9 +1790,9 @@
     <name><![CDATA[Fanboy's Social Blocking List]]></name>
     <description><![CDATA[removes social media integration supplement for EasyList]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.51.89]]></version>
+    <version><![CDATA[1.0.51.92]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:03:29.596+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:03:11.656+04:00]]></timeUpdated>
     <displayNumber><![CDATA[123]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/fanboy-social.txt]]></subscriptionUrl>
     <languages/>
@@ -1904,9 +1904,9 @@
     <name><![CDATA[Adblock Warning Removal List]]></name>
     <description><![CDATA[removes anti-adblock warnings and other obtrusive messages]]></description>
     <homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
-    <version><![CDATA[1.0.51.94]]></version>
+    <version><![CDATA[1.0.51.97]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:04:25.438+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:04:07.742+04:00]]></timeUpdated>
     <displayNumber><![CDATA[207]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/antiadblockfilters.txt]]></subscriptionUrl>
     <languages/>
@@ -1918,9 +1918,9 @@
     <name><![CDATA[Malware Domains]]></name>
     <description><![CDATA[malware protection]]></description>
     <homepage><![CDATA[http://malwaredomains.com/]]></homepage>
-    <version><![CDATA[1.0.51.81]]></version>
+    <version><![CDATA[1.0.51.84]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:04:34.426+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:04:15.367+04:00]]></timeUpdated>
     <displayNumber><![CDATA[208]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/malwaredomains_full.txt]]></subscriptionUrl>
     <languages/>
@@ -1932,9 +1932,9 @@
     <name><![CDATA[Prebake]]></name>
     <description><![CDATA[filters obtrusive EU cookie law notices]]></description>
     <homepage><![CDATA[http://liamja.co.uk/Prebake/]]></homepage>
-    <version><![CDATA[1.0.1.7]]></version>
+    <version><![CDATA[1.0.1.8]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-01-24T22:04:24.735+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T06:04:31.879+04:00]]></timeUpdated>
     <displayNumber><![CDATA[209]]></displayNumber>
     <subscriptionUrl><![CDATA[https://raw.github.com/liamja/Prebake/master/obtrusive.txt]]></subscriptionUrl>
     <languages/>
@@ -1974,9 +1974,9 @@
     <name><![CDATA[RU AdList: Counters]]></name>
     <description><![CDATA[Дополнение против счетчиков]]></description>
     <homepage><![CDATA[https://code.google.com/p/ruadlist/]]></homepage>
-    <version><![CDATA[1.0.48.50]]></version>
+    <version><![CDATA[1.0.48.53]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:05:01.856+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:04:43.290+04:00]]></timeUpdated>
     <displayNumber><![CDATA[212]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/cntblock.txt]]></subscriptionUrl>
     <languages/>
@@ -1988,9 +1988,9 @@
     <name><![CDATA[RU AdList: BitBlock]]></name>
     <description><![CDATA[Дополнение против мусора]]></description>
     <homepage><![CDATA[https://code.google.com/p/ruadlist/]]></homepage>
-    <version><![CDATA[1.0.48.76]]></version>
+    <version><![CDATA[1.0.48.79]]></version>
     <expires><![CDATA[21600]]></expires>
-    <timeUpdated><![CDATA[2016-02-03T02:05:09.681+04:00]]></timeUpdated>
+    <timeUpdated><![CDATA[2016-02-03T14:04:50.774+04:00]]></timeUpdated>
     <displayNumber><![CDATA[213]]></displayNumber>
     <subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/bitblock.txt]]></subscriptionUrl>
     <languages/>

diff --git a/Extension/lib/content-script/preload.js b/Extension/lib/content-script/preload.js
@@ -47,7 +47,7 @@
     /**
      * Initializing content script
      */
-    var init = function() {
+    var init = function() {       
         if (!(document instanceof HTMLDocument)) {
             return;
         }
@@ -436,6 +436,26 @@
         }
     };
 
+    /**
+     * Called when document become visible.
+     * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/159
+     */
+    var onVisibilityChange = function(event) {
+
+        if (document.hidden == false) {
+            document.removeEventListener("visibilitychange", onVisibilityChange);
+            init();
+        }
+    };
+
+    /**
+     * Messaging won't work when page is loaded by Safari top hits
+     */        
+    if (typeof safari != 'undefined' && document.hidden) {
+        document.addEventListener("visibilitychange", onVisibilityChange);
+        return;
+    }
+
     // Start the content script
     init();
 })();