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

Side by Side 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 consistent style for checking for availability of API Created Aug. 16, 2017, 9:24 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 ext.onMessage._dispatch(message, {}, sendResponse).indexOf(true) != -1; 9 // Listen for messages from the background page.
6 }); 10 chrome.runtime.onMessage.addListener((message, sender, sendResponse) =>
11 {
12 return ext.onMessage._dispatch(message, {}, sendResponse).indexOf(true) !=
Sebastian Noack 2017/08/16 10:15:00 While changing this code anyway, you might want to
Manish Jethani 2017/08/16 10:30:36 I'm assuming you meant `.includes(true)` Done.
Sebastian Noack 2017/08/16 10:34:56 Sure, that is what I meant, sorry.
13 -1;
14 });
15 }
7 16
8 (function() 17 (function()
9 { 18 {
10 let port = null; 19 let port = null;
11 20
12 ext.onExtensionUnloaded = { 21 ext.onExtensionUnloaded = {
13 addListener(listener) 22 addListener(listener)
14 { 23 {
15 if (!port) 24 if (!port)
16 port = chrome.runtime.connect(); 25 port = chrome.runtime.connect();
(...skipping 10 matching lines...) Expand all
27 36
28 if (!port.onDisconnect.hasListeners()) 37 if (!port.onDisconnect.hasListeners())
29 { 38 {
30 port.disconnect(); 39 port.disconnect();
31 port = null; 40 port = null;
32 } 41 }
33 } 42 }
34 } 43 }
35 }; 44 };
36 }()); 45 }());
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld