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

fixups

Browse Source
This commit is contained in:
tophf 2020-02-20 19:02:33 +03:00
parent 1be08e57fa
commit 27e2e0a14d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/messaging.js
View File

@ -264,9 +264,10 @@ function openURL({
index, index,
openerTabId, openerTabId,
// when hash is different we can only set `url` if it has # otherwise the tab would reload // when hash is different we can only set `url` if it has # otherwise the tab would reload
url: url !== tab.url && url.includes('#') && url, url: url !== tab.url && url.includes('#') ? url : undefined,
}); });
} else if (newWindow && createWindow) { }
if (newWindow && createWindow) {
return createWindow(Object.assign({url}, windowPosition)) return createWindow(Object.assign({url}, windowPosition))
.then(wnd => wnd.tabs[0]); .then(wnd => wnd.tabs[0]);
} }
@ -276,8 +277,9 @@ function openURL({
createTabWithOpener(activeTab, {url, index, active})); createTabWithOpener(activeTab, {url, index, active}));
}); });
function createTabWithOpener(openerTab, options) { function createTabWithOpener(openerTab, options) {
if (openerTabIdSupported && !openerTab.incognito) { const id = openerTabId == null ? openerTab.id : openerTabId;
options.openerTabId = openerTabId == null ? openerTab.id : openerTabId; if (id !== null && !openerTab.incognito && openerTabIdSupported) {
options.openerTabId = id;
} }
return createTab(options); return createTab(options);
} }
@ -299,8 +301,12 @@ function isTabReplaceable(tab, newUrl) {
function activateTab(tab, {url, index, openerTabId} = {}) { function activateTab(tab, {url, index, openerTabId} = {}) {
const options = {active: true}; const options = {active: true};
if (url) options.url = url; if (url) {
if (openerTabId != null) options.openerTabId = openerTabId; options.url = url;
}
if (openerTabId != null && openerTabIdSupported) {
options.openerTabId = openerTabId;
}
return Promise.all([ return Promise.all([
updateTab(tab.id, options), updateTab(tab.id, options),
updateWindow && updateWindow(tab.windowId, {focused: true}), updateWindow && updateWindow(tab.windowId, {focused: true}),