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

Fixed issues where onReplaced and onUpdated are called multiple times

Browse Source
This commit is contained in:
Kyle Spearrin 2016-10-25 23:03:21 -04:00
parent 0e2e17f2e7
commit 124ac06419
3 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/background.js
View File

@ -72,48 +72,65 @@ if (chrome.runtime.onInstalled) {
});
}
function buildContextMenu() {
chrome.contextMenus.removeAll();
chrome.contextMenus.create({
type: 'normal',
id: 'autofill',
contexts: ['all'],
title: i18nService.autoFill
});
function buildContextMenu(callback) {
chrome.contextMenus.removeAll(function () {
chrome.contextMenus.create({
type: 'normal',
id: 'autofill',
contexts: ['all'],
title: i18nService.autoFill
}, function () {
chrome.contextMenus.create({
type: 'normal',
id: 'copy-username',
contexts: ['all'],
title: i18nService.copyUsername
}, function () {
chrome.contextMenus.create({
type: 'normal',
id: 'copy-password',
contexts: ['all'],
title: i18nService.copyPassword
}, function () {
chrome.contextMenus.create({
type: 'separator'
});
chrome.contextMenus.create({
type: 'normal',
id: 'copy-username',
contexts: ['all'],
title: i18nService.copyUsername
});
chrome.contextMenus.create({
type: 'normal',
id: 'copy-password',
contexts: ['all'],
title: i18nService.copyPassword
});
chrome.contextMenus.create({
type: 'separator'
});
chrome.contextMenus.create({
type: 'normal',
id: 'generate-password',
contexts: ['all'],
title: i18nService.generatePasswordCopied
chrome.contextMenus.create({
type: 'normal',
id: 'generate-password',
contexts: ['all'],
title: i18nService.generatePasswordCopied
}, function () {
if (callback) {
callback();
}
});
});
});
});
});
}
chrome.tabs.onActivated.addListener(function (activeInfo) {
buildContextMenu();
refreshBadgeAndMenu();
});
var loadedMenu = false;
var onReplacedRan = false;
chrome.tabs.onReplaced.addListener(function (addedTabId, removedTabId) {
if (onReplacedRan) {
return;
}
onReplacedRan = true;
refreshBadgeAndMenu();
});
var onUpdatedRan = false;
chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
if (onUpdatedRan) {
return;
}
onUpdatedRan = true;
refreshBadgeAndMenu();
});
@ -128,18 +145,14 @@ function refreshBadgeAndMenu() {
return;
}
buildContextMenu();
loadMenuAndUpdateBadge(tab.url, tab.id, true);
buildContextMenu(function () {
loadMenuAndUpdateBadge(tab.url, tab.id, true);
onUpdatedRan = onReplacedRan = false;
});
});
}
chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
buildContextMenu();
loadMenuAndUpdateBadge(tab.url, tabId, true);
});
function loadMenuAndUpdateBadge(url, tabId, loadContextMenuOptions) {
loadedMenu = false;
if (!url) {
return;
}
@ -153,11 +166,6 @@ function loadMenuAndUpdateBadge(url, tabId, loadContextMenuOptions) {
chrome.browserAction.setBadgeBackgroundColor({ color: '#294e5f' });
siteService.getAllDecrypted().then(function (sites) {
if (loadedMenu) {
return;
}
loadedMenu = true;
sortSites(sites);
for (var i = 0; i < sites.length; i++) {
if (sites[i].domain && tabDomain === sites[i].domain) {

4
src/services/folderService.js
View File

@ -71,12 +71,12 @@ function initFolderService() {
cryptoService.getKey(false, function (key) {
if (!key) {
deferred.reject();
return deferred.promise;
return;
}
if (self.decryptedFolderCache) {
deferred.resolve(self.decryptedFolderCache);
return deferred.promise;
return;
}
var promises = [];

4
src/services/siteService.js
View File

@ -88,12 +88,12 @@ function initSiteService() {
cryptoService.getKey(false, function (key) {
if (!key) {
deferred.reject();
return deferred.promise;
return;
}
if (self.decryptedSiteCache) {
deferred.resolve(self.decryptedSiteCache);
return deferred.promise;
return;
}
var promises = [];