Unified Diff: ext/content.js
Issue 29482663:
Issue 5386 - Ignore messages from content scripts in devtools panel (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Use includes instead of indexOf
Created Aug. 16, 2017, 10:29 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: ext/content.js |
| =================================================================== |
| --- a/ext/content.js |
| +++ b/ext/content.js |
| @@ -1,14 +1,22 @@ |
| "use strict"; |
| -chrome.runtime.onMessage.addListener((message, sender, sendResponse) => |
| +// Firefox 55 erroneously sends messages from the content script to the |
| +// devtools panel: |
| +// https://bugzilla.mozilla.org/show_bug.cgi?id=1383310 |
| +// As a workaround, listen for messages only if this isn't the devtools panel. |
| +if (!("devtools" in chrome)) |
| { |
| - return ext.onMessage._dispatch(message, {}, sendResponse).indexOf(true) != -1; |
| -}); |
| + // Listen for messages from the background page. |
| + chrome.runtime.onMessage.addListener((message, sender, sendResponse) => |
| + { |
| + return ext.onMessage._dispatch(message, {}, sendResponse).includes(true); |
| + }); |
| +} |
| (function() |
| { |
| let port = null; |
| ext.onExtensionUnloaded = { |
| addListener(listener) |
| { |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
