mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-02 17:19:38 +02:00
Prevent spurious error messages to browser console
These spurious error messages can occur when a extension framework API method return a rejected Promise. In uBO the results of browserAction methods is not used so it can be safely discarded.
This commit is contained in:
parent
1c72b171de
commit
733b2330de
@ -602,7 +602,7 @@ vAPI.Tabs = class {
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
if ( browser.windows instanceof Object ) {
|
if ( webext.windows instanceof Object ) {
|
||||||
vAPI.windows = {
|
vAPI.windows = {
|
||||||
get: async function() {
|
get: async function() {
|
||||||
let win;
|
let win;
|
||||||
@ -637,6 +637,52 @@ if ( browser.windows instanceof Object ) {
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
|
if ( webext.browserAction instanceof Object ) {
|
||||||
|
vAPI.browserAction = {
|
||||||
|
setTitle: async function() {
|
||||||
|
try {
|
||||||
|
await webext.browserAction.setTitle(...arguments);
|
||||||
|
}
|
||||||
|
catch (reason) {
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
// Not supported on Firefox for Android
|
||||||
|
if ( webext.browserAction.setIcon ) {
|
||||||
|
vAPI.browserAction.setBadgeTextColor = async function() {
|
||||||
|
try {
|
||||||
|
await webext.browserAction.setBadgeTextColor(...arguments);
|
||||||
|
}
|
||||||
|
catch (reason) {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
vAPI.browserAction.setBadgeBackgroundColor = async function() {
|
||||||
|
try {
|
||||||
|
await webext.browserAction.setBadgeBackgroundColor(...arguments);
|
||||||
|
}
|
||||||
|
catch (reason) {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
vAPI.browserAction.setBadgeText = async function() {
|
||||||
|
try {
|
||||||
|
await webext.browserAction.setBadgeText(...arguments);
|
||||||
|
}
|
||||||
|
catch (reason) {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
vAPI.browserAction.setIcon = async function() {
|
||||||
|
try {
|
||||||
|
await webext.browserAction.setIcon(...arguments);
|
||||||
|
}
|
||||||
|
catch (reason) {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/******************************************************************************/
|
||||||
|
/******************************************************************************/
|
||||||
|
|
||||||
// Must read: https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
// Must read: https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
||||||
|
|
||||||
// https://github.com/chrisaljoudi/uBlock/issues/19
|
// https://github.com/chrisaljoudi/uBlock/issues/19
|
||||||
@ -652,7 +698,7 @@ if ( browser.windows instanceof Object ) {
|
|||||||
// Ensure ImageData for toolbar icon is valid before use.
|
// Ensure ImageData for toolbar icon is valid before use.
|
||||||
|
|
||||||
vAPI.setIcon = (( ) => {
|
vAPI.setIcon = (( ) => {
|
||||||
const browserAction = webext.browserAction;
|
const browserAction = vAPI.browserAction;
|
||||||
const titleTemplate =
|
const titleTemplate =
|
||||||
browser.runtime.getManifest().browser_action.default_title +
|
browser.runtime.getManifest().browser_action.default_title +
|
||||||
' ({badge})';
|
' ({badge})';
|
||||||
|
@ -59,7 +59,6 @@ const promisify = function(thisArg, fnName) {
|
|||||||
const webext = {
|
const webext = {
|
||||||
// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/browserAction
|
// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/browserAction
|
||||||
browserAction: {
|
browserAction: {
|
||||||
onClicked: chrome.browserAction.onClicked,
|
|
||||||
setBadgeBackgroundColor: promisifyNoFail(chrome.browserAction, 'setBadgeBackgroundColor'),
|
setBadgeBackgroundColor: promisifyNoFail(chrome.browserAction, 'setBadgeBackgroundColor'),
|
||||||
setBadgeText: promisifyNoFail(chrome.browserAction, 'setBadgeText'),
|
setBadgeText: promisifyNoFail(chrome.browserAction, 'setBadgeText'),
|
||||||
setIcon: promisifyNoFail(chrome.browserAction, 'setIcon'),
|
setIcon: promisifyNoFail(chrome.browserAction, 'setIcon'),
|
||||||
|
Loading…
Reference in New Issue
Block a user