(flagon-useralejs) 01/01: Merge pull request #409 from UMD-ARLIS/feat/tabId

[jky]

This is an automated email from the ASF dual-hosted git repository.

jky pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/flagon-useralejs.git

commit 36b5bb3280a0ca44832edfa17d06a0370c3f3309
Merge: 5ab92db 8a54754
Author: Jason Young <88682906+jy...@users.noreply.github.com>
AuthorDate: Thu Feb 8 10:05:32 2024 -0500

    Merge pull request #409 from UMD-ARLIS/feat/tabId
    
    Feature: Adding tabId to log

 build/UserALEWebExtension/background.js | 14 +++++++++-----
 build/UserALEWebExtension/content.js    |  6 +++---
 build/UserALEWebExtension/options.js    |  6 +++---
 build/userale-2.4.0.js                  |  6 +++---
 src/UserALEWebExtension/background.js   |  8 ++++++--
 src/packageLogs.js                      |  6 +++---
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --cc build/UserALEWebExtension/background.js
index 389f5a8,3003704..82a41c0
--- a/build/UserALEWebExtension/background.js
+++ b/build/UserALEWebExtension/background.js
@@@ -1143,17 -1142,21 +1143,21 @@@ function dispatchTabMessage(message) 
      });
    });
  }
- browser.runtime.onMessage.addListener(function (message) {
+ browser.runtime.onMessage.addListener(function (message, sender, 
sendResponse) {
    switch (message.type) {
 -    case CONFIG_CHANGE:
 -      options(message.payload);
 -      dispatchTabMessage(message);
 -      break;
 -
      // 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);
 +      options(message.payload);
 +      dispatchTabMessage(message);
 +      break;
      default:
        console.log('got unknown message type ', message);
    }
diff --cc src/UserALEWebExtension/background.js
index 28a7ab1,02aec1a..9e70d06
--- a/src/UserALEWebExtension/background.js
+++ b/src/UserALEWebExtension/background.js
@@@ -44,19 -43,22 +44,23 @@@ function dispatchTabMessage(message) 
    });
  }
  
- browser.runtime.onMessage.addListener(function (message) {
+ browser.runtime.onMessage.addListener(function (message, sender, 
sendResponse) {
    switch (message.type) {
 -    case MessageTypes.CONFIG_CHANGE:
 -      userale.options(message.payload)
 -      dispatchTabMessage(message);
 -      break;
 -
      // 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:
 +      console.log(message);
 +      userale.options(message.payload);
 +      dispatchTabMessage(message);
 +      break;
 +
      default:
        console.log('got unknown message type ', message);
    }