Merge pull request #255 from AdguardTeam/feature/issues/202

Feature/issues/202
AdguardTeam · May 24, 2016 · b6fe054 · b6fe054
2 parents 012c646 + d01e18e
commit b6fe054
Show file tree

Hide file tree

Showing 18 changed files with 163 additions and 90 deletions.
diff --git a/Compiler/build.sh b/Compiler/build.sh
@@ -100,6 +100,10 @@ else
     #safari
     options="--version=$version --branch=$branch --dest=$destPath --name=AdguardDev --browser=safari --extensionId=com.adguard.safaridev"
     java -classpath extension-compiler.jar com.adguard.compiler.Main ${options}
+
+    #edge
+    options="--version=$version --branch=$branch --dest=$destPath --name=edge --browser=edge"
+    java -classpath extension-compiler.jar com.adguard.compiler.Main ${options}
 
     echo "Dev builds created"
 

diff --git a/Compiler/src/main/java/com/adguard/compiler/Browser.java b/Compiler/src/main/java/com/adguard/compiler/Browser.java
@@ -10,6 +10,11 @@ public enum Browser {
 	 * Chrome-based (Chrome, Opera, YaBrowser)
 	 */
 	CHROMIUM("chrome"),
+
+	/**
+	 * Microsoft edge
+	 */
+	EDGE("edge"),
 
 	/**
 	 * Safari

diff --git a/Compiler/src/main/java/com/adguard/compiler/FileUtil.java b/Compiler/src/main/java/com/adguard/compiler/FileUtil.java
@@ -47,6 +47,9 @@ public static void copyFiles(File source, File dest, Browser browser) throws Exc
 			case CHROMIUM:
 				copyChromiumFiles(source, dest);
 				break;
+			case EDGE:
+				copyChromiumFiles(source, dest);
+				break;			
 			case SAFARI:
 				copySafariFiles(source, dest);
 				break;

diff --git a/Compiler/src/main/java/com/adguard/compiler/SettingUtils.java b/Compiler/src/main/java/com/adguard/compiler/SettingUtils.java
@@ -96,6 +96,7 @@ public static void updateManifestFile(File dest, Browser browser, String version
 
         switch (browser) {
             case CHROMIUM:
+            case EDGE:
                 File manifestFile = new File(dest, "manifest.json");
                 String content = FileUtils.readFileToString(manifestFile, "utf-8").trim();
                 if (updateUrl != null) {

diff --git a/Extension/browser/chrome/blockpopup.js b/Extension/browser/chrome/blockpopup.js
@@ -1,9 +1,3 @@
-/* global RequestTypes */
-/* global framesMap */
-/* global BrowserTab */
-/* global chrome */
-/* global webRequestService */
-/* global UrlUtils */
 /**
  * This file is part of Adguard Browser Extension (https://github.com/AdguardTeam/AdguardBrowserExtension).
  *
@@ -20,9 +14,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/* global browser, framesMap, BrowserTab, UrlUtils, RequestTypes, webRequestService */
 var tabsLoading = Object.create(null);
 
-chrome.webNavigation.onCreatedNavigationTarget.addListener(function (details) {
+browser.webNavigation.onCreatedNavigationTarget.addListener(function (details) {
 
     var sourceTab = new BrowserTab({id: details.sourceTabId});
 
@@ -44,7 +40,7 @@ chrome.webNavigation.onCreatedNavigationTarget.addListener(function (details) {
     checkPopupBlockedRule(details.tabId, details.url, referrerUrl, sourceTab);
 });
 
-chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
+browser.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
 
     if (!(tabId in tabsLoading)) {
         return;
@@ -71,8 +67,8 @@ function checkPopupBlockedRule(tabId, requestUrl, referrerUrl, sourceTab) {
 
     if (webRequestService.isRequestBlockedByRule(requestRule)) {
         //remove popup tab
-        chrome.tabs.remove(tabId);
+        browser.tabs.remove(tabId);
         //append log event and fix log event type from POPUP to DOCUMENT
         webRequestService.postProcessRequest(sourceTab, requestUrl, referrerUrl, RequestTypes.DOCUMENT, requestRule);
     }
-}
+}