commit 36b5bb3280a0ca44832edfa17d06a0370c3f3309
author Jason Young <88682906+Jyyjy@users.noreply.github.com> Thu Feb 08 10:05:32 2024 -0500
committer GitHub <noreply@github.com> Thu Feb 08 10:05:32 2024 -0500
tree d67a9fa70fac71a760aecf8570464349f0e5a29b
parent 5ab92db8460864759d3f7d787b955cddd0bb61e9
parent 8a54754ad8d1a322b6da084ef2be359d1e1a6a8d

Merge pull request #409 from UMD-ARLIS/feat/tabId

Feature: Adding tabId to log

build/UserALEWebExtension/background.js

diff --git a/build/UserALEWebExtension/background.js b/build/UserALEWebExtension/background.js
index 389f5a8..82a41c0 100644
--- a/build/UserALEWebExtension/background.js
+++ b/build/UserALEWebExtension/background.js
@@ -415,7 +415,7 @@
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -706,8 +706,8 @@
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 
@@ -1143,11 +1143,15 @@
     });
   });
 }
-browser.runtime.onMessage.addListener(function (message) {
+browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
   switch (message.type) {
     // Handles logs rerouted from content and option scripts 
     case ADD_LOG:
-      log(message.payload);
+      var log$1 = message.payload;
+      if ("tab" in sender && "id" in sender.tab) {
+        log$1["tabId"] = sender.tab.id;
+      }
+      log(log$1);
       break;
     case CONFIG_CHANGE:
       console.log(message);

build/UserALEWebExtension/content.js

diff --git a/build/UserALEWebExtension/content.js b/build/UserALEWebExtension/content.js
index 53e6c59..2c158e6 100644
--- a/build/UserALEWebExtension/content.js
+++ b/build/UserALEWebExtension/content.js
@@ -405,7 +405,7 @@
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -720,8 +720,8 @@
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 

build/UserALEWebExtension/options.js

diff --git a/build/UserALEWebExtension/options.js b/build/UserALEWebExtension/options.js
index acd305a..8528ad8 100644
--- a/build/UserALEWebExtension/options.js
+++ b/build/UserALEWebExtension/options.js
@@ -405,7 +405,7 @@
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -720,8 +720,8 @@
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 

build/userale-2.4.0.js

diff --git a/build/userale-2.4.0.js b/build/userale-2.4.0.js
index c9a7824..5fc18af 100644
--- a/build/userale-2.4.0.js
+++ b/build/userale-2.4.0.js
@@ -418,7 +418,7 @@
    * limitations under the License.
    */
 
-  var browser = detect();
+  var browserInfo = detect();
   var logs$1;
   var config$1;
 
@@ -745,8 +745,8 @@
   }
   function detectBrowser() {
     return {
-      'browser': browser ? browser.name : '',
-      'version': browser ? browser.version : ''
+      'browser': browserInfo ? browserInfo.name : '',
+      'version': browserInfo ? browserInfo.version : ''
     };
   }
 

src/UserALEWebExtension/background.js

diff --git a/src/UserALEWebExtension/background.js b/src/UserALEWebExtension/background.js
index 28a7ab1..9e70d06 100644
--- a/src/UserALEWebExtension/background.js
+++ b/src/UserALEWebExtension/background.js
@@ -44,11 +44,15 @@
   });
 }
 
-browser.runtime.onMessage.addListener(function (message) {
+browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
   switch (message.type) {
     // Handles logs rerouted from content and option scripts 
     case MessageTypes.ADD_LOG:
-      userale.log(message.payload);
+      let log = message.payload;
+      if("tab" in sender && "id" in sender.tab) {
+        log["tabId"] = sender.tab.id;
+      }
+      userale.log(log);
       break;
 
     case MessageTypes.CONFIG_CHANGE:

src/packageLogs.js

diff --git a/src/packageLogs.js b/src/packageLogs.js
index db287d1..637a986 100644
--- a/src/packageLogs.js
+++ b/src/packageLogs.js
@@ -16,7 +16,7 @@
  */
 
 import { detect } from 'detect-browser';
-const browser = detect();
+const browserInfo = detect();
 
 export let logs;
 let config;
@@ -391,7 +391,7 @@
 
 export function detectBrowser() {
     return {
-        'browser': browser ? browser.name : '',
-        'version': browser ? browser.version : ''
+        'browser': browserInfo ? browserInfo.name : '',
+        'version': browserInfo ? browserInfo.version : ''
     };
 }
\ No newline at end of file