diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
| commit | 94a484dd7e224ef6f4fc5994fa50478d41f72638 (patch) | |
| tree | 5d91fbb0d1ebeeb1cf0a9ab266effb29ce4c1764 /toolkit/components/webextensions/ExtensionCommon.jsm | |
| parent | 754ad610489603f80ea38bbd2cf18b28f0d8bf1d (diff) | |
| parent | b3bf60f4264b9acfbd2cb34fed4a66915012803c (diff) | |
| download | UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.gz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.lz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.xz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.zip | |
Merge branch 'master' into xulrunner
Diffstat (limited to 'toolkit/components/webextensions/ExtensionCommon.jsm')
| -rw-r--r-- | toolkit/components/webextensions/ExtensionCommon.jsm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/toolkit/components/webextensions/ExtensionCommon.jsm b/toolkit/components/webextensions/ExtensionCommon.jsm index a339fb27e..9ec84b5c7 100644 --- a/toolkit/components/webextensions/ExtensionCommon.jsm +++ b/toolkit/components/webextensions/ExtensionCommon.jsm @@ -197,10 +197,9 @@ class BaseContext { * @returns {Promise} */ sendMessage(target, messageName, data, options = {}) { - options.recipient = options.recipient || {}; + options.recipient = Object.assign({extensionId: this.extension.id}, options.recipient); options.sender = options.sender || {}; - options.recipient.extensionId = this.extension.id; options.sender.extensionId = this.extension.id; options.sender.contextId = this.contextId; |