1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 09:37:12 +02:00

Trying to fix merge

This commit is contained in:
AlexVallat 2015-03-10 18:44:31 +00:00
parent 62c8ffbcc4
commit 825adfa80e
2 changed files with 24 additions and 4 deletions

View File

@ -74,7 +74,7 @@ function startup(data, reason) {
);
};
if (reason !== APP_STARTUP) {
if ( reason !== APP_STARTUP ) {
onReady();
return;
}

View File

@ -1584,7 +1584,6 @@ vAPI.toolbarButton.init = function() {
}.bind(this));
};
/******************************************************************************/
vAPI.toolbarButton.onBeforeCreated = function(doc) {
@ -1654,6 +1653,27 @@ vAPI.toolbarButton.onViewHiding = function({target}) {
target.firstChild.setAttribute('src', 'about:blank');
};
vAPI.toolbarButton.updateState = function(win, tabId) {
var button = win.document.getElementById(this.id);
if ( !button ) {
return;
}
var icon = this.tabs[tabId];
button.setAttribute('badge', icon && icon.badge || '');
if ( !icon || !icon.img ) {
icon = '';
}
else {
icon = 'url(' + vAPI.getURL('img/browsericons/icon16.svg') + ')';
}
button.style.listStyleImage = icon;
};
}
/******************************************************************************/
vAPI.toolbarButton.init();