bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

remove loadMenuRan check since we should be covered by other checks going forward

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-21 12:39:37 -05:00
parent 8dbb2ece42
commit c2c65baadb
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/background.js
View File

@@ -28,39 +28,23 @@ chrome.commands.onCommand.addListener(function (command) {
} }
}); });
var loadMenuRan = false, var loginToAutoFill = null,
loginToAutoFill = null,
pageDetailsToAutoFill = [], pageDetailsToAutoFill = [],
autofillTimeout = null, autofillTimeout = null,
menuOptionsLoaded = []; menuOptionsLoaded = [];
chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) { chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
if (msg.command === 'loggedIn' || msg.command === 'unlocked' || msg.command === 'locked') { if (msg.command === 'loggedIn' || msg.command === 'unlocked' || msg.command === 'locked') {
if (loadMenuRan) {
return;
}
loadMenuRan = true;
setIcon(); setIcon();
refreshBadgeAndMenu(); refreshBadgeAndMenu();
} }
else if (msg.command === 'logout') { else if (msg.command === 'logout') {
logout(msg.expired, function () { logout(msg.expired, function () {
if (loadMenuRan) {
return;
}
loadMenuRan = true;
setIcon(); setIcon();
refreshBadgeAndMenu(); refreshBadgeAndMenu();
}); });
} }
else if (msg.command === 'syncCompleted' && msg.successfully) { else if (msg.command === 'syncCompleted' && msg.successfully) {
if (loadMenuRan) {
return;
}
loadMenuRan = true;
setTimeout(refreshBadgeAndMenu, 2000); setTimeout(refreshBadgeAndMenu, 2000);
} }
else if (msg.command === 'bgOpenOverlayPopup') { else if (msg.command === 'bgOpenOverlayPopup') {
@@ -88,7 +72,6 @@ chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
saveAddLogin(sender.tab); saveAddLogin(sender.tab);
} }
else if (msg.command === 'collectPageDetailsResponse') { else if (msg.command === 'collectPageDetailsResponse') {
// messageCurrentTab('openNotificationBar', { type: 'add', typeData: null });
if (msg.contentScript) { if (msg.contentScript) {
var forms = autofillService.getFormsWithPasswordFields(msg.details); var forms = autofillService.getFormsWithPasswordFields(msg.details);
messageTab(msg.tabId, 'pageDetails', { details: msg.details, forms: forms }); messageTab(msg.tabId, 'pageDetails', { details: msg.details, forms: forms });
@@ -250,7 +233,7 @@ function refreshBadgeAndMenu() {
buildContextMenu(function () { buildContextMenu(function () {
loadMenuAndUpdateBadge(tab.url, tab.id, true); loadMenuAndUpdateBadge(tab.url, tab.id, true);
onUpdatedRan = onReplacedRan = loadMenuRan = false; onUpdatedRan = onReplacedRan = false;
}); });
}); });
} }