Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Manifest V3 #217

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate to Manifest V3 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 0 additions & 119 deletions browser_extensions/chrome/js/background.js
View file
Open in desktop

This file was deleted.

47 changes: 14 additions & 33 deletions browser_extensions/chrome/js/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var app = angular.module('app', ['xeditable']);

app.controller('OptionsController', [
'$scope',
function OptionsController($scope) {
async function OptionsController($scope) {
angular.element('#page_title').html(utils_chrome.get_i18n('extension_name'));
angular.element('#header_title').html(utils_chrome.get_i18n('extension_name'));
angular.element('#subtitle').html(utils_chrome.get_i18n('subtitle'));
Expand All @@ -47,10 +47,10 @@ app.controller('OptionsController', [
/*
什麼時候作用？
*/
$scope.spacing_mode = utils_chrome.CACHED_SETTINGS['spacing_mode'];
$scope.spacing_mode = await chrome.runtime.sendMessage({purpose: 'get_cache_setting', key: 'spacing_mode'});
$scope.spacing_mode_display = utils_chrome.get_i18n($scope.spacing_mode);
$scope.spacing_when_click_msg = utils_chrome.get_i18n('spacing_when_click_msg');
$scope.change_spacing_mode = function() {
$scope.change_spacing_mode = async function() {
play_sound('Hadouken');

if ($scope.spacing_mode === 'spacing_when_load') {
Expand All @@ -61,19 +61,16 @@ app.controller('OptionsController', [
}

$scope.spacing_mode_display = utils_chrome.get_i18n($scope.spacing_mode);

utils_chrome.SYNC_STORAGE.set({'spacing_mode': $scope.spacing_mode}, function() {
// utils_chrome.print_sync_storage();
});
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: 'spacing_mode', value: $scope.spacing_mode});
};

/*
然後，你是否希望：
*/
$scope.spacing_rule = utils_chrome.CACHED_SETTINGS['spacing_rule'];
$scope.spacing_rule = await chrome.runtime.sendMessage({purpose: 'get_cache_setting', key: 'spacing_rule'});
$scope.spacing_rule_display = utils_chrome.get_i18n($scope.spacing_rule);
$scope.blacklists = utils_chrome.CACHED_SETTINGS['blacklists'];
$scope.whitelists = utils_chrome.CACHED_SETTINGS['whitelists'];
$scope.blacklists = await chrome.runtime.sendMessage({purpose: 'get_cache_setting', key: 'blacklists'});
$scope.whitelists = await chrome.runtime.sendMessage({purpose: 'get_cache_setting', key: 'whitelists'});
$scope.change_spacing_rule = function() {
play_sound('Shouryuuken');

Expand All @@ -86,10 +83,7 @@ app.controller('OptionsController', [
}

$scope.spacing_rule_display = utils_chrome.get_i18n($scope.spacing_rule);

utils_chrome.SYNC_STORAGE.set({'spacing_rule': $scope.spacing_rule}, function() {
// print_sync_storage();
});
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: 'spacing_rule', value: $scope.spacing_rule});
};

$scope.update_urls = function(url) {
Expand All @@ -98,12 +92,8 @@ app.controller('OptionsController', [

var spacing_rule = $scope.spacing_rule; // 'blacklists' or 'whitelists'
var urls = $scope[spacing_rule];
var obj_to_save = {};
obj_to_save[spacing_rule] = urls;
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: spacing_rule, value: urls});

utils_chrome.SYNC_STORAGE.set(obj_to_save, function() {
// utils_chrome.print_sync_storage();
});
}
else {
play_sound('WahWahWaaah');
Expand All @@ -120,11 +110,7 @@ app.controller('OptionsController', [
var urls = $scope[spacing_rule];
urls.splice(array_index, 1);

var obj_to_save = {};
obj_to_save[spacing_rule] = urls;
utils_chrome.SYNC_STORAGE.set(obj_to_save, function() {
// utils_chrome.print_sync_storage();
});
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: spacing_rule, value: urls});

event.preventDefault();
};
Expand All @@ -139,12 +125,8 @@ app.controller('OptionsController', [
var spacing_rule = $scope.spacing_rule;
var urls = $scope[spacing_rule];
urls.push(new_url);
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: spacing_rule, value: urls});

var obj_to_save = {};
obj_to_save[spacing_rule] = urls;
utils_chrome.SYNC_STORAGE.set(obj_to_save, function() {
// utils_chrome.print_sync_storage();
});
}
else {
play_sound('WahWahWaaah');
Expand All @@ -166,17 +148,16 @@ app.controller('OptionsController', [
在這個頁面靜音
*/
$scope.label_is_mute = utils_chrome.get_i18n('label_is_mute');
$scope.is_mute = utils_chrome.CACHED_SETTINGS['is_mute'];
$scope.is_mute = await chrome.runtime.sendMessage({purpose: 'get_cache_setting', key: 'is_mute'});
$scope.$watch('is_mute', function(new_val, old_val) {
if (new_val !== old_val) {
utils_chrome.SYNC_STORAGE.set({'is_mute': new_val}, function() {
// utils_chrome.print_sync_storage();
});
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: 'is_mute', value: new_val});
}

IS_MUTE = new_val;
});

$scope.$apply()
}
]);

Expand Down
18 changes: 12 additions & 6 deletions browser_extensions/chrome/js/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ function is_valid_url_for_spacing(url) {
}
}

function spacing_page() {
pangu.spacingPage();
}

/*
Angular
*/
Expand All @@ -19,11 +23,11 @@ var app = angular.module('app', []);

app.controller('PopupController', [
'$scope',
function PopupController($scope) {
async function PopupController($scope) {
angular.element('#god_of_spacing').html(utils_chrome.get_i18n('god_of_spacing'));

// 切換 spacing_mode
$scope.spacing_mode = utils_chrome.CACHED_SETTINGS['spacing_mode'];
$scope.spacing_mode = await chrome.runtime.sendMessage({purpose: 'get_cache_setting', key: 'spacing_mode'});
$scope.spacing_mode_display = utils_chrome.get_i18n($scope.spacing_mode);
$scope.change_spacing_mode = function() {
if ($scope.spacing_mode === 'spacing_when_load') {
Expand All @@ -35,9 +39,7 @@ app.controller('PopupController', [

$scope.spacing_mode_display = utils_chrome.get_i18n($scope.spacing_mode);

utils_chrome.SYNC_STORAGE.set({'spacing_mode': $scope.spacing_mode}, function() {
// utils_chrome.print_sync_storage();
});
chrome.runtime.sendMessage({purpose: 'set_cache_setting', key: 'spacing_mode', value: $scope.spacing_mode});
};

// 招喚空格之神
Expand All @@ -53,7 +55,10 @@ app.controller('PopupController', [

// 略過 chrome:// 之類的 URL
if (is_valid_url_for_spacing(tab.url)) {
chrome.tabs.executeScript(tab.id, {code: 'pangu.spacingPage();', allFrames: true});
chrome.scripting.executeScript({
target: {tabId: tab.id},
func: spacing_page
});
}
else {
if (i === 0) {
Expand All @@ -69,5 +74,6 @@ app.controller('PopupController', [
$scope.open_options_page = function() {
chrome.tabs.create({url: 'pages/options.html'});
};
$scope.$apply()
}
]);
Loading