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.

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

fix typo #188

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion extension/js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ chrome.action.onClicked.addListener((tab) => {
//也可以打开指定网站,自动同步规则

// 注释的原因:减少误打开选项页
// 默认侯选项切换已完成,现在可以打开了
// 默认候选项切换已完成,现在可以打开了
chrome.runtime.openOptionsPage((w) => {
console.log(w);
});
Expand Down
6 changes: 3 additions & 3 deletions extension/options_ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ chrome.declarativeNetRequest.updateDynamicRules(

| 规则来源 | 对应选项页选项 | ID 区间段 | 区间名称 | 作用 | 与删除选项的关系) |
| :--------------------- | :--------------------------------------------------------------------------------- | :-------------------------: | :----------------- | :------------------------------------------------------- | :--------------------------- |
| 固定配置 | 默认侯选项切换 | ID 编号<10000 | 默认侯选项切换规则 | 改变默认规则候选项 | 删除规则只删除对应区间的规则 |
| 固定配置 | 默认候选项切换 | ID 编号<10000 | 默认候选项切换规则 | 改变默认规则候选项 | 删除规则只删除对应区间的规则 |
| 自定义 | 选项三:自定义规则 -- 新增特制规则 | 10000>=规则 ID 编号<=19999 | 自定义特制规则 | 自己定义 特制规则 | 删除规则只删除对应区间的规则 |
| 自定义 | 选项三:自定义规则 -- 新增普通规则 | 20000>=规则 ID 编号<=29999 | 自定义普通规则 | 自己定义 普通规则 | 删除规则只删除对应区间的规则 |
| 同步远端配置的静态规则 | 选项一:全局动态规则处理 -- 同步远端仓库最新静态规则到本地,并停用本地默认静态规则 | 30000<=规则 ID 编号<=39999 | 同步远端静态规则 | 实现不更新扩展,更新默认规则,取代本地已有的默认静态规则 | 删除规则只删除对应区间的规则 |
| 同步远端动态规则 | 选项二:同步远端配置规则 -- 同步远端配置规则 | 40000<=规则 ID 编号<=320000 | 同步远端动态规则 | 同步指定仓库地址的规则, 实现不更新扩展,更新规则 | 删除规则只删除对应区间的规则 |
| 未定义 | 无 | 无 | 无 | 无 | 无 |

```text
默认侯选项切换规则编号(固定编号): 编号<=9999
默认候选项切换规则编号(固定编号): 编号<=9999

自定义特制规则编号: 10000>=编号<=19999

Expand Down Expand Up @@ -137,7 +137,7 @@ chrome.declarativeNetRequest.updateDynamicRules(

> 默认未启用的规则,如何启用?

> 答:扩展默认选项设置 =》 默认侯选项切换 =》 选中规则候选项=》启用 默认未启用的规则
> 答:扩展默认选项设置 =》 默认候选项切换 =》 选中规则候选项=》启用 默认未启用的规则

> 规则 id=9999,priority=9999。规则拥有最高优先级,作用:

Expand Down
2 changes: 1 addition & 1 deletion extension/options_ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h1>扩展默认选项设置</h1>
<div class="wrap">
<div class="container">
<section class="box">
<h2>默认侯选项切换 :</h2>
<h2>默认候选项切换 :</h2>
<button class="reset_default_domain">重置默认选项</button
><span class="placeholder-box"></span>
<span class="warning">备注:选中候选项 即 自动完成选项切换</span>
Expand Down
2 changes: 1 addition & 1 deletion extension/options_ui/js/CommonBundle/Components/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let id_ranges = {
};
//区间段名称
let id_range_name_map = {
single_rule: "默认侯选项规则",
single_rule: "默认候选项规则",
self_define_special_rule: "自定义特制规则",
self_define_rule: "自定义普通规则",
sync_remote_static_rule: "同步远端静态规则",
Expand Down