open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refreshAllTabs should always try to refresh the main page

Browse Source
This commit is contained in:
tophf 2017-12-09 21:19:03 +03:00
parent 2fe4c0793c
commit e41dda1b68
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manage/import-export.js
View File

@ -291,7 +291,8 @@ function importFromString(jsonString) {
function refreshTab(tab, ownTab, resolve) { function refreshTab(tab, ownTab, resolve) {
const tabId = tab.id; const tabId = tab.id;
chrome.webNavigation.getAllFrames({tabId}, frames => { chrome.webNavigation.getAllFrames({tabId}, frames => {
(frames || []).forEach(({frameId}) => frames = frames && frames[0] ? frames : [{frameId: 0}];
frames.forEach(({frameId}) =>
getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => { getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
const message = {method: 'styleReplaceAll', tabId, frameId, styles}; const message = {method: 'styleReplaceAll', tabId, frameId, styles};
if (tab.id === ownTab.id) { if (tab.id === ownTab.id) {

7
popup/hotkeys.js
View File

@ -118,7 +118,8 @@ var hotkeys = (() => {
function refreshTab(tab) { function refreshTab(tab) {
const tabId = tab.id; const tabId = tab.id;
chrome.webNavigation.getAllFrames({tabId}, frames => !frames && ignoreChromeError() || chrome.webNavigation.getAllFrames({tabId}, frames => {
frames = frames && frames[0] ? frames : [{frameId: 0}];
frames.forEach(({frameId}) => frames.forEach(({frameId}) =>
getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => { getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
const message = {method: 'styleReplaceAll', tabId, frameId, styles}; const message = {method: 'styleReplaceAll', tabId, frameId, styles};
@ -126,7 +127,9 @@ var hotkeys = (() => {
if (frameId === 0) { if (frameId === 0) {
setTimeout(BG.updateIcon, 0, tab, styles); setTimeout(BG.updateIcon, 0, tab, styles);
} }
}))); }));
ignoreChromeError();
});
} }
function initHotkeyInfo() { function initHotkeyInfo() {