From ee268c5e9c8358374ed783ab083745b1bf03d61d Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 25 Sep 2018 23:37:08 +0200
Subject: [PATCH] Fixed some edge-specific bugs

---
 js/conf/Debug.js      |  6 +++---
 js/lib/Settings.js    |  9 +++++++--
 js/uw.js              |  3 +++
 res/popup/js/popup.js | 11 +++++++++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/js/conf/Debug.js b/js/conf/Debug.js
index 3228b30..9046d0d 100644
--- a/js/conf/Debug.js
+++ b/js/conf/Debug.js
@@ -1,10 +1,10 @@
 // Set prod to true when releasing
-_prod = true; 
-// _prod = false; 
+//_prod = true; 
+_prod = false; 
 
 Debug = {
   init: true,
-  debug: false,
+  debug: true,
   keyboard: true,
   debugResizer: true,
   debugArDetect: true,
diff --git a/js/lib/Settings.js b/js/lib/Settings.js
index 06a7fc1..63fc05d 100644
--- a/js/lib/Settings.js
+++ b/js/lib/Settings.js
@@ -103,8 +103,8 @@ class Settings {
   }
 
   async get() {
-    if (BrowserDetect.firefox || BrowserDetect.edge) {
-      const ret = this.useSync ? await browser.storage.sync.get('uwSettings') : await browser.storage.local.get('uwSettings');
+    if (BrowserDetect.firefox) {
+      const ret = await browser.storage.local.get('uwSettings');
       try {
         return JSON.parse(ret.uwSettings);
       } catch(e) {
@@ -115,6 +115,11 @@ class Settings {
         chrome.storage.sync.get('uwSettings', (res) => resolve(res));
       });
       return ret['uwSettings'];
+    } else if (BrowserDetect.edge) {
+      const ret = new Promise( (resolve, reject) => {
+        browser.storage.sync.get('uwSettings', (res) => resolve(res));
+      });
+      return ret['uwSettings'];
     }
   }
 
diff --git a/js/uw.js b/js/uw.js
index f01d8b3..c493db5 100644
--- a/js/uw.js
+++ b/js/uw.js
@@ -12,6 +12,9 @@ if(Debug.debug){
   }
 }
 
+if (BrowserDetect.edge) {
+  HTMLCollection.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator];
+}
 
 class UW {
   constructor(){
diff --git a/res/popup/js/popup.js b/res/popup/js/popup.js
index 0524a5a..cf1b046 100644
--- a/res/popup/js/popup.js
+++ b/res/popup/js/popup.js
@@ -494,7 +494,9 @@ function validateAutoArTimeout(){
 }
 
 document.addEventListener("click", (e) => {
-  
+  if(Debug.debug) {
+    console.log("[popup.js] something clicked. event:", e, JSON.stringify(e));
+  }
   
   function getcmd(e){
     var command = {};
@@ -791,7 +793,12 @@ document.addEventListener("click", (e) => {
     //#endregion
   }
   
-  var command = getcmd(e);  
+  var command = getcmd(e);
+
+  if(Debug.debug) {
+    console.log("[popup.js] Got command (can be undefined):", command, JSON.stringify(command))
+  }
+
   if(command)
     port.postMessage(command);