mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-02 09:09:38 +02:00
fix <https://github.com/uBlockOrigin/uBlock-issues/issues/168>: Firefox for Android does not support the windows API
This commit is contained in:
parent
9130a026b1
commit
273f1db297
@ -464,7 +464,7 @@ vAPI.tabs.open = function(details) {
|
|||||||
// Opening a tab from incognito window won't focus the window
|
// Opening a tab from incognito window won't focus the window
|
||||||
// in which the tab was opened
|
// in which the tab was opened
|
||||||
var focusWindow = function(tab) {
|
var focusWindow = function(tab) {
|
||||||
if ( tab.active ) {
|
if ( tab.active && chrome.windows instanceof Object ) {
|
||||||
chrome.windows.update(tab.windowId, { focused: true });
|
chrome.windows.update(tab.windowId, { focused: true });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -490,7 +490,9 @@ vAPI.tabs.open = function(details) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Open in a standalone window
|
// Open in a standalone window
|
||||||
if ( details.popup === true ) {
|
// https://github.com/uBlockOrigin/uBlock-issues/issues/168#issuecomment-413038191
|
||||||
|
// Not all platforms support browser.windows API.
|
||||||
|
if ( details.popup === true && chrome.windows instanceof Object ) {
|
||||||
chrome.windows.create({ url: details.url, type: 'popup' });
|
chrome.windows.create({ url: details.url, type: 'popup' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -548,6 +550,7 @@ vAPI.tabs.open = function(details) {
|
|||||||
_details.url = targetURL;
|
_details.url = targetURL;
|
||||||
}
|
}
|
||||||
chrome.tabs.update(tab.id, _details, function(tab) {
|
chrome.tabs.update(tab.id, _details, function(tab) {
|
||||||
|
if ( chrome.windows instanceof Object === false ) { return; }
|
||||||
chrome.windows.update(tab.windowId, { focused: true });
|
chrome.windows.update(tab.windowId, { focused: true });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -604,6 +607,7 @@ vAPI.tabs.select = function(tabId) {
|
|||||||
chrome.tabs.update(tabId, { active: true }, function(tab) {
|
chrome.tabs.update(tabId, { active: true }, function(tab) {
|
||||||
void chrome.runtime.lastError;
|
void chrome.runtime.lastError;
|
||||||
if ( !tab ) { return; }
|
if ( !tab ) { return; }
|
||||||
|
if ( chrome.windows instanceof Object === false ) { return; }
|
||||||
chrome.windows.update(tab.windowId, { focused: true });
|
chrome.windows.update(tab.windowId, { focused: true });
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user