s2/tab-groupcolor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix icons

Browse Source
This commit is contained in:
s2
2017-12-12 22:28:29 +01:00
parent 56c58896b8
commit 1f8fb529d6
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/bg.js
View File

@@ -1,5 +1,6 @@
const kTST_ID = 'treestyletab@piro.sakura.ne.jp'; const kTST_ID = 'treestyletab@piro.sakura.ne.jp';
const MY_EXTENSION_NAME = 'tab-groupcolor'; const MY_EXTENSION_NAME = 'tab-groupcolor';
let tabIcons = {};
var changeIcon = function(color, currentIcon, options) { var changeIcon = function(color, currentIcon, options) {
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
@@ -58,21 +59,21 @@ var registerToTST = async function() {
}; };
//returns the index of the tabs array object that contains the tab with the passed id //returns the index of the tabs array object that contains the tab with the passed id
var getTabParent = async (tabs, id, currentTopLevelTabPos) => { var getTabParent = (tabs, id, currentTopLevelTabPos) => {
for (let i = 0; i < tabs.length; i++) { for (let i = 0; i < tabs.length; i++) {
//on a root node because there is no opener //on a root node because there is no opener
if (typeof(tabs[i].openerTabId) === 'undefined' || tabs[i].openerTabId === tabs[i].id) { if (!tabs[i].openerTabId || typeof(tabs[i].openerTabId) === 'undefined' || tabs[i].openerTabId === tabs[i].id) {
currentTopLevelTabPos = i; currentTopLevelTabPos = i;
} }
if (tabs[i].id === id) { if (tabs[i].id === id) {
//get original favicon for this tab //get original favicon for this tab
let orginalFavIconUrl = await browser.sessions.getTabValue(id, 'orginalFavIconUrl'); let orginalFavIconUrl = tabIcons[id];
if (!orginalFavIconUrl) { if (!orginalFavIconUrl) {
orginalFavIconUrl = tabs[i].favIconUrl; orginalFavIconUrl = tabs[i].favIconUrl;
await browser.sessions.setTabValue(id, 'orginalFavIconUrl', orginalFavIconUrl); tabIcons[id] = orginalFavIconUrl;
} }
return { return {
@@ -81,7 +82,7 @@ var getTabParent = async (tabs, id, currentTopLevelTabPos) => {
}; };
} else { } else {
if (tabs[i].children && tabs[i].children.length > 0) { if (tabs[i].children && tabs[i].children.length > 0) {
let ret = await getTabParent(tabs[i].children, id, currentTopLevelTabPos); let ret = getTabParent(tabs[i].children, id, currentTopLevelTabPos);
if (ret) { if (ret) {
return ret; return ret;
} }
@@ -103,7 +104,7 @@ var updateAllColorsOnAllTabs = async () => {
for (let i = 0; i < tabs.length; i++) { for (let i = 0; i < tabs.length; i++) {
if (tabs[i].status === 'complete') { if (tabs[i].status === 'complete') {
let t = await getTabParent(tstTabs, tabs[i].id); let t = getTabParent(tstTabs, tabs[i].id);
let options = await loadOptions(); let options = await loadOptions();
browser.tabs.executeScript(tabs[i].id, { browser.tabs.executeScript(tabs[i].id, {
@@ -137,13 +138,20 @@ browser.runtime.onMessageExternal.addListener((aMessage, aSender) => {
}); });
//when something happens with a tab //when something happens with a tab
let tabEvents = ['onUpdated', 'onAttached', 'onDetached', 'onMoved', 'onRemoved'] let tabEvents = ['onAttached', 'onDetached', 'onMoved', 'onRemoved']
tabEvents.forEach((ev) => { tabEvents.forEach((ev) => {
browser.tabs[ev].addListener(async (tabId, changeInfo, tab) => { browser.tabs[ev].addListener((tabId, changeInfo, tab) => {
updateAllColorsOnAllTabs(); updateAllColorsOnAllTabs();
}); });
}); });
//when a tab reloads
browser.webNavigation.onCompleted.addListener((details) => {
delete tabIcons[details.tabId];
updateAllColorsOnAllTabs();
});
//when the options are updated //when the options are updated
browser.storage.onChanged.addListener((changes) => { browser.storage.onChanged.addListener((changes) => {
updateAllColorsOnAllTabs(); updateAllColorsOnAllTabs();

2
src/manifest.json
View File

@@ -18,7 +18,7 @@
}, },
"permissions": [ "permissions": [
"storage", "storage",
"sessions", "webNavigation",
"<all_urls>" "<all_urls>"
], ],
"options_ui": { "options_ui": {