Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extension restart is platform-dependent

This commit is contained in:
Raymond Hill 2014-12-02 14:02:17 -02:00
parent 1a2eef4fa7
commit 0e12797709
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/chromium/vapi-background.js
View File

@ -48,6 +48,12 @@ vAPI.app = {
/******************************************************************************/ /******************************************************************************/
vAPI.app.restart = function() {
chrome.runtime.reload();
};
/******************************************************************************/
vAPI.storage = chrome.storage.local; vAPI.storage = chrome.storage.local;
/******************************************************************************/ /******************************************************************************/

5
platform/safari/vapi-background.js
View File

@ -43,6 +43,11 @@ vAPI.app = {
/******************************************************************************/ /******************************************************************************/
vAPI.app.restart = function() {
};
/******************************************************************************/
// addContentScriptFromURL allows whitelisting, // addContentScriptFromURL allows whitelisting,
// so load sitepaching this way, instead of adding it to the Info.plist // so load sitepaching this way, instead of adding it to the Info.plist

4
src/js/messaging.js
View File

@ -752,7 +752,7 @@ var restoreUserData = function(userData) {
var onCountdown = function() { var onCountdown = function() {
countdown -= 1; countdown -= 1;
if ( countdown === 0 ) { if ( countdown === 0 ) {
µb.XAL.restart(); vAPI.app.restart();
} }
}; };
@ -776,7 +776,7 @@ var resetUserData = function() {
µb.XAL.keyvalRemoveAll(); µb.XAL.keyvalRemoveAll();
// Keep global counts, people can become quite attached to numbers // Keep global counts, people can become quite attached to numbers
µBlock.saveLocalSettings(); µBlock.saveLocalSettings();
µb.XAL.restart(); vAPI.app.restart();
}; };
/******************************************************************************/ /******************************************************************************/

8
src/js/xal.js
View File

@ -54,14 +54,6 @@ exports.keyvalRemoveAll = function(callback) {
/******************************************************************************/ /******************************************************************************/
exports.restart = function() {
if (vAPI.chrome) {
chrome.runtime.reload();
}
};
/******************************************************************************/
return exports; return exports;
/******************************************************************************/ /******************************************************************************/