Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: ext/content.js

Issue 29482663: Issue 5386 - Ignore messages from content scripts in devtools panel (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Created July 7, 2017, 3:11 p.m.
Right Patch Set: Use includes instead of indexOf Created Aug. 16, 2017, 10:29 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 "use strict"; 1 "use strict";
2 2
3 chrome.runtime.onMessage.addListener((message, sender, sendResponse) => 3 // Firefox 55 erroneously sends messages from the content script to the
4 // devtools panel:
5 // https://bugzilla.mozilla.org/show_bug.cgi?id=1383310
6 // As a workaround, listen for messages only if this isn't the devtools panel.
7 if (!("devtools" in chrome))
4 { 8 {
5 return !("tab" in sender) && 9 // Listen for messages from the background page.
6 ext.onMessage._dispatch(message, {}, sendResponse).indexOf(true) != -1; 10 chrome.runtime.onMessage.addListener((message, sender, sendResponse) =>
7 }); 11 {
12 return ext.onMessage._dispatch(message, {}, sendResponse).includes(true);
13 });
14 }
8 15
9 (function() 16 (function()
10 { 17 {
11 let port = null; 18 let port = null;
12 19
13 ext.onExtensionUnloaded = { 20 ext.onExtensionUnloaded = {
14 addListener(listener) 21 addListener(listener)
15 { 22 {
16 if (!port) 23 if (!port)
17 port = chrome.runtime.connect(); 24 port = chrome.runtime.connect();
(...skipping 10 matching lines...) Expand all
28 35
29 if (!port.onDisconnect.hasListeners()) 36 if (!port.onDisconnect.hasListeners())
30 { 37 {
31 port.disconnect(); 38 port.disconnect();
32 port = null; 39 port = null;
33 } 40 }
34 } 41 }
35 } 42 }
36 }; 43 };
37 }()); 44 }());
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld