Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-18 11:05:41 +01:00
Code Issues Projects Releases Wiki Activity

scope collection from notification bar to a frame

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-25 22:46:02 -04:00
parent 1c3143867b
commit ebf06a66c5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/background.js
View File

@ -104,7 +104,7 @@ var bg_isBackground = true,
messageTab(sender.tab.id, 'adjustNotificationBar', msg.data); messageTab(sender.tab.id, 'adjustNotificationBar', msg.data);
} }
else if (msg.command === 'bgCollectPageDetails') { else if (msg.command === 'bgCollectPageDetails') {
collectPageDetailsForContentScript(sender.tab, msg.sender); collectPageDetailsForContentScript(sender.tab, msg.sender, sender.frameId);
} }
else if (msg.command === 'bgAddLogin') { else if (msg.command === 'bgAddLogin') {
addLogin(msg.login, sender.tab); addLogin(msg.login, sender.tab);
@ -568,16 +568,21 @@ var bg_isBackground = true,
}); });
} }
function collectPageDetailsForContentScript(tab, sender) { function collectPageDetailsForContentScript(tab, sender, frameId) {
if (!tab || !tab.id) { if (!tab || !tab.id) {
return; return;
} }
var options = {};
if (frameId || frameId === 0) {
options.frameId = frameId;
}
chrome.tabs.sendMessage(tab.id, { chrome.tabs.sendMessage(tab.id, {
command: 'collectPageDetails', command: 'collectPageDetails',
tab: tab, tab: tab,
sender: sender sender: sender
}, function () { }, options, function () {
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
return; return;
} }