├── term.bat
├── src
    ├── war
    │   ├── nano-tiny-noopvast-2.xml
    │   └── nano-tiny-noopvast-3.xml
    ├── img
    │   ├── cloud.png
    │   ├── 128_off.png
    │   ├── 128_on.png
    │   └── help16.png
    ├── icons
    │   ├── icon_150.png
    │   ├── icon_16.png
    │   ├── icon_256.png
    │   ├── icon_44.png
    │   └── icon_50.png
    ├── fonts
    │   └── fontawesome-webfont.ttf
    ├── js
    │   ├── nano-platform-vars.js
    │   ├── nano-vapi.js
    │   ├── nano-asset-viewer.js
    │   └── nano-1p-filters.js
    └── _locales
    │   ├── zh_CN
    │       └── messages.json
    │   ├── zh_TW
    │       └── messages.json
    │   ├── ja
    │       └── messages.json
    │   └── en
    │       └── messages.json
├── renovate.json
├── .gitattributes
├── .gitignore
├── patches
    ├── 00_0_textarea_spacing.patch
    ├── integration
    │   ├── 22_1_font_awesome.patch
    │   ├── 20_0_force_scroll_background.patch
    │   ├── 10_5_linters.patch
    │   ├── 00_2_vapi_icon.patch
    │   ├── 20_1_bug_reporter_background.patch
    │   ├── 10_4_extended_options.patch
    │   ├── 10_0_load_scripts.patch
    │   ├── 10_2_extended_resources.patch
    │   ├── 00_1_version_parsing.patch
    │   ├── 21_2_bug_reporter.patch
    │   ├── 30_1_editor_settings.patch
    │   ├── 10_7_filter_editor.patch
    │   ├── 10_8_filter_viewer.patch
    │   ├── README.MD
    │   ├── 22_3_new_bug_reporter.patch
    │   ├── 10_3_force_recompile.patch
    │   ├── 21_1_force_scroll.patch
    │   ├── 22_2_new_force_scroll.patch
    │   ├── 22_0_new_popup_tweaks.patch
    │   ├── 00_3_favicon.patch
    │   ├── 00_0_about.patch
    │   ├── 30_2_link_differences.patch
    │   ├── 90_0_settings_migration.patch
    │   ├── 10_1_compile_flags.patch
    │   ├── 21_0_popup_tweaks.patch
    │   └── 30_0_settings_tweaks.patch
    ├── 90_0_assets_migration.patch
    ├── 20_3_reset_hard.patch
    ├── 20_4_log_script_snippet_errors.patch
    ├── 20_2_hard_purge_any_key.patch
    ├── 30_0_link_resources.patch
    ├── 10_0_user_css.patch
    ├── 20_6_autocomment_href.patch
    ├── 20_1_header_parsing.patch
    ├── 20_5_other_editors_style.patch
    ├── README.MD
    ├── 90_1_cherry_pick_fixes.patch
    └── 20_0_configuration_tweaks.patch
├── notes
    ├── dashboard_whitelist.md
    ├── dashboard_my_rules.md
    ├── privacy_policy.md
    ├── filter_syntax.md
    ├── developer_notes.md
    ├── advanced_settings.md
    └── sanity_tests.md
├── description
    └── en
    │   └── webstore.txt
├── term
    ├── package.json
    ├── syntax.js
    ├── term.js
    ├── data.js
    ├── store.js
    └── crowdin.js
├── config.nano.js
└── README.MD


/term.bat:
--------------------------------------------------------------------------------
1 | @ECHO OFF
2 | 
3 | NODE ./term
4 | 
5 | PAUSE
6 | 


--------------------------------------------------------------------------------
/src/war/nano-tiny-noopvast-2.xml:
--------------------------------------------------------------------------------
1 | <VAST version="2.0"></VAST>
2 | 


--------------------------------------------------------------------------------
/src/war/nano-tiny-noopvast-3.xml:
--------------------------------------------------------------------------------
1 | <VAST version="3.0"></VAST>
2 | 


--------------------------------------------------------------------------------
/renovate.json:
--------------------------------------------------------------------------------
1 | {
2 |   "extends": [
3 |     "hugoxu"
4 |   ]
5 | }
6 | 


--------------------------------------------------------------------------------
/.gitattributes:
--------------------------------------------------------------------------------
1 | # Make sure patch files have corrent line ending
2 | *.patch text eol=lf
3 | 


--------------------------------------------------------------------------------
/src/img/cloud.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/img/cloud.png


--------------------------------------------------------------------------------
/src/img/128_off.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/img/128_off.png


--------------------------------------------------------------------------------
/src/img/128_on.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/img/128_on.png


--------------------------------------------------------------------------------
/src/img/help16.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/img/help16.png


--------------------------------------------------------------------------------
/src/icons/icon_150.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/icons/icon_150.png


--------------------------------------------------------------------------------
/src/icons/icon_16.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/icons/icon_16.png


--------------------------------------------------------------------------------
/src/icons/icon_256.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/icons/icon_256.png


--------------------------------------------------------------------------------
/src/icons/icon_44.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/icons/icon_44.png


--------------------------------------------------------------------------------
/src/icons/icon_50.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/icons/icon_50.png


--------------------------------------------------------------------------------
/.gitignore:
--------------------------------------------------------------------------------
1 | # Node modules
2 | node_modules/
3 | 
4 | # Workspace
5 | temp/
6 | 
7 | # Build results
8 | build/
9 | 


--------------------------------------------------------------------------------
/src/fonts/fontawesome-webfont.ttf:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/NanoAdblocker/NanoCore2/HEAD/src/fonts/fontawesome-webfont.ttf


--------------------------------------------------------------------------------
/patches/00_0_textarea_spacing.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/css/common.css b/src/css/common.css
 2 | index f1c26292..ea21abd3 100644
 3 | --- a/src/css/common.css
 4 | +++ b/src/css/common.css
 5 | @@ -84,6 +84,7 @@ hr {
 6 |      }
 7 |  textarea {
 8 |      font-size: 90%;
 9 | +    font-family: monospace;
10 |      }
11 |  button {
12 |      align-items: center;
13 | 


--------------------------------------------------------------------------------
/patches/integration/22_1_font_awesome.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
 2 | index 3f99c13f..86fea2a3 100644
 3 | --- a/src/css/popup-fenix.css
 4 | +++ b/src/css/popup-fenix.css
 5 | @@ -3,6 +3,10 @@
 6 |      bottom: auto;
 7 |      top: -20%;
 8 |      }
 9 | +.fa.tool {
10 | +    font-weight: bold;
11 | +    text-align: center;
12 | +    }
13 |  
14 |  /* Internal CSS values */
15 |  :root body {
16 | 


--------------------------------------------------------------------------------
/notes/dashboard_whitelist.md:
--------------------------------------------------------------------------------
 1 | # Dashboard - Whitelist
 2 | 
 3 | If you are not familiar with whitelists in uBlock Origin,
 4 | [**please read this first**](https://github.com/gorhill/uBlock/wiki/Dashboard:-Whitelist).
 5 | 
 6 | ## Differences
 7 | 
 8 | Nano Adblocker has a slightly different default whitelists:
 9 | 
10 | ```
11 | about-scheme
12 | chrome-extension-scheme
13 | chrome-scheme
14 | edge-extension-scheme
15 | edge-scheme
16 | moz-extension-scheme
17 | ms-browser-extension-scheme
18 | opera-scheme
19 | vivaldi-scheme
20 | wyciwyg-scheme
21 | ```
22 | 


--------------------------------------------------------------------------------
/patches/90_0_assets_migration.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
 2 | index 5e009197..f2f67e83 100644
 3 | --- a/src/js/redirect-engine.js
 4 | +++ b/src/js/redirect-engine.js
 5 | @@ -731,6 +731,7 @@ const removeTopCommentBlock = function(text) {
 6 |  RedirectEngine.prototype.loadBuiltinResources = function() {
 7 |      // TODO: remove once usage of uBO 1.20.4 is widespread.
 8 |      µBlock.assets.remove('ublock-resources');
 9 | +    µBlock.assets.remove('nano-resources');
10 |  
11 |      this.resources = new Map();
12 |      this.aliases = new Map();
13 | 


--------------------------------------------------------------------------------
/description/en/webstore.txt:
--------------------------------------------------------------------------------
 1 | Features highlight
 2 | - Block ads and popups, works out of the box
 3 | - Create elements hiding rules through extension icon
 4 | - Report an issue or bug with a few clicks
 5 | - Powerful filters editor and linter for advanced users and filters maintainers
 6 | 
 7 | Best experience with Nano Defender.
 8 | 
 9 | Home page: https://github.com/NanoAdblocker/NanoCore
10 | 
11 | Source code: https://github.com/NanoAdblocker/NanoCore2
12 | 
13 | Report issues: https://github.com/NanoAdblocker/NanoCore/issues
14 | 
15 | Based on uBlock Origin: https://github.com/gorhill/uBlock
16 | 


--------------------------------------------------------------------------------
/patches/integration/20_0_force_scroll_background.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/messaging.js b/src/js/messaging.js
 2 | index 200c3f6f..8ecefeb0 100644
 3 | --- a/src/js/messaging.js
 4 | +++ b/src/js/messaging.js
 5 | @@ -137,6 +137,10 @@ const onMessage = function(request, sender, callback) {
 6 |          µb.elementPickerExec(request.tabId, request.targetURL, request.zap);
 7 |          break;
 8 |  
 9 | +    case 'nanoInjectForceScrollCSS':
10 | +        nano.inject_force_scroll(request.tabId);
11 | +        break;
12 | +
13 |      case 'gotoURL':
14 |          µb.openNewTab(request.details);
15 |          break;
16 | 


--------------------------------------------------------------------------------
/patches/integration/10_5_linters.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/messaging.js b/src/js/messaging.js
 2 | index de13e620..200c3f6f 100644
 3 | --- a/src/js/messaging.js
 4 | +++ b/src/js/messaging.js
 5 | @@ -1192,6 +1192,13 @@ const onMessage = function(request, sender, callback) {
 6 |          nano.recompile_filters();
 7 |          break;
 8 |  
 9 | +    case 'nanoGetFilterLinterResult':
10 | +        response = {
11 | +            errors: nano.fl.errors,
12 | +            warnings: nano.fl.warnings
13 | +        };
14 | +        break;
15 | +
16 |      default:
17 |          return vAPI.messaging.UNHANDLED;
18 |      }
19 | 


--------------------------------------------------------------------------------
/term/package.json:
--------------------------------------------------------------------------------
 1 | {
 2 |   "author": "jspenguin2017",
 3 |   "bugs": {
 4 |     "url": "https://github.com/NanoAdblocker/NanoCore/issues"
 5 |   },
 6 |   "dependencies": {
 7 |     "archiver": "5.0.2",
 8 |     "esprima": "4.0.1",
 9 |     "fs-extra": "9.0.1",
10 |     "yauzl": "2.10.0"
11 |   },
12 |   "description": "Nano Core 2 Terminal",
13 |   "engines": {
14 |     "node": "12.19.0"
15 |   },
16 |   "homepage": "https://github.com/jspenguin2017/NanoCore2",
17 |   "license": "GPL-3.0",
18 |   "name": "nano-core-2-term",
19 |   "private": true,
20 |   "repository": "https://github.com/jspenguin2017/NanoCore2",
21 |   "version": "1.0.26"
22 | }
23 | 


--------------------------------------------------------------------------------
/patches/20_3_reset_hard.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/messaging.js b/src/js/messaging.js
 2 | index 8ecefeb0..77ae124b 100644
 3 | --- a/src/js/messaging.js
 4 | +++ b/src/js/messaging.js
 5 | @@ -953,16 +953,12 @@ const restoreUserData = async function(request) {
 6 |      vAPI.app.restart();
 7 |  };
 8 |  
 9 | -// Remove all stored data but keep global counts, people can become
10 | -// quite attached to numbers
11 |  const resetUserData = async function() {
12 |      await Promise.all([
13 |          µb.cacheStorage.clear(),
14 |          vAPI.storage.clear(),
15 |      ]);
16 |  
17 | -    await µb.saveLocalSettings();
18 | -
19 |      vAPI.app.restart();
20 |  };
21 |  
22 | 


--------------------------------------------------------------------------------
/notes/dashboard_my_rules.md:
--------------------------------------------------------------------------------
 1 | # Dashboard - My Rules
 2 | 
 3 | If you are not familiar with dynamic filtering rules in uBlock Origin,
 4 | [**please read this first**](https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-rule-syntax).
 5 | 
 6 | ## Differences
 7 | 
 8 | Nano Adblocker has a slightly different default dynamic filtering rules:
 9 | 
10 | ```
11 | no-csp-reports: * true
12 | no-large-media: behind-the-scene false
13 | behind-the-scene * * noop
14 | behind-the-scene * 1p-script noop
15 | behind-the-scene * 3p noop
16 | behind-the-scene * 3p-frame noop
17 | behind-the-scene * 3p-script noop
18 | behind-the-scene * image noop
19 | behind-the-scene * inline-script noop
20 | ```
21 | 


--------------------------------------------------------------------------------
/patches/20_4_log_script_snippet_errors.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
 2 | index eab9ff9b..87e54fa7 100644
 3 | --- a/src/js/scriptlet-filtering.js
 4 | +++ b/src/js/scriptlet-filtering.js
 5 | @@ -230,7 +230,9 @@
 6 |              content =
 7 |                  'try {\n' +
 8 |                      content.replace('{{nano}}', '') + '\n' +
 9 | -                '} catch ( e ) { }';
10 | +                '} catch ( e ) {\n' +
11 | +                '    console.error("[Nano] Script Snippet ::", e);\n' +
12 | +                '}';
13 |              scriptletCache.add(rawToken, content);
14 |          }
15 |          toInject.set(rawToken, content);
16 | 


--------------------------------------------------------------------------------
/patches/integration/00_2_vapi_icon.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
 2 | index 03737aab..ad7813dd 100644
 3 | --- a/platform/chromium/vapi-background.js
 4 | +++ b/platform/chromium/vapi-background.js
 5 | @@ -704,8 +704,8 @@ vAPI.setIcon = (( ) => {
 6 |          browser.runtime.getManifest().browser_action.default_title +
 7 |          ' ({badge})';
 8 |      const icons = [
 9 | -        { path: { '16': 'img/icon_16-off.png', '32': 'img/icon_32-off.png' } },
10 | -        { path: { '16':     'img/icon_16.png', '32':     'img/icon_32.png' } },
11 | +        { path: { '128': 'img/128_off.png' } },
12 | +        { path: { '128':  'img/128_on.png' } },
13 |      ];
14 |  
15 |      (( ) => {
16 | 


--------------------------------------------------------------------------------
/patches/20_2_hard_purge_any_key.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
 2 | index 99bbe9b6..8c315959 100644
 3 | --- a/src/js/3p-filters.js
 4 | +++ b/src/js/3p-filters.js
 5 | @@ -678,7 +678,7 @@ uDom('#ignoreGenericCosmeticFilters').on('change', onFilteringSettingsChanged);
 6 |  uDom('#buttonApply').on('click', ( ) => { buttonApplyHandler(); });
 7 |  uDom('#buttonUpdate').on('click', ( ) => { buttonUpdateHandler(); });
 8 |  uDom('#buttonPurgeAll').on('click', ev => {
 9 | -    buttonPurgeAllHandler(ev.ctrlKey && ev.shiftKey);
10 | +    buttonPurgeAllHandler(ev.ctrlKey || ev.metaKey || ev.shiftKey);
11 |  });
12 |  uDom('#lists').on('change', '.listEntry input', onListsetChanged);
13 |  uDom('#lists').on('click', '.listEntry .remove', onRemoveExternalList);
14 | 


--------------------------------------------------------------------------------
/patches/integration/20_1_bug_reporter_background.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
 2 | index 38076516..80b69fe8 100644
 3 | --- a/platform/chromium/vapi-common.js
 4 | +++ b/platform/chromium/vapi-common.js
 5 | @@ -177,6 +177,16 @@ vAPI.download = function(details) {
 6 |  
 7 |  vAPI.getURL = browser.runtime.getURL;
 8 |  
 9 | +vAPI.nanoOpenBugReporter = function(tabId) {
10 | +    const reporter = vAPI.getURL('/reporter/index.html');
11 | +
12 | +    if ( typeof tabId === "number" ) {
13 | +        chrome.tabs.create({
14 | +            url: reporter + '?' + tabId
15 | +        });
16 | +    }
17 | +};
18 | +
19 |  /******************************************************************************/
20 |  
21 |  vAPI.i18n = browser.i18n.getMessage;
22 | 


--------------------------------------------------------------------------------
/patches/30_0_link_resources.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/1p-filters.html b/src/1p-filters.html
 2 | index 10dddd2a..8b24b75d 100644
 3 | --- a/src/1p-filters.html
 4 | +++ b/src/1p-filters.html
 5 | @@ -19,6 +19,7 @@
 6 |      <div id="cloudWidget" class="hide" data-cloud-entry="myFiltersPane"></div>
 7 |  
 8 |      <p class="vverbose"><span data-i18n="1pFormatHint"></span> <a class="fa info" href="https://github.com/NanoAdblocker/NanoCore2/blob/master/notes/filter_syntax.md#filter-syntax" target="_blank">&#xf05a;</a></p>
 9 | +    <p class="vverbose"><span data-i18n="nano_d_resources_links"></span></p>
10 |      <p>
11 |          <button id="userFiltersApply" class="important iconifiable" type="button" disabled><span class="fa">&#xf00c;</span><span data-i18n="1pApplyChanges"></span></button>
12 |          <button id="userFiltersRevert" class="iconifiable" type="button" disabled><span class="fa">&#xf0e2;</span><span data-i18n="genericRevert"></span></button>
13 | 


--------------------------------------------------------------------------------
/patches/integration/10_4_extended_options.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
 2 | index fca01197..ea5b1cb8 100644
 3 | --- a/src/js/redirect-engine.js
 4 | +++ b/src/js/redirect-engine.js
 5 | @@ -546,6 +546,8 @@ RedirectEngine.prototype.supportedTypes = new Map([
 6 |      [ 'subdocument', 'sub_frame' ],
 7 |      [ 'xhr', 'xmlhttprequest' ],
 8 |      [ 'xmlhttprequest', 'xmlhttprequest' ],
 9 | +
10 | +    [ 'iframe', 'sub_frame' ],
11 |  ]);
12 |  
13 |  /******************************************************************************/
14 | diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
15 | index b88e4974..c08ed70c 100644
16 | --- a/src/js/static-net-filtering.js
17 | +++ b/src/js/static-net-filtering.js
18 | @@ -161,6 +161,8 @@ const toNormalizedType = {
19 |      'xmlhttprequest': 'xmlhttprequest',
20 |              'webrtc': 'unsupported',
21 |           'websocket': 'websocket',
22 | +
23 | +            'iframe': 'subdocument',
24 |  };
25 |  
26 |  const typeValueFromCatBits = catBits => (catBits >>> 4) & 0b11111;
27 | 


--------------------------------------------------------------------------------
/patches/10_0_user_css.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
 2 | index 80b69fe8..2820413b 100644
 3 | --- a/platform/chromium/vapi-common.js
 4 | +++ b/platform/chromium/vapi-common.js
 5 | @@ -100,11 +100,6 @@ vAPI.webextFlavor = {
 6 |          soup.add('apple').add('safari');
 7 |      }
 8 |  
 9 | -    // https://github.com/gorhill/uBlock/issues/3588
10 | -    if ( soup.has('chromium') && flavor.major >= 66 ) {
11 | -        soup.add('user_stylesheet');
12 | -    }
13 | -
14 |      // Don't starve potential listeners
15 |      vAPI.setTimeout(dispatch, 97);
16 |  })();
17 | diff --git a/platform/chromium/vapi-usercss.js b/platform/chromium/vapi-usercss.js
18 | index 0cf97b7a..cebc2d1d 100644
19 | --- a/platform/chromium/vapi-usercss.js
20 | +++ b/platform/chromium/vapi-usercss.js
21 | @@ -29,8 +29,7 @@
22 |  // https://github.com/gorhill/uBlock/issues/3588
23 |  
24 |  if ( typeof vAPI === 'object' ) {
25 | -    vAPI.supportsUserStylesheets =
26 | -        /\bChrom(?:e|ium)\/(?:5\d|6[012345])\b/.test(navigator.userAgent) === false;
27 | +    vAPI.supportsUserStylesheets = false;
28 |  }
29 |  
30 |  
31 | 


--------------------------------------------------------------------------------
/patches/20_6_autocomment_href.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/scriptlets/element-picker.js b/src/js/scriptlets/element-picker.js
 2 | index 53fd61e2..ecd4c501 100644
 3 | --- a/src/js/scriptlets/element-picker.js
 4 | +++ b/src/js/scriptlets/element-picker.js
 5 | @@ -1095,6 +1095,7 @@ const onDialogClicked = function(ev) {
 6 |                  what: 'createUserFilter',
 7 |                  autoComment: true,
 8 |                  filters: filter,
 9 | +                nanoHref: window.location.href,
10 |                  origin: window.location.origin,
11 |                  pageDomain: window.location.hostname,
12 |                  killCache: isCosmetic === false,
13 | diff --git a/src/js/storage.js b/src/js/storage.js
14 | index 272127b0..96ce8692 100644
15 | --- a/src/js/storage.js
16 | +++ b/src/js/storage.js
17 | @@ -396,7 +396,8 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
18 |              this.hiddenSettings.autoCommentFilterTemplate
19 |                  .replace('{{date}}', d.toLocaleDateString())
20 |                  .replace('{{time}}', d.toLocaleTimeString())
21 | -                .replace('{{origin}}', options.origin);
22 | +                .replace('{{origin}}', options.origin)
23 | +                .replace('{{nanoHref}}', options.nanoHref);
24 |      }
25 |  
26 |      const details = await this.loadUserFilters();
27 | 


--------------------------------------------------------------------------------
/patches/integration/10_0_load_scripts.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/background.html b/src/background.html
 2 | index 8db73659..010fc82f 100644
 3 | --- a/src/background.html
 4 | +++ b/src/background.html
 5 | @@ -9,12 +9,15 @@
 6 |  <script src="lib/lz4/lz4-block-codec-any.js"></script>
 7 |  <script src="lib/punycode.js"></script>
 8 |  <script src="lib/publicsuffixlist/publicsuffixlist.js"></script>
 9 | +<script src="js/nano-platform-vars.js"></script>
10 |  <script src="js/webext.js"></script>
11 |  <script src="js/vapi.js"></script>
12 |  <script src="js/vapi-common.js"></script>
13 |  <script src="js/vapi-background.js"></script>
14 |  <script src="js/vapi-webrequest.js"></script><!-- Forks can pick the webext, chromium, or their own implementation -->
15 | +<script src="js/nano-vapi.js"></script>
16 |  <script src="js/background.js"></script>
17 | +<script src="js/nano-background.js"></script>
18 |  <script src="js/traffic.js"></script>
19 |  <script src="js/hntrie.js"></script>
20 |  <script src="js/strie.js"></script>
21 | diff --git a/src/js/background.js b/src/js/background.js
22 | index 433ecedf..98278f21 100644
23 | --- a/src/js/background.js
24 | +++ b/src/js/background.js
25 | @@ -208,3 +208,7 @@ const µBlock = (( ) => { // jshint ignore:line
26 |  })();
27 |  
28 |  /******************************************************************************/
29 | +
30 | +window.__ublock__ = µBlock;
31 | +
32 | +/******************************************************************************/
33 | 


--------------------------------------------------------------------------------
/patches/20_1_header_parsing.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/storage.js b/src/js/storage.js
 2 | index 04bae91b..272127b0 100644
 3 | --- a/src/js/storage.js
 4 | +++ b/src/js/storage.js
 5 | @@ -764,15 +764,33 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
 6 |      }
 7 |      // Extract update frequency information
 8 |      const matches = head.match(/(?:^|\n)(?:!|# )[\t ]*Expires[\t ]*:[\t ]*(\d+)[\t ]*(h)?/i);
 9 | +    let v;
10 |      if ( matches !== null ) {
11 | -        let v = Math.max(parseInt(matches[1], 10), 1);
12 | +        v = parseInt(matches[1], 10);
13 |          if ( matches[2] !== undefined ) {
14 |              v = Math.ceil(v / 24);
15 |          }
16 | -        if ( v !== listEntry.updateAfter ) {
17 | -            this.assets.registerAssetSource(assetKey, { updateAfter: v });
18 | +    }
19 | +
20 | +    if ( typeof v !== 'number' ) {
21 | +        if ( typeof listEntry.nanoUpdateAfterDefault === 'number' ) {
22 | +            v = listEntry.nanoUpdateAfterDefault;
23 | +        } else {
24 | +            // IMPORTANT! Must update this value if default update period is
25 | +            // changed
26 | +            v = 3;
27 |          }
28 |      }
29 | +
30 | +    if ( v < 1 ) {
31 | +        v = 1;
32 | +    } else if ( v > 60 ) {
33 | +        v = 60;
34 | +    }
35 | +
36 | +    if ( v !== listEntry.updateAfter ) {
37 | +        this.assets.registerAssetSource(assetKey, { updateAfter: v });
38 | +    }
39 |  };
40 |  
41 |  /******************************************************************************/
42 | 


--------------------------------------------------------------------------------
/patches/integration/10_2_extended_resources.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
 2 | index 3f607cfe..fca01197 100644
 3 | --- a/src/js/redirect-engine.js
 4 | +++ b/src/js/redirect-engine.js
 5 | @@ -180,6 +180,9 @@ const typeToMimeMap = new Map([
 6 |      [ 'xmlhttprequest', 'text/plain' ],
 7 |  ]);
 8 |  
 9 | +nano.insert_redirect_declaration(redirectableResources);
10 | +nano.insert_mime_declaration(extToMimeMap);
11 | +
12 |  const validMimes = new Set(extToMimeMap.values());
13 |  
14 |  const mimeFromName = function(name) {
15 | diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
16 | index 9575047d..e58e0df9 100644
17 | --- a/src/js/scriptlet-filtering.js
18 | +++ b/src/js/scriptlet-filtering.js
19 | @@ -229,7 +229,7 @@
20 |              }
21 |              content =
22 |                  'try {\n' +
23 | -                    content + '\n' +
24 | +                    content.replace('{{nano}}', '') + '\n' +
25 |                  '} catch ( e ) { }';
26 |              scriptletCache.add(rawToken, content);
27 |          }
28 | @@ -307,6 +307,14 @@
29 |              return;
30 |          }
31 |  
32 | +        var nanoInjectArgs = parsed.suffix.slice(4, -1);
33 | +        if (
34 | +            !nano.cf.is_privileged &&
35 | +            nanoInjectArgs.startsWith(nano.privileged_assets_previx)
36 | +        ) {
37 | +            return;
38 | +        }
39 | +
40 |          // https://github.com/gorhill/uBlock/issues/3375
41 |          //   Ignore instances of exception filter with negated hostnames,
42 |          //   because there is no way to create an exception to an exception.
43 | 


--------------------------------------------------------------------------------
/patches/integration/00_1_version_parsing.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
 2 | index fc3caa47..03737aab 100644
 3 | --- a/platform/chromium/vapi-background.js
 4 | +++ b/platform/chromium/vapi-background.js
 5 | @@ -57,16 +57,8 @@ window.addEventListener('webextFlavor', function() {
 6 |  /******************************************************************************/
 7 |  
 8 |  vAPI.app = {
 9 | -    name: manifest.name.replace(/ dev\w+ build/, ''),
10 | -    version: (( ) => {
11 | -        let version = manifest.version;
12 | -        const match = /(\d+\.\d+\.\d+)(?:\.(\d+))?/.exec(version);
13 | -        if ( match && match[2] ) {
14 | -            const v = parseInt(match[2], 10);
15 | -            version = match[1] + (v < 100 ? 'b' + v : 'rc' + (v - 100));
16 | -        }
17 | -        return version;
18 | -    })(),
19 | +    name: manifest.name,
20 | +    version: manifest.version,
21 |  
22 |      intFromVersion: function(s) {
23 |          const parts = s.match(/(?:^|\.|b|rc)\d+/g);
24 | diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
25 | index 30e09c57..38076516 100644
26 | --- a/platform/chromium/vapi-common.js
27 | +++ b/platform/chromium/vapi-common.js
28 | @@ -51,11 +51,6 @@ vAPI.webextFlavor = {
29 |      // This is always true.
30 |      soup.add('ublock').add('webext');
31 |  
32 | -    // Whether this is a dev build.
33 | -    if ( /^\d+\.\d+\.\d+\D/.test(browser.runtime.getManifest().version) ) {
34 | -        soup.add('devbuild');
35 | -    }
36 | -
37 |      if ( /\bMobile\b/.test(ua) ) {
38 |          soup.add('mobile');
39 |      }
40 | 


--------------------------------------------------------------------------------
/patches/integration/21_2_bug_reporter.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/popup.js b/src/js/popup.js
 2 | index feea0361..e98927e6 100644
 3 | --- a/src/js/popup.js
 4 | +++ b/src/js/popup.js
 5 | @@ -776,6 +776,10 @@ const nanoForceEnableScroll = function() {
 6 |      vAPI.closePopup();
 7 |  };
 8 |  
 9 | +const nanoOpenBugReporter = function() {
10 | +    vAPI.nanoOpenBugReporter(popupData.tabId);
11 | +};
12 | +
13 |  /******************************************************************************/
14 |  
15 |  const gotoURL = function(ev) {
16 | @@ -1222,6 +1226,7 @@ uDom('#switch .fa-icon').on('click', toggleNetFilteringSwitch);
17 |  uDom('#gotoZap').on('click', gotoZap);
18 |  uDom('#gotoPick').on('click', gotoPick);
19 |  uDom('#nanoForceEnableScroll').on('click', nanoForceEnableScroll);
20 | +uDom('#nanoOpenBugReporter').on('click', nanoOpenBugReporter);
21 |  uDom('#nanoFirewallPaneToggle').on('click', toggleFirewallPane);
22 |  uDom('.hnSwitch').on('click', ev => { toggleHostnameSwitch(ev); });
23 |  uDom('#saveRules').on('click', saveFirewallRules);
24 | diff --git a/src/popup.html b/src/popup.html
25 | index 9314430a..dd46b5ac 100644
26 | --- a/src/popup.html
27 | +++ b/src/popup.html
28 | @@ -25,6 +25,7 @@
29 |          <p id="basicTools2">
30 |              <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
31 |              <span id="nanoForceEnableScroll" class="fa tool" data-i18n-tip="nano_p_force_scroll" data-tip-position="under">&#xf103;</span>
32 | +            <span id="nanoOpenBugReporter" class="fa tool enabled" data-i18n-tip="nano_p_bug_reporter" data-tip-position="under">&#xf088;</span>
33 |          </p>
34 |          <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
35 |          <p class="statName">
36 | 


--------------------------------------------------------------------------------
/src/js/nano-platform-vars.js:
--------------------------------------------------------------------------------
 1 | // ----------------------------------------------------------------------------------------------------------------- //
 2 | 
 3 | // Nano Core 2 - An adblocker
 4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
 5 | //
 6 | // This program is free software: you can redistribute it and/or modify
 7 | // it under the terms of the GNU General Public License as published by
 8 | // the Free Software Foundation, either version 3 of the License, or
 9 | // (at your option) any later version.
10 | //
11 | // This program is distributed in the hope that it will be useful,
12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 | // GNU General Public License for more details.
15 | //
16 | // You should have received a copy of the GNU General Public License
17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
18 | 
19 | // ----------------------------------------------------------------------------------------------------------------- //
20 | 
21 | // Platform constants
22 | 
23 | // ----------------------------------------------------------------------------------------------------------------- //
24 | 
25 | "use strict";
26 | 
27 | // ----------------------------------------------------------------------------------------------------------------- //
28 | 
29 | var nano = nano || {};
30 | 
31 | // ----------------------------------------------------------------------------------------------------------------- //
32 | 
33 | nano.defender_ext_id_chrome = "ggolfgbegefeeoocgjbmkembbncoadlb";
34 | 
35 | nano.defender_ext_id_edge = "ijfkmnlofajajikjhfiigelipempcklj";
36 | 
37 | // ----------------------------------------------------------------------------------------------------------------- //
38 | 


--------------------------------------------------------------------------------
/notes/privacy_policy.md:
--------------------------------------------------------------------------------
 1 | # Privacy Policy
 2 | 
 3 | This Privacy Policy (the "Policy") only applies to the latest unmodified
 4 | production builds of Nano Adblocker and Nano Defender (the "Projects")
 5 | published and distributed by `@jspenguin2017` (the "Author").
 6 | 
 7 | By using one or both of the Projects, you consent to:
 8 | - The most recent version of the Policy
 9 | 
10 | ### Data Collection
11 | 
12 | The Projects do not actively collect any data of any kind.
13 | 
14 | ### Side Channels
15 | 
16 | Nano Adblocker may connect to remote servers to download assets updates.
17 | Built-in assets are defined
18 | [here](https://github.com/NanoAdblocker/NanoCore2/blob/master/src/assets.json).
19 | You may import other assets, in which case Nano Adblocker will connect to
20 | additional servers as per your instruction.
21 | 
22 | Nano Adblocker may supply a cache buster when downloading assets updates,
23 | which may reveal your system time accurate to about 1 hour. Your timezone will
24 | be kept private. You may configure Nano Adblocker to more aggressively bypass
25 | cache in advanced settings, in which case Nano Adblocker will reveal your
26 | system time accurate to about 1 second.
27 | 
28 | Nano Defender may connect to third-party servers when doing so is required to
29 | fix a website, only the bare minimum data required to successfully perform the
30 | request will be sent.
31 | 
32 | ### Other Features
33 | 
34 | If you choose to use these features, you must consent to additional privacy
35 | policies. These features are optional and do not affect the primary
36 | functionalities of the Projects.
37 | 
38 | - [Quick Issue Reporter](https://github.com/jspenguin2017/uBlockProtector/blob/master/notes/issue-reporter.md)
39 | 
40 | ### Future Versions
41 | 
42 | The Policy may be modified at any time, with or without notice.
43 | 


--------------------------------------------------------------------------------
/patches/integration/30_1_editor_settings.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/background.js b/src/js/background.js
 2 | index dc304bef..fc7c4497 100644
 3 | --- a/src/js/background.js
 4 | +++ b/src/js/background.js
 5 | @@ -96,6 +96,8 @@ const µBlock = (( ) => { // jshint ignore:line
 6 |              hyperlinkAuditingDisabled: true,
 7 |              ignoreGenericCosmeticFilters: vAPI.webextFlavor.soup.has('mobile'),
 8 |              largeMediaSize: 50,
 9 | +            nanoEditorSoftWrap: false,
10 | +            nanoViewerSoftWrap: true,
11 |              parseAllABPHideFilters: true,
12 |              popupPanelSections: 0b111,
13 |              prefetchingDisabled: true,
14 | diff --git a/src/settings.html b/src/settings.html
15 | index dff29650..ee35eb80 100644
16 | --- a/src/settings.html
17 | +++ b/src/settings.html
18 | @@ -24,6 +24,8 @@
19 |      <div class="fieldset-header" data-i18n="nano_d_ui_group"></div>
20 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="tooltipsDisabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsTooltipsPrompt"></span></label></div>
21 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="colorBlindFriendly" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsColorBlindPrompt"></span></label></div>
22 | +    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="nanoEditorSoftWrap" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="nano_d_line_wrap_e"></span></label></div>
23 | +    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="nanoViewerSoftWrap" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="nano_d_line_wrap_v"></span></label></div>
24 |  </div>
25 |  <hr>
26 |  <div class="fieldset">
27 | 


--------------------------------------------------------------------------------
/patches/integration/10_7_filter_editor.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/1p-filters.html b/src/1p-filters.html
 2 | index 27a2c81d..44918086 100644
 3 | --- a/src/1p-filters.html
 4 | +++ b/src/1p-filters.html
 5 | @@ -5,16 +5,12 @@
 6 |  <meta name="viewport" content="width=device-width, initial-scale=1">
 7 |  <title>uBlock — Your filters</title>
 8 |  
 9 | -<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css">
10 | -<link rel="stylesheet" href="lib/codemirror/addon/search/matchesonscrollbar.css">
11 | -
12 |  <link rel="stylesheet" type="text/css" href="css/themes/default.css">
13 |  <link rel="stylesheet" href="css/common.css">
14 |  <link rel="stylesheet" href="css/fa-icons.css">
15 |  <link rel="stylesheet" href="css/dashboard-common.css">
16 |  <link rel="stylesheet" href="css/cloud-ui.css">
17 |  <link rel="stylesheet" href="css/1p-filters.css">
18 | -<link rel="stylesheet" href="css/codemirror.css">
19 |  </head>
20 |  
21 |  <body>
22 | @@ -36,15 +32,9 @@
23 |      <input id="importFilePicker" type="file" accept="text/plain">
24 |  </div>
25 |  
26 | -<script src="lib/codemirror/lib/codemirror.js"></script>
27 | -<script src="lib/codemirror/addon/display/panel.js"></script>
28 | -<script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
29 | -<script src="lib/codemirror/addon/search/matchesonscrollbar.js"></script>
30 | -<script src="lib/codemirror/addon/search/searchcursor.js"></script>
31 | -<script src="lib/codemirror/addon/selection/active-line.js"></script>
32 | -
33 | -<script src="js/codemirror/search.js"></script>
34 | -<script src="js/codemirror/ubo-static-filtering.js"></script>
35 | +<script src="lib/ace/ace.js"></script>
36 | +<script src="lib/ace/ext-searchbox.js"></script>
37 | +<script src="js/nano-editor.js"></script>
38 |  
39 |  <script src="js/fa-icons.js"></script>
40 |  <script src="js/vapi.js"></script>
41 | @@ -54,7 +44,7 @@
42 |  <script src="js/i18n.js"></script>
43 |  <script src="js/dashboard-common.js"></script>
44 |  <script src="js/cloud-ui.js"></script>
45 | -<script src="js/1p-filters.js"></script>
46 | +<script src="js/nano-1p-filters.js"></script>
47 |  
48 |  </body>
49 |  </html>
50 | 


--------------------------------------------------------------------------------
/notes/filter_syntax.md:
--------------------------------------------------------------------------------
 1 | # Filter Syntax
 2 | 
 3 | If you are not familiar with filter syntax of uBlock Origin,
 4 | [**please read this first**](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax).
 5 | 
 6 | In Nano Adblocker, most of the filter syntax are the same as uBlock Origin,
 7 | however, there are a few exceptions.
 8 | 
 9 | ## Extra Resources
10 | 
11 | Nano Adblocker has
12 | [extra resources](https://github.com/NanoAdblocker/NanoCore2/blob/master/src/snippets.js),
13 | and when a filter references one of those resources, it will not work as
14 | intended in uBlock Origin out of the box. You can, however, load these extra
15 | resources to uBlock Origin in advanced settings to make those filters work.
16 | 
17 | To combat extra stubborn websites, Nano Adblocker also has a few privileged
18 | resources. These resources, which start with `nanop-`, are very powerful
19 | so only privileged filters are allowed to use them. For security reasons,
20 | they will not work in uBlock Origin.
21 | 
22 | ## Convenience Options
23 | 
24 | Nano Adblocker and uBlock Origin will map options as follows for convenience:
25 | ```
26 |    1p -> first-party
27 |    3p -> third-party
28 |   css -> stylesheet
29 |   doc -> document
30 | ehide -> elemhide
31 | frame -> subdocument
32 | ghide -> generichide
33 | shide -> specifichide
34 |   xhr -> xmlhttprequest
35 | ```
36 | 
37 | Additionally, Nano Adblocker will map `iframe` to `subdocument`. uBlock Origin
38 | will discard filters that use the `iframe` option.
39 | 
40 | ## The option `fetch`
41 | 
42 | Nano Adblocker does not differentiate between `fetch` and `xmlhttprequest`
43 | requests and does not recognize `fetch` as an option. `fetch` requests
44 | are mapped to `xmlhttprequest` by Edgyfy. uBlock Origin on Edge differentiates
45 | between `fetch` and `xmlhttprequest` but does not recognize `fetch` as an
46 | option.
47 | 
48 | If you are a filters maintainer and this difference is causing problems for
49 | you, please let us know.
50 | 
51 | # Filter Editor
52 | 
53 | Nano Editor is powered by Ace, and most
54 | [shortcut keys](https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts)
55 | are the same.
56 | 


--------------------------------------------------------------------------------
/src/js/nano-vapi.js:
--------------------------------------------------------------------------------
 1 | // ----------------------------------------------------------------------------------------------------------------- //
 2 | 
 3 | // Nano Core 2 - An adblocker
 4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
 5 | //
 6 | // This program is free software: you can redistribute it and/or modify
 7 | // it under the terms of the GNU General Public License as published by
 8 | // the Free Software Foundation, either version 3 of the License, or
 9 | // (at your option) any later version.
10 | //
11 | // This program is distributed in the hope that it will be useful,
12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 | // GNU General Public License for more details.
15 | //
16 | // You should have received a copy of the GNU General Public License
17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
18 | 
19 | // ----------------------------------------------------------------------------------------------------------------- //
20 | 
21 | // Platform binding
22 | 
23 | // ----------------------------------------------------------------------------------------------------------------- //
24 | 
25 | "use strict";
26 | 
27 | // ----------------------------------------------------------------------------------------------------------------- //
28 | 
29 | var nAPI = nAPI || {};
30 | 
31 | // ----------------------------------------------------------------------------------------------------------------- //
32 | 
33 | nAPI.add_public_api_handler = (trusted, handler) => {
34 |     chrome.runtime.onMessageExternal.addListener((msg, sender, res) => {
35 |         if (typeof msg !== "object" || msg === null)
36 |             return;
37 | 
38 |         if (!trusted(sender.id))
39 |             return;
40 | 
41 |         if (!handler(msg))
42 |             return;
43 | 
44 |         // TODO: The handler function can return a Promise
45 | 
46 |         if (typeof res === "function")
47 |             res({ data: "ok" });
48 |     });
49 | };
50 | 
51 | // ----------------------------------------------------------------------------------------------------------------- //
52 | 


--------------------------------------------------------------------------------
/patches/20_5_other_editors_style.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/css/codemirror.css b/src/css/codemirror.css
 2 | index 5d3eafdc..e0979efb 100644
 3 | --- a/src/css/codemirror.css
 4 | +++ b/src/css/codemirror.css
 5 | @@ -22,7 +22,10 @@
 6 |      word-break: break-all;
 7 |      }
 8 |  
 9 | -.cm-s-default .cm-comment { color: #777; }
10 | +/* Order is important! */
11 | +.cm-s-default .cm-nanokeyword { color: rgb(0, 0, 255); }
12 | +.cm-s-default .cm-comment { color: rgb(191, 191, 191); }
13 | +.cm-s-default .cm-error { background-color: rgba(255, 0, 0, 0.1); color: red; }
14 |  .cm-directive { color: #333; font-weight: bold; }
15 |  .cm-staticext { color: #008; }
16 |  .cm-staticnetBlock { color: #800; }
17 | diff --git a/src/js/advanced-settings.js b/src/js/advanced-settings.js
18 | index 7c3ea045..fc992d3c 100644
19 | --- a/src/js/advanced-settings.js
20 | +++ b/src/js/advanced-settings.js
21 | @@ -45,7 +45,7 @@ CodeMirror.defineMode('raw-settings', function() {
22 |                  const match = stream.match(/\S+/);
23 |                  if ( match !== null && defaultSettings.has(match[0]) ) {
24 |                      lastSetting = match[0];
25 | -                    return 'keyword';
26 | +                    return 'nanokeyword';
27 |                  }
28 |                  stream.skipToEnd();
29 |                  return 'line-cm-error';
30 | diff --git a/src/js/whitelist.js b/src/js/whitelist.js
31 | index 546308df..2db002d3 100644
32 | --- a/src/js/whitelist.js
33 | +++ b/src/js/whitelist.js
34 | @@ -52,13 +52,13 @@ CodeMirror.defineMode("ubo-whitelist-directives", function() {
35 |              }
36 |              if ( reComment.test(line) ) {
37 |                  return whitelistDefaultSet.has(directiveFromLine(line))
38 | -                    ? 'keyword comment'
39 | +                    ? 'nanokeyword comment'
40 |                      : 'comment';
41 |              }
42 |              if ( line.indexOf('/') === -1 ) {
43 |                  if ( reBadHostname.test(line) ) { return 'error'; }
44 |                  if ( whitelistDefaultSet.has(line.trim()) ) {
45 | -                    return 'keyword';
46 | +                    return 'nanokeyword';
47 |                  }
48 |                  return null;
49 |              }
50 | 


--------------------------------------------------------------------------------
/patches/integration/10_8_filter_viewer.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/asset-viewer.html b/src/asset-viewer.html
 2 | index 9d3eaedf..5768d38e 100644
 3 | --- a/src/asset-viewer.html
 4 | +++ b/src/asset-viewer.html
 5 | @@ -4,12 +4,9 @@
 6 |  <meta charset="utf-8">
 7 |  <meta name="viewport" content="width=device-width, initial-scale=1">
 8 |  <title data-i18n="assetViewerPageName"></title>
 9 | -<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css">
10 | -<link rel="stylesheet" href="lib/codemirror/addon/search/matchesonscrollbar.css">
11 |  <link rel="stylesheet" type="text/css" href="css/themes/default.css">
12 |  <link rel="stylesheet" href="css/common.css">
13 |  <link rel="stylesheet" href="css/fa-icons.css">
14 | -<link rel="stylesheet" href="css/codemirror.css">
15 |  <link rel="shortcut icon" type="image/png" href="img/icon_16.png"/>
16 |  <style>
17 |  body {
18 | @@ -18,7 +15,7 @@ body {
19 |      overflow: hidden;
20 |      padding: 0;
21 |      }
22 | -#content {
23 | +html, body, #content {
24 |      height: 100vh;
25 |      width: 100vw;
26 |      }
27 | @@ -28,15 +25,9 @@ body {
28 |  
29 |  <div id="content" class="codeMirrorContainer codeMirrorBreakAll"></div>
30 |  
31 | -<script src="lib/codemirror/lib/codemirror.js"></script>
32 | -<script src="lib/codemirror/addon/display/panel.js"></script>
33 | -<script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
34 | -<script src="lib/codemirror/addon/search/matchesonscrollbar.js"></script>
35 | -<script src="lib/codemirror/addon/search/searchcursor.js"></script>
36 | -<script src="lib/codemirror/addon/selection/active-line.js"></script>
37 | -
38 | -<script src="js/codemirror/search.js"></script>
39 | -<script src="js/codemirror/ubo-static-filtering.js"></script>
40 | +<script src="lib/ace/ace.js"></script>
41 | +<script src="lib/ace/ext-searchbox.js"></script>
42 | +<script src="js/nano-editor.js"></script>
43 |  
44 |  <script src="js/fa-icons.js"></script>
45 |  <script src="js/vapi.js"></script>
46 | @@ -45,7 +36,7 @@ body {
47 |  <script src="js/udom.js"></script>
48 |  <script src="js/i18n.js"></script>
49 |  <script src="js/dashboard-common.js"></script>
50 | -<script src="js/asset-viewer.js"></script>
51 | +<script src="js/nano-asset-viewer.js"></script>
52 |  
53 |  </body>
54 |  </html>
55 | 


--------------------------------------------------------------------------------
/patches/integration/README.MD:
--------------------------------------------------------------------------------
 1 | # Housekeeping Patches
 2 | 
 3 | These patches must be applied in order.
 4 | 
 5 | ## Group `00`: Rebranding
 6 | 
 7 | `00_0_about.patch`: Update dashboard about tab.
 8 | 
 9 | `00_1_version_parsing.patch`: Update version string parsing.
10 | 
11 | `00_2_vapi_icon.patch`: Update `vAPI` icon handling.
12 | 
13 | `00_3_favicon.patch`: Update Favicon and dashboard icon.
14 | 
15 | ## Group `10`: Extended Background Scripts Integration
16 | 
17 | `10_0_load_scripts.patch`: Load Nano Adblocker background scripts.
18 | 
19 | `10_1_compile_flags.patch`: Integrate with compile flags.
20 | 
21 | `10_2_extended_resources.patch`: Extend resources and implement privileged
22 | filters system.
23 | 
24 | `10_3_force_recompile.patch`: Enable force recompile filters button in advanced
25 | settings page.
26 | 
27 | `10_4_extended_options.patch`: Extend filter options.
28 | 
29 | `10_5_linters.patch`: Integrate with linters.
30 | 
31 | `10_6_lint_filters.patch`: Lint filters.
32 | 
33 | `10_7_filter_editor.patch`: Enable new filter editor.
34 | 
35 | `10_8_filter_viewer.patch`: Enable new filter viewer.
36 | 
37 | ## Group `20`: Popup Changes
38 | 
39 | `20_0_force_scroll_background.patch`: Background code for force scroll mode.
40 | 
41 | `20_1_bug_reporter_background.patch`: Background code for bug reporter.
42 | 
43 | `21_0_popup_tweaks.patch`: Cosmetic tweaks to the classic popup.
44 | 
45 | `21_1_force_scroll.patch`: Force scroll button for the classic popup.
46 | 
47 | `21_2_bug_reporter.patch`: Bug reporter button for the classic popup.
48 | 
49 | `22_0_new_popup_tweaks.patch`: Cosmetic tweaks to the new popup.
50 | 
51 | `22_1_font_awesome.patch`: Integrate FontAwesome to the new popup.
52 | 
53 | `22_2_new_force_scroll.patch`: Force scroll button for the new popup.
54 | 
55 | `22_3_new_bug_reporter.patch`: Bug reporter button for the new popup.
56 | 
57 | ## Group `30`: Dashboard Changes
58 | 
59 | `30_0_settings_tweaks.patch`: Cosmetic tweaks to dashboard settings tab.
60 | 
61 | `30_1_editor_settings.patch`: Add editor settings.
62 | 
63 | `30_2_link_differences.patch`: Link documentation to differences between Nano
64 | Adblocker and uBlock Origin.
65 | 
66 | ## Group `90`: Other Changes
67 | 
68 | `90_0_settings_migration.patch`: Fix settings migration.
69 | 


--------------------------------------------------------------------------------
/notes/developer_notes.md:
--------------------------------------------------------------------------------
 1 | # Developer Notes
 2 | 
 3 | These may or may not be out of date.
 4 | 
 5 | ## General Notes
 6 | 
 7 | - `cosmetic-filtering.js > FilterContainer.prototype.compileGenericHideSelector`
 8 |   checks whether a hostname is required for the filter. If we want to keep slow
 9 |   filters, we cannot change this check, as assumption of code after will no
10 |   longer be valid, and things will break.
11 | 
12 | - `redirect-engine.js > suffersSpuriousRedirectConflicts` attempts to unbreak
13 |   HTTPS Everywhere. We usually do not like this kind of tradeoff, but
14 |   considering websites that are not using HTTPS are unlikely to use CSP, this
15 |   seems to be a reasonable tradeoff.
16 | 
17 | - `redirect-engine.js > RedirectEngine.prototype.compileRuleFromStaticFilter`
18 |   accepts `first-party` and `1p`, but not `~third-party` nor `~3p`.
19 | 
20 | - `scriptlet-filtering.js > api.compile` will convert script snippet rules with
21 |   negated domains to exception rules. If the domains do not match, it can cause
22 |   unintended behavior.
23 | 
24 | - `static-ext-filtering.js > api.compile` sometimes passes double-hash filters
25 |   with no suffix onwards to static network filtering engine. `localhost##` will
26 |   cause an error to be logged to the background console from
27 |   `static-net-filtering.js > FilterParser.prototype.parse`. `localhost#?#` and
28 |   `localhost#^#` are compiled to static network filters.
29 | 
30 | - `storage.js > µBlock.compileFilters` checks whether the filter starts with
31 |   `#` and discards the filter if it does. This is safe because double-hash
32 |   filters are already handled.
33 | 
34 | ## Other Observations
35 | 
36 | - `1p-filters.js` does not check for unsaved changes when save is initiated via
37 |   shortcut key, and will always perform a save even if there were no changes.
38 | 
39 | - `static-net-filtering.js > FilterContainer.prototype.compile` checks for
40 |   empty lines, but there seems to be no way for empty lines to enter this
41 |   function.
42 | 
43 | - `storage.js > µBlock.loadRedirectResources` checks whether `results` is an
44 |   array, but it is guaranteed to be an array as it comes from `Promise.all`.
45 | 
46 | - `storage.js > µBlock.compileFilters > reLocalIp` has a group but is never
47 |   used.
48 | 


--------------------------------------------------------------------------------
/patches/integration/22_3_new_bug_reporter.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/popup-fenix.js b/src/js/popup-fenix.js
 2 | index c39f38bd..b5e67a58 100644
 3 | --- a/src/js/popup-fenix.js
 4 | +++ b/src/js/popup-fenix.js
 5 | @@ -743,6 +743,10 @@ const nanoForceEnableScroll = function() {
 6 |      vAPI.closePopup();
 7 |  };
 8 |  
 9 | +const nanoOpenBugReporter = function() {
10 | +    vAPI.nanoOpenBugReporter(popupData.tabId);
11 | +};
12 | +
13 |  /******************************************************************************/
14 |  
15 |  const gotoURL = function(ev) {
16 | @@ -1249,6 +1253,7 @@ uDom('#switch').on('click', toggleNetFilteringSwitch);
17 |  uDom('#gotoZap').on('click', gotoZap);
18 |  uDom('#gotoPick').on('click', gotoPick);
19 |  uDom('#nanoForceEnableScroll').on('click', nanoForceEnableScroll);
20 | +uDom('#nanoOpenBugReporter').on('click', nanoOpenBugReporter);
21 |  uDom('.hnSwitch').on('click', ev => { toggleHostnameSwitch(ev); });
22 |  uDom('#saveRules').on('click', saveFirewallRules);
23 |  uDom('#revertRules').on('click', ( ) => { revertFirewallRules(); });
24 | diff --git a/src/popup-fenix.html b/src/popup-fenix.html
25 | index 548233bf..7639fee7 100644
26 | --- a/src/popup-fenix.html
27 | +++ b/src/popup-fenix.html
28 | @@ -60,6 +60,7 @@
29 |              <span id="gotoZap" class="fa-icon tool" data-i18n-title="popupTipZapper">bolt<span class="caption" data-i18n="popupTipZapper"></span></span>
30 |              <span id="gotoPick" class="fa-icon tool" data-i18n-title="popupTipPicker">eye-dropper<span class="caption" data-i18n="popupTipPicker"></span></span>
31 |              <span id="nanoForceEnableScroll" class="fa tool" data-i18n-title="nano_p_force_scroll">&#xf103;<span class="caption" data-i18n="nano_p_force_scroll"></span></span>
32 | +            <span id="nanoOpenBugReporter" class="fa tool enabled" data-i18n-title="nano_p_bug_reporter">&#xf088;<span class="caption" data-i18n="nano_p_bug_reporter"></span></span>
33 |              <a href="logger-ui.html#_" class="fa-icon tool enabled" target="uBOLogger" tabindex="0" data-i18n-title="popupTipLog">list-alt<span class="caption" data-i18n="popupTipLog"></span></a>
34 |              <a href="dashboard.html" class="fa-icon tool enabled" target="uBODashboard" tabindex="0" data-i18n-title="popupTipDashboard">sliders<span class="caption" data-i18n="popupTipDashboard"></span></a>
35 |          </div>
36 | 


--------------------------------------------------------------------------------
/patches/README.MD:
--------------------------------------------------------------------------------
 1 | # Patches
 2 | 
 3 | More changes can be found in the `integration` directory. Note that some
 4 | integration changes are handled by the build scripts.
 5 | 
 6 | These patches must be applied after integration changes. The order *sometimes*
 7 | matters, keep them in the same order when possible.
 8 | 
 9 | ## Group `00`: Bug Fixes
10 | 
11 | `00_0_textarea_spacing.patch`: Fix spacing of textarea, not all user agents
12 | default to a monospace font.
13 | 
14 | ## Group `10`: Undo Regression
15 | 
16 | `10_0_user_css.patch`: Disable UserCSS. This will unbreak the DOM inspector of
17 | the Logger on Chromium.
18 | 
19 | ## Group `20`: Minor Behavior Changes
20 | 
21 | `20_0_configuration_tweaks.patch`: Update default configuration.
22 | 
23 | `20_1_header_parsing.patch`: Update header parsing to reset update period when
24 | filters lose that header entry.
25 | 
26 | `20_2_hard_purge_any_key.patch`: Update purge button for cached assets to
27 | accept any special keys for hard purge mode.
28 | 
29 | `20_3_reset_hard.patch`: Update factory reset functionality to hard reset
30 | everything.
31 | 
32 | `20_4_log_script_snippet_errors.patch`: Log script snippet errors.
33 | 
34 | `20_5_other_editors_style.patch`: Change highlighting style of whitelist and
35 | advanced settings editors.
36 | 
37 | `20_6_autocomment_href.patch`: Add the full URL as an option for the generated
38 | filters automatic comment template.
39 | 
40 | ## Group `30`: User Interface Changes
41 | 
42 | `30_0_link_resources.patch`: Link useful resources in the dashboard.
43 | 
44 | ## Group `90`: Other Changes
45 | 
46 | `90_0_assets_migration.patch`: Legacy assets migration.
47 | 
48 | `90_1_cherry_pick_fixes.patch`: Cherry-pick of the following commits:
49 | - https://github.com/gorhill/uBlock/commit/d49a9dce66de6c3af1c31b9384293cddd96eb574
50 | - https://github.com/gorhill/uBlock/commit/a5ba668c382a3be0ba41ce0f0a69ebb090c260a5
51 | - https://github.com/gorhill/uBlock/commit/64cfc5779d87612f87bd5f9bd5581704d5795b64
52 | - https://github.com/gorhill/uBlock/commit/cb5437b1619ed4e84b7b1319b400f44f98df117a
53 | - https://github.com/gorhill/uBlock/commit/46197a11c511ec7f21632eb12ab7332c5e12354c
54 | 
55 | `90_2_resources_updates.patch`: Updates to script snippets and web accessible
56 | resources. Currently updated to upstream commit
57 | `d25b9aa30f72c817b95455a41dfb80e2fecf58b2` or `1.29.2`.
58 | 


--------------------------------------------------------------------------------
/patches/integration/10_3_force_recompile.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/advanced-settings.html b/src/advanced-settings.html
 2 | index 5afb9a0d..3bcbc7b1 100644
 3 | --- a/src/advanced-settings.html
 4 | +++ b/src/advanced-settings.html
 5 | @@ -20,6 +20,7 @@
 6 |      <p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-settings" target="_blank">&#xf05a;</a>
 7 |      <p>
 8 |          <button id="advancedSettingsApply" class="important" type="button" disabled data-i18n="genericApplyChanges"></button>&ensp;
 9 | +        <button id="nanoForceRecompile" type="button" data-i18n="nano_d_recompile_filters"></button>&ensp;
10 |  </div>
11 |  
12 |  <div id="advancedSettings" class="codeMirrorContainer"></div>
13 | diff --git a/src/js/advanced-settings.js b/src/js/advanced-settings.js
14 | index 57f53763..7c3ea045 100644
15 | --- a/src/js/advanced-settings.js
16 | +++ b/src/js/advanced-settings.js
17 | @@ -177,6 +177,14 @@ const applyChanges = async function() {
18 |  
19 |  /******************************************************************************/
20 |  
21 | +const nanoForceRecompile = function() {
22 | +    vAPI.messaging.send('dashboard', {
23 | +        what: 'nanoForceRecompile'
24 | +    });
25 | +};
26 | +
27 | +/******************************************************************************/
28 | +
29 |  uDom.nodeFromId('advancedSettings').addEventListener(
30 |      'input',
31 |      advancedSettingsChanged
32 | @@ -184,6 +192,10 @@ uDom.nodeFromId('advancedSettings').addEventListener(
33 |  uDom.nodeFromId('advancedSettingsApply').addEventListener('click', ( ) => {
34 |      applyChanges();
35 |  });
36 | +uDom.nodeFromId('nanoForceRecompile').addEventListener(
37 | +    'click',
38 | +    nanoForceRecompile
39 | +);
40 |  
41 |  renderAdvancedSettings(true);
42 |  
43 | diff --git a/src/js/messaging.js b/src/js/messaging.js
44 | index 457c38b2..de13e620 100644
45 | --- a/src/js/messaging.js
46 | +++ b/src/js/messaging.js
47 | @@ -1188,6 +1188,10 @@ const onMessage = function(request, sender, callback) {
48 |          µb.changeHiddenSettings(µb.hiddenSettingsFromString(request.content));
49 |          break;
50 |  
51 | +    case 'nanoForceRecompile':
52 | +        nano.recompile_filters();
53 | +        break;
54 | +
55 |      default:
56 |          return vAPI.messaging.UNHANDLED;
57 |      }
58 | 


--------------------------------------------------------------------------------
/patches/integration/21_1_force_scroll.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/popup.js b/src/js/popup.js
 2 | index 2799f0fb..feea0361 100644
 3 | --- a/src/js/popup.js
 4 | +++ b/src/js/popup.js
 5 | @@ -461,6 +461,7 @@ const renderPopup = function() {
 6 |                             popupData.netFilteringSwitch === true;
 7 |      uDom.nodeFromId('gotoPick').classList.toggle('enabled', canElementPicker);
 8 |      uDom.nodeFromId('gotoZap').classList.toggle('enabled', canElementPicker);
 9 | +    uDom.nodeFromId('nanoForceEnableScroll').classList.toggle('enabled', canElementPicker);
10 |  
11 |      let blocked = popupData.pageBlockedRequestCount,
12 |          total = popupData.pageAllowedRequestCount + blocked,
13 | @@ -763,6 +764,20 @@ const gotoPick = function() {
14 |  
15 |  /******************************************************************************/
16 |  
17 | +const nanoForceEnableScroll = function() {
18 | +    messaging.send(
19 | +        'popupPanel',
20 | +        {
21 | +            what: 'nanoInjectForceScrollCSS',
22 | +            tabId: popupData.tabId
23 | +        }
24 | +    );
25 | +
26 | +    vAPI.closePopup();
27 | +};
28 | +
29 | +/******************************************************************************/
30 | +
31 |  const gotoURL = function(ev) {
32 |      if ( this.hasAttribute('href') === false ) { return; }
33 |  
34 | @@ -1206,6 +1221,7 @@ const onHideTooltip = function() {
35 |  uDom('#switch .fa-icon').on('click', toggleNetFilteringSwitch);
36 |  uDom('#gotoZap').on('click', gotoZap);
37 |  uDom('#gotoPick').on('click', gotoPick);
38 | +uDom('#nanoForceEnableScroll').on('click', nanoForceEnableScroll);
39 |  uDom('#nanoFirewallPaneToggle').on('click', toggleFirewallPane);
40 |  uDom('.hnSwitch').on('click', ev => { toggleHostnameSwitch(ev); });
41 |  uDom('#saveRules').on('click', saveFirewallRules);
42 | diff --git a/src/popup.html b/src/popup.html
43 | index ebe163eb..9314430a 100644
44 | --- a/src/popup.html
45 | +++ b/src/popup.html
46 | @@ -24,6 +24,7 @@
47 |          </p>
48 |          <p id="basicTools2">
49 |              <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
50 | +            <span id="nanoForceEnableScroll" class="fa tool" data-i18n-tip="nano_p_force_scroll" data-tip-position="under">&#xf103;</span>
51 |          </p>
52 |          <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
53 |          <p class="statName">
54 | 


--------------------------------------------------------------------------------
/patches/integration/22_2_new_force_scroll.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/js/popup-fenix.js b/src/js/popup-fenix.js
 2 | index 8b074c96..c39f38bd 100644
 3 | --- a/src/js/popup-fenix.js
 4 | +++ b/src/js/popup-fenix.js
 5 | @@ -480,6 +480,7 @@ const renderPopup = function() {
 6 |      const canElementPicker = popupData.canElementPicker === true && isFiltering;
 7 |      uDom.nodeFromId('gotoPick').classList.toggle('enabled', canElementPicker);
 8 |      uDom.nodeFromId('gotoZap').classList.toggle('enabled', canElementPicker);
 9 | +    uDom.nodeFromId('nanoForceEnableScroll').classList.toggle('enabled', canElementPicker);
10 |  
11 |      let blocked = popupData.pageBlockedRequestCount;
12 |      let total = popupData.pageAllowedRequestCount + blocked;
13 | @@ -733,6 +734,17 @@ const gotoPick = function() {
14 |  
15 |  /******************************************************************************/
16 |  
17 | +const nanoForceEnableScroll = function() {
18 | +    messaging.send('popupPanel', {
19 | +        what: 'nanoInjectForceScrollCSS',
20 | +        tabId: popupData.tabId,
21 | +    });
22 | +
23 | +    vAPI.closePopup();
24 | +};
25 | +
26 | +/******************************************************************************/
27 | +
28 |  const gotoURL = function(ev) {
29 |      if ( this.hasAttribute('href') === false ) { return; }
30 |  
31 | @@ -1236,6 +1248,7 @@ const getPopupData = async function(tabId) {
32 |  uDom('#switch').on('click', toggleNetFilteringSwitch);
33 |  uDom('#gotoZap').on('click', gotoZap);
34 |  uDom('#gotoPick').on('click', gotoPick);
35 | +uDom('#nanoForceEnableScroll').on('click', nanoForceEnableScroll);
36 |  uDom('.hnSwitch').on('click', ev => { toggleHostnameSwitch(ev); });
37 |  uDom('#saveRules').on('click', saveFirewallRules);
38 |  uDom('#revertRules').on('click', ( ) => { revertFirewallRules(); });
39 | diff --git a/src/popup-fenix.html b/src/popup-fenix.html
40 | index 2f56ff6d..548233bf 100644
41 | --- a/src/popup-fenix.html
42 | +++ b/src/popup-fenix.html
43 | @@ -59,6 +59,7 @@
44 |          <div id="basicTools" class="toolRibbon" data-more="c">
45 |              <span id="gotoZap" class="fa-icon tool" data-i18n-title="popupTipZapper">bolt<span class="caption" data-i18n="popupTipZapper"></span></span>
46 |              <span id="gotoPick" class="fa-icon tool" data-i18n-title="popupTipPicker">eye-dropper<span class="caption" data-i18n="popupTipPicker"></span></span>
47 | +            <span id="nanoForceEnableScroll" class="fa tool" data-i18n-title="nano_p_force_scroll">&#xf103;<span class="caption" data-i18n="nano_p_force_scroll"></span></span>
48 |              <a href="logger-ui.html#_" class="fa-icon tool enabled" target="uBOLogger" tabindex="0" data-i18n-title="popupTipLog">list-alt<span class="caption" data-i18n="popupTipLog"></span></a>
49 |              <a href="dashboard.html" class="fa-icon tool enabled" target="uBODashboard" tabindex="0" data-i18n-title="popupTipDashboard">sliders<span class="caption" data-i18n="popupTipDashboard"></span></a>
50 |          </div>
51 | 


--------------------------------------------------------------------------------
/patches/integration/22_0_new_popup_tweaks.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
 2 | index 20627607..3f99c13f 100644
 3 | --- a/src/css/popup-fenix.css
 4 | +++ b/src/css/popup-fenix.css
 5 | @@ -70,7 +70,7 @@ hr {
 6 |      display: flex;
 7 |      fill: var(--popup-power-ink);
 8 |      flex-grow: 1;
 9 | -    font-size: 96px;
10 | +    font-size: 72px;
11 |      justify-content: center;
12 |      margin: 0 var(--popup-gap-thin);
13 |      padding: 0;
14 | @@ -104,7 +104,18 @@ body.off #switch {
15 |  .rulesetTools [id]:not(:first-of-type) {
16 |      margin-top: 0.2em;
17 |      }
18 | -body.needReload #refresh,
19 | +.rulesetTools #refresh {
20 | +    background-color: transparent;
21 | +    border: none;
22 | +    font-size: 2.9em;
23 | +    visibility: visible;
24 | +    }
25 | +body.needReload #refresh {
26 | +    fill: var(--red-60);
27 | +    }
28 | +body.needReload #refresh:hover {
29 | +    fill: var(--default-ink);
30 | +    }
31 |  body.needSave #saveRules,
32 |  body.needSave #revertRules {
33 |      visibility: visible;
34 | diff --git a/src/js/background.js b/src/js/background.js
35 | index 920072e6..dc304bef 100644
36 | --- a/src/js/background.js
37 | +++ b/src/js/background.js
38 | @@ -70,7 +70,7 @@ const µBlock = (( ) => { // jshint ignore:line
39 |          nanoMakeUserFiltersPrivileged: false,
40 |          popupFontSize: 'unset',
41 |          popupPanelDisabledSections: 0,
42 | -        popupPanelLockedSections: 0,
43 | +        popupPanelLockedSections: 39, // 0b100111
44 |          requestJournalProcessPeriod: 1000,
45 |          selfieAfter: 3,
46 |          strictBlockingBypassDuration: 120,
47 | diff --git a/src/js/popup-fenix.js b/src/js/popup-fenix.js
48 | index 579c46b9..8b074c96 100644
49 | --- a/src/js/popup-fenix.js
50 | +++ b/src/js/popup-fenix.js
51 | @@ -622,6 +622,7 @@ let renderOnce = function() {
52 |          }
53 |      }
54 |  
55 | +    uDom.nodeFromId('nano_app_name').textContent = popupData.appName;
56 |      uDom.nodeFromId('version').textContent = popupData.appVersion;
57 |  
58 |      sectionBitsToAttribute(computedSections());
59 | diff --git a/src/popup-fenix.html b/src/popup-fenix.html
60 | index 4d0c495f..2f56ff6d 100644
61 | --- a/src/popup-fenix.html
62 | +++ b/src/popup-fenix.html
63 | @@ -36,7 +36,7 @@
64 |                   --></span>
65 |                  </div>
66 |                  <div class="rulesetTools">
67 | -                    <span id="refresh" class="fa-icon">refresh</span>
68 | +                    <span id="refresh" class="fa-icon" data-i18n-title="nano_p_refresh_button">refresh</span>
69 |                  </div>
70 |              </div>
71 |              <div id="hostname"><span></span>&shy;<span></span></div>
72 | @@ -64,7 +64,7 @@
73 |          </div>
74 |          <hr data-more="f">
75 |          <div class="itemRibbon" data-more="f">
76 | -            <span data-i18n="popupVersion"></span><span id="version"></span>
77 | +            <span id="nano_app_name"></span><span id="version"></span>
78 |          </div>
79 |          <hr>
80 |          <div id="moreOrLess">
81 | 


--------------------------------------------------------------------------------
/patches/integration/00_3_favicon.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/asset-viewer.html b/src/asset-viewer.html
 2 | index e4aedc4d..9d3eaedf 100644
 3 | --- a/src/asset-viewer.html
 4 | +++ b/src/asset-viewer.html
 5 | @@ -10,7 +10,7 @@
 6 |  <link rel="stylesheet" href="css/common.css">
 7 |  <link rel="stylesheet" href="css/fa-icons.css">
 8 |  <link rel="stylesheet" href="css/codemirror.css">
 9 | -<link rel="shortcut icon" type="image/png" href="img/icon_32.png"/>
10 | +<link rel="shortcut icon" type="image/png" href="img/icon_16.png"/>
11 |  <style>
12 |  body {
13 |      border: 0;
14 | diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css
15 | index 104f98c7..bbf8ea56 100644
16 | --- a/src/css/logger-ui.css
17 | +++ b/src/css/logger-ui.css
18 | @@ -57,6 +57,18 @@ body[dir="rtl"] #pageSelector {
19 |      height: auto;
20 |      width: 1em;
21 |      }
22 | +#nano_l_logger_popup_on, #nano_l_logger_popup_off {
23 | +    filter: initial !important;
24 | +    user-select: none;
25 | +    -webkit-user-select: none;
26 | +    -moz-user-select: none;
27 | +    }
28 | +#showpopup:not(.active) > #nano_l_logger_popup_on {
29 | +    display: none;
30 | +    }
31 | +#showpopup.active > #nano_l_logger_popup_off {
32 | +    display: none;
33 | +    }
34 |  #info {
35 |      fill: #ccc;
36 |      }
37 | diff --git a/src/dashboard.html b/src/dashboard.html
38 | index 8e78909e..14a99170 100644
39 | --- a/src/dashboard.html
40 | +++ b/src/dashboard.html
41 | @@ -12,7 +12,7 @@
42 |  
43 |  <body>
44 |  <div id="dashboard-nav">
45 | -    <span class="logo" ><img data-i18n-title="extName" src="img/ublock.svg"></span><!--
46 | +    <span class="logo" ><img data-i18n-title="extName" src="img/128_on.png"></span><!--
47 |   --><span class="tabButton" data-pane="settings.html" data-i18n="settingsPageName"></span><!--
48 |   --><span class="tabButton" data-pane="3p-filters.html" data-i18n="3pPageName"></span><!--
49 |   --><span class="tabButton" data-pane="1p-filters.html" data-i18n="1pPageName"></span><!--
50 | diff --git a/src/logger-ui.html b/src/logger-ui.html
51 | index fb576eb2..976dfa5f 100644
52 | --- a/src/logger-ui.html
53 | +++ b/src/logger-ui.html
54 | @@ -23,7 +23,10 @@
55 |          </select>
56 |          <span id="refresh" class="button fa-icon disabled needdom" data-i18n-title="loggerReloadTip">refresh</span>
57 |          <span id="showdom" class="button fa-icon disabled needdom" data-i18n-title="loggerDomInspectorTip">code</span>
58 | -        <span id="showpopup" class="button ubo-icon disabled needdom" data-i18n-title="loggerPopupPanelTip"><svg><use href="/img/ublock-defs.svg#ubo-solid"></use></svg></span>
59 | +        <span id="showpopup" class="button ubo-icon disabled needdom" data-i18n-title="loggerPopupPanelTip">
60 | +            <img id="nano_l_logger_popup_off" src="img/128_off.png">
61 | +            <img id="nano_l_logger_popup_on" src="img/128_on.png">
62 | +        </span>
63 |      </div>
64 |      <div>
65 |          <a id="info" class="button fa-icon" href="https://github.com/gorhill/uBlock/wiki/The-logger" target="_blank" data-i18n-title="loggerInfoTip">info-circle</a>
66 | 


--------------------------------------------------------------------------------
/patches/integration/00_0_about.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/about.html b/src/about.html
 2 | index a7861e66..838d7d44 100644
 3 | --- a/src/about.html
 4 | +++ b/src/about.html
 5 | @@ -15,15 +15,33 @@
 6 |  <div class="body">
 7 |      <div id="aboutNameVer" class="li"></div>
 8 |      <div class="liul">
 9 | -        <div class="li">Copyright (c) Raymond Hill 2014-present</div>
10 | +        <div class="li">Copyright (c) Nano Adblocker Contributors 2017-2020</div>
11 |      </div>
12 | -    <div class="li"><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a></div>
13 | -    <div class="li"><a href="https://github.com/gorhill/uBlock/wiki" data-i18n="aboutWiki"></a></div>
14 | -    <div class="li"><a href="https://old.reddit.com/r/uBlockOrigin/" data-i18n="aboutSupport"></a></div>
15 | +    <div class="li"><a href="https://github.com/NanoAdblocker/NanoCore2/releases" data-i18n="aboutChangelog"></a></div>
16 | +    <div class="li"><a href="https://github.com/NanoAdblocker/NanoDoc" data-i18n="aboutWiki"></a></div>
17 | +    <div class="li"><a href="https://github.com/NanoAdblocker/NanoFilters/issues" data-i18n="aboutSupport"></a></div>
18 |      <div class="liul">
19 |          <div class="li"><a href="logger-ui.html" data-i18n="popupTipLog"></a></div>
20 |      </div>
21 | -    <div class="li"><a href="https://github.com/uBlockOrigin/uBlock-issues/issues" data-i18n="aboutIssues"></a></div>
22 | +    <div class="li"><a href="https://github.com/NanoAdblocker/NanoCore/issues" data-i18n="aboutIssues"></a></div>
23 | +    <div class="li"><a href="https://github.com/NanoAdblocker/NanoCore2" data-i18n="aboutCode"></a></div>
24 | +    <div class="li"><span data-i18n="aboutContributors">&nbsp;</span></div>
25 | +    <div class="liul">
26 | +        <div class="li"><a href="https://github.com/NanoAdblocker/NanoCore2/graphs/contributors" data-i18n="aboutSourceCode"></a></div>
27 | +        <div class="li"><a href="https://crowdin.com/project/nano-adblocker" data-i18n="aboutTranslations"></a></div>
28 | +        <div class="li"><a href="https://github.com/NanoAdblocker/NanoFilters/graphs/contributors" data-i18n="aboutFilterLists"></a></div>
29 | +    </div>
30 | +    <div class="li"><span data-i18n="aboutDependencies">&nbsp;</span></div>
31 | +    <div class="liul">
32 | +        <div class="li"><span><a href="https://github.com/ajaxorg/ace" target="_blank">Ace (Ajax.org Cloud9 Editor)</a> by <a href="https://ace.c9.io/">Ajax.org</a></span></div>
33 | +    </div>
34 | +    <hr>
35 | +    <div class="li"><span data-i18n="nano_d_about_based_on"></span></div>
36 | +    <div class="liul">
37 | +        <div class="li">Copyright (c) Raymond Hill 2014-2020</div>
38 | +    </div>
39 | +    <div class="li"><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a></div>
40 | +    <div class="li"><a href="https://github.com/gorhill/uBlock/wiki" data-i18n="aboutWiki"></a></div>
41 |      <div class="li"><a href="https://github.com/gorhill/uBlock" data-i18n="aboutCode"></a></div>
42 |      <div class="li"><span data-i18n="aboutContributors">&nbsp;</span></div>
43 |      <div class="liul">
44 | 


--------------------------------------------------------------------------------
/patches/90_1_cherry_pick_fixes.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
 2 | index e8718424..1f967801 100644
 3 | --- a/platform/chromium/vapi-background.js
 4 | +++ b/platform/chromium/vapi-background.js
 5 | @@ -164,7 +164,7 @@ vAPI.browserSettings = (( ) => {
 6 |                  // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/privacy/network#Browser_compatibility
 7 |                  //   Firefox 70+ supports `disable_non_proxied_udp`
 8 |                  const value =
 9 | -                    vAPI.webextFlavor.soup.has('firefox') &&
10 | +                    vAPI.webextFlavor.soup.has('firefox') === false ||
11 |                      vAPI.webextFlavor.major < 70
12 |                          ? 'default_public_interface_only'
13 |                          : 'disable_non_proxied_udp';
14 | diff --git a/platform/chromium/vapi-usercss.pseudo.js b/platform/chromium/vapi-usercss.pseudo.js
15 | index dbf55b72..4d0fda69 100644
16 | --- a/platform/chromium/vapi-usercss.pseudo.js
17 | +++ b/platform/chromium/vapi-usercss.pseudo.js
18 | @@ -365,11 +365,11 @@ vAPI.DOMFilterer = class {
19 |              let attr = node.getAttribute('style');
20 |              if ( attr === null ) {
21 |                  attr = '';
22 | -            } else if (
23 | -                attr.length !== 0 &&
24 | -                attr.charCodeAt(attr.length - 1) !== 0x3B /* ';' */
25 | -            ) {
26 | -                attr += ';';
27 | +            } else if ( attr.length !== 0 ) {
28 | +                if ( attr.endsWith('display:none!important;') ) { continue; }
29 | +                if ( attr.charCodeAt(attr.length - 1) !== 0x3B /* ';' */ ) {
30 | +                    attr += ';';
31 | +                }
32 |              }
33 |              node.setAttribute('style', attr + 'display:none!important;');
34 |          }
35 | diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
36 | index f2f67e83..c9c7a6b0 100644
37 | --- a/src/js/redirect-engine.js
38 | +++ b/src/js/redirect-engine.js
39 | @@ -469,7 +469,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
40 |      let type,
41 |          redirect = '',
42 |          srchns = [];
43 | -    for ( const option of matches[3].split(',') ) {
44 | +    for ( const option of matches[3].trim().split(/,/) ) {
45 |          if ( option.startsWith('redirect=') ) {
46 |              redirect = option.slice(9);
47 |              continue;
48 | @@ -552,7 +552,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
49 |  
50 |  /******************************************************************************/
51 |  
52 | -RedirectEngine.prototype.reFilterParser = /^(?:\|\|([^\/:?#^]+)|\*)([^$]+)?\$([^$]+)$/;
53 | +RedirectEngine.prototype.reFilterParser = /^(?:\|\|([^\/:?#^]+)|\*?)([^$]+)?\$([^$]+)$/;
54 |  
55 |  RedirectEngine.prototype.supportedTypes = new Map([
56 |      [ 'css', 'stylesheet' ],
57 | diff --git a/src/js/start.js b/src/js/start.js
58 | index cefa7cd7..bb4b9d26 100644
59 | --- a/src/js/start.js
60 | +++ b/src/js/start.js
61 | @@ -389,7 +389,7 @@ if (
62 |              )
63 |          )
64 |      ) {
65 | -        browser.browserAction.setPopup({ popup: vAPI.getURL('popup.html') });
66 | +        browser.browserAction.setPopup({ popup: 'popup.html' });
67 |      }
68 |  }
69 |  
70 | 


--------------------------------------------------------------------------------
/patches/integration/30_2_link_differences.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/1p-filters.html b/src/1p-filters.html
 2 | index 44918086..10dddd2a 100644
 3 | --- a/src/1p-filters.html
 4 | +++ b/src/1p-filters.html
 5 | @@ -18,7 +18,7 @@
 6 |  <div class="body">
 7 |      <div id="cloudWidget" class="hide" data-cloud-entry="myFiltersPane"></div>
 8 |  
 9 | -    <p class="vverbose"><span data-i18n="1pFormatHint"></span> <a class="fa info" href="https://github.com/gorhill/uBlock/wiki/Static-filter-syntax" target="_blank">&#xf05a;</a></p>
10 | +    <p class="vverbose"><span data-i18n="1pFormatHint"></span> <a class="fa info" href="https://github.com/NanoAdblocker/NanoCore2/blob/master/notes/filter_syntax.md#filter-syntax" target="_blank">&#xf05a;</a></p>
11 |      <p>
12 |          <button id="userFiltersApply" class="important iconifiable" type="button" disabled><span class="fa">&#xf00c;</span><span data-i18n="1pApplyChanges"></span></button>
13 |          <button id="userFiltersRevert" class="iconifiable" type="button" disabled><span class="fa">&#xf0e2;</span><span data-i18n="genericRevert"></span></button>
14 | diff --git a/src/advanced-settings.html b/src/advanced-settings.html
15 | index 3bcbc7b1..2a807d8b 100644
16 | --- a/src/advanced-settings.html
17 | +++ b/src/advanced-settings.html
18 | @@ -17,7 +17,7 @@
19 |  
20 |  <body>
21 |  <div class="body">
22 | -    <p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-settings" target="_blank">&#xf05a;</a>
23 | +    <p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/NanoAdblocker/NanoCore2/blob/master/notes/advanced_settings.md#advanced-settings" target="_blank">&#xf05a;</a>
24 |      <p>
25 |          <button id="advancedSettingsApply" class="important" type="button" disabled data-i18n="genericApplyChanges"></button>&ensp;
26 |          <button id="nanoForceRecompile" type="button" data-i18n="nano_d_recompile_filters"></button>&ensp;
27 | diff --git a/src/dyna-rules.html b/src/dyna-rules.html
28 | index 40cbcc17..fa3ac9aa 100644
29 | --- a/src/dyna-rules.html
30 | +++ b/src/dyna-rules.html
31 | @@ -20,7 +20,7 @@
32 |  
33 |  <div class="body">
34 |      <div id="cloudWidget" class="hide" data-cloud-entry="myRulesPane"></div>
35 | -    <p class="vverbose"><span data-i18n="rulesHint"></span> <a class="fa info" href="https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-rule-syntax" target="_blank">&#xf05a;</a></p>
36 | +    <p class="vverbose"><span data-i18n="rulesHint"></span> <a class="fa info" href="https://github.com/NanoAdblocker/NanoCore2/blob/master/notes/dashboard_my_rules.md#dashboard---my-rules" target="_blank">&#xf05a;</a></p>
37 |      <div id="diff">
38 |          <div class="tools">
39 |              <div class="ruleActions">
40 | diff --git a/src/whitelist.html b/src/whitelist.html
41 | index 2a1dbe02..13776d23 100644
42 | --- a/src/whitelist.html
43 | +++ b/src/whitelist.html
44 | @@ -22,7 +22,7 @@
45 |  <div class="body">
46 |      <div id="cloudWidget" class="hide" data-cloud-entry="whitelistPane"></div>
47 |  
48 | -    <p class="vverbose"><span data-i18n="whitelistPrompt"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Whitelist">&#xf05a;</a>
49 | +    <p class="vverbose"><span data-i18n="whitelistPrompt"></span> <a class="fa info important" href="https://github.com/NanoAdblocker/NanoCore2/blob/master/notes/dashboard_whitelist.md#dashboard---whitelist">&#xf05a;</a>
50 |      </p>
51 |      <p>
52 |          <button id="whitelistApply" class="important iconifiable" type="button" disabled><span class="fa">&#xf00c;</span><span data-i18n="whitelistApply"></span></button>
53 | 


--------------------------------------------------------------------------------
/term/syntax.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Syntax validator
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | const assert = require("assert");
 30 | const esprima = require("esprima");
 31 | const fs = require("fs-extra");
 32 | const path = require("path");
 33 | 
 34 | // ----------------------------------------------------------------------------------------------------------------- //
 35 | 
 36 | const validate_js = async (file) => {
 37 |     esprima.parse(await fs.readFile(file, "utf8"));
 38 | };
 39 | 
 40 | const validate_json = async (file) => {
 41 |     JSON.parse(await fs.readFile(file, "utf8"));
 42 | };
 43 | 
 44 | const validate_html = async (file) => {
 45 |     const name = path.parse(file).name;
 46 | 
 47 |     let expected;
 48 | 
 49 |     switch (name) {
 50 |         case "1p-filters":
 51 |             expected = "ace/ace.js";
 52 |             break;
 53 | 
 54 |         case "asset-viewer":
 55 |             expected = "nano-editor.js";
 56 |             break;
 57 | 
 58 |         case "background":
 59 |             expected = "nano-background.js";
 60 |             break;
 61 | 
 62 |         default:
 63 |             return;
 64 |     }
 65 | 
 66 |     const data = await fs.readFile(file, "utf8");
 67 | 
 68 |     assert(data.includes(expected));
 69 | };
 70 | 
 71 | // ----------------------------------------------------------------------------------------------------------------- //
 72 | 
 73 | exports.validate_dir = async (dir) => {
 74 |     const files = await fs.readdir(dir);
 75 |     let tasks = [];
 76 | 
 77 |     for (const file of files)
 78 |         tasks.push(fs.lstat(path.resolve(dir, file)));
 79 | 
 80 |     tasks = await Promise.all(tasks);
 81 | 
 82 |     for (let i = 0; i < files.length; i++) {
 83 |         assert(!tasks[i].isSymbolicLink());
 84 | 
 85 |         if (tasks[i].isDirectory()) {
 86 |             await exports.validate_dir(path.resolve(dir, files[i]));
 87 |             continue;
 88 |         }
 89 | 
 90 |         assert(tasks[i].isFile());
 91 | 
 92 |         if (files[i].endsWith(".js"))
 93 |             await validate_js(path.resolve(dir, files[i]));
 94 |         else if (files[i].endsWith(".json"))
 95 |             await validate_json(path.resolve(dir, files[i]));
 96 |         else if (files[i].endsWith(".html"))
 97 |             await validate_html(path.resolve(dir, files[i]));
 98 |     }
 99 | };
100 | 
101 | // ----------------------------------------------------------------------------------------------------------------- //
102 | 


--------------------------------------------------------------------------------
/patches/integration/90_0_settings_migration.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
 2 | index ad7813dd..e8718424 100644
 3 | --- a/platform/chromium/vapi-background.js
 4 | +++ b/platform/chromium/vapi-background.js
 5 | @@ -61,24 +61,12 @@ vAPI.app = {
 6 |      version: manifest.version,
 7 |  
 8 |      intFromVersion: function(s) {
 9 | -        const parts = s.match(/(?:^|\.|b|rc)\d+/g);
10 | -        if ( parts === null ) { return 0; }
11 | -        let vint = 0;
12 | -        for ( let i = 0; i < 4; i++ ) {
13 | -            const pstr = parts[i] || '';
14 | -            let pint;
15 | -            if ( pstr === '' ) {
16 | -                pint = 0;
17 | -            } else if ( pstr.startsWith('.') || pstr.startsWith('b') ) {
18 | -                pint = parseInt(pstr.slice(1), 10);
19 | -            } else if ( pstr.startsWith('rc') ) {
20 | -                pint = parseInt(pstr.slice(2), 10) + 100;
21 | -            } else {
22 | -                pint = parseInt(pstr, 10);
23 | -            }
24 | -            vint = vint * 1000 + pint;
25 | +        const parts = s.split('.');
26 | +        if ( parts[3] === '0' ) { // Legacy Edge
27 | +            return parseInt(parts[2], 10);
28 | +        } else {
29 | +            return parseInt(parts[3], 10);
30 |          }
31 | -        return vint;
32 |      },
33 |  
34 |      restart: function() {
35 | diff --git a/src/js/start.js b/src/js/start.js
36 | index 23db0edf..e080eb0e 100644
37 | --- a/src/js/start.js
38 | +++ b/src/js/start.js
39 | @@ -108,7 +108,7 @@ const onVersionReady = function(lastVersion) {
40 |  
41 |      // https://github.com/uBlockOrigin/uBlock-issues/issues/494
42 |      //   Remove useless per-site switches.
43 | -    if ( lastVersionInt <= 1019003007 ) {
44 | +    if ( lastVersionInt <= 111 ) {
45 |          µb.sessionSwitches.toggle('no-scripting', 'behind-the-scene', 0);
46 |          µb.permanentSwitches.toggle('no-scripting', 'behind-the-scene', 0);
47 |          µb.saveHostnameSwitches();
48 | @@ -116,19 +116,28 @@ const onVersionReady = function(lastVersion) {
49 |  
50 |      // Configure new popup panel according to classic popup panel
51 |      // configuration.
52 | -    if ( lastVersionInt !== 0 ) {
53 | -        if ( lastVersionInt <= 1026003014 ) {
54 | -            µb.userSettings.popupPanelSections =
55 | -                µb.userSettings.dynamicFilteringEnabled === true ? 0b11111 : 0b01111;
56 | -            µb.userSettings.dynamicFilteringEnabled = undefined;
57 | -            µb.saveUserSettings();
58 | -        } else if (
59 | -            lastVersionInt <= 1026003016 &&
60 | -            (µb.userSettings.popupPanelSections & 1) !== 0
61 | -        ) {
62 | +    if ( lastVersionInt !== 0 && lastVersionInt <= 142 ) {
63 | +        µb.userSettings.popupPanelSections =
64 | +            µb.userSettings.dynamicFilteringEnabled === true ? 0b1 : 0b0;
65 | +        µb.userSettings.dynamicFilteringEnabled = undefined;
66 | +        µb.saveUserSettings();
67 | +    }
68 | +
69 | +    // Migration specific to Nano
70 | +    if ( lastVersionInt !== 0 && lastVersionInt <= 145 ) {
71 | +        try {
72 | +            // Hidden settings
73 | +            µb.hiddenSettings.popupPanelDisabledSections = 0b000000;
74 | +            µb.hiddenSettings.popupPanelLockedSections   = 0b100111;
75 | +            µb.saveHiddenSettings();
76 | +            // User settings
77 |              µb.userSettings.popupPanelSections =
78 | -                (µb.userSettings.popupPanelSections << 1 | 1) & 0b111111;
79 | +                µb.userSettings.popupPanelSections ? 0b11111 : 0b01111;
80 |              µb.saveUserSettings();
81 | +            // Done
82 | +            console.log('migration finished');
83 | +        } catch (err) {
84 | +            console.error(err);
85 |          }
86 |      }
87 |  
88 | 


--------------------------------------------------------------------------------
/notes/advanced_settings.md:
--------------------------------------------------------------------------------
 1 | # Advanced Settings
 2 | 
 3 | If you are not familiar with advanced settings of uBlock Origin,
 4 | [**please read this first**](https://github.com/gorhill/uBlock/wiki/Advanced-settings).
 5 | 
 6 | ## Differences
 7 | 
 8 | In Nano Adblocker, most of the advanced settings are the same as uBlock Origin,
 9 | however, the default value of some settings are different:
10 | - `autoUpdateAssetFetchPeriod` defaults to `180` <sup>1</sup>
11 | - `autoUpdatePeriod` defaults to `4`
12 | - `extensionUpdateForceReload` defaults to `true`
13 | - `manualUpdateAssetFetchPeriod` defaults to `1` <sup>1</sup>
14 | - `popupPanelLockedSections` defaults to `39` (`0b100111`)
15 | 
16 | <sup>1</sup> When fetching assets, you should either get them all done in one
17 | burst or wait a significant delay between them. It is expensive to keep sockets
18 | open and it is even more expensive to create new ones. In fact, holding sockets
19 | open is how
20 | [Slowloris](https://en.wikipedia.org/wiki/Slowloris_(computer_security))
21 | attacks are carried out.
22 | 
23 | Beside the differences above, Nano Adblocker also offers a few more
24 | functionalities in the advanced settings page. These advanced functionalities
25 | **can change or break at any time**, make sure to back up your settings if you
26 | want to play around with them. Please open an issue when they break for you, or
27 | otherwise behave in a way that contradicts the description below. We cannot fix
28 | issues that we are not aware of, so please take the time to report them!
29 | 
30 | ### `autoCommentFilterTemplate` option
31 | 
32 | Available since 1.0.0.113
33 | 
34 | Following placeholders are also supported:
35 | - `{{nanoHref}}`: Full URL of the webpage
36 | 
37 | ### `Force recompile filters` button
38 | 
39 | Available since 1.0.0.22
40 | 
41 | When clicked, Nano Adblocker will discard compiled filters and internal selfies
42 | then restart, during which *all* filters will be recompiled. **Any unsaved
43 | changes will be discarded** during the restart and all opened extension pages
44 | will be closed.
45 | 
46 | ### `nanoIgnoreThirdPartyWhitelist` switch
47 | 
48 | Available since 1.0.0.22
49 | 
50 | Default: `false`
51 | 
52 | When set to `true`, Nano Adblocker will discard exception and `badfilter` rules
53 | from all filter lists except `My filters` when compiling filters **in the
54 | future**. Similarly, setting this switch to `false` **or turning off advanced
55 | mode** will **not** cause discarded filters to be immediately restored.
56 | 
57 | Negated domains are sometimes transformed into exception rules, and they will
58 | not be affected for now. This can change in the future.
59 | 
60 | Setting this switch to `true` **will definitely** break *many* websites and
61 | you are to fix them **by yourself**.
62 | 
63 | ### `nanoMakeThirdPartyFiltersPrivileged` switch
64 | 
65 | Available since 1.0.0.79
66 | 
67 | Default: `false`
68 | 
69 | When set to `true`, Nano Adblocker will treat all third party filter lists as
70 | privileged when compiling filters **in the future**. Similarly, setting
71 | this switch to `false` **or turning off advanced mode** will **not** cause
72 | privileged filters to be immediately removed.
73 | 
74 | Privileged filter lists have access to privileged resources. Name of
75 | privileged resources always start with `nanop-`. Nano Adblocker's own filters
76 | (Nano filters) are always privileged.
77 | 
78 | ### `nanoMakeUserFiltersPrivileged` switch
79 | 
80 | Available since 1.0.0.22
81 | 
82 | Default: `false`
83 | 
84 | When set to `true`, Nano Adblocker will treat `My filters` as privileged when
85 | compiling filters **in the future**. Similarly, setting this switch to `false`
86 | **or turning off advanced mode** will **not** cause privileged filters to be
87 | immediately removed.
88 | 
89 | Privileged filter lists have access to privileged resources. Name of
90 | privileged resources always start with `nanop-`. Nano Adblocker's own filters
91 | (Nano filters) are always privileged.
92 | 


--------------------------------------------------------------------------------
/src/js/nano-asset-viewer.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Asset viewer script
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | var nano = nano || {};
 30 | 
 31 | // ----------------------------------------------------------------------------------------------------------------- //
 32 | 
 33 | nano.active_asset = "";
 34 | 
 35 | nano.editor = new nano.Editor("content", true, true);
 36 | 
 37 | // ----------------------------------------------------------------------------------------------------------------- //
 38 | 
 39 | nano.load_settings = async () => {
 40 |     const wrap = await vAPI.messaging.send("dashboard", {
 41 |         what: "userSettings",
 42 |         name: "nanoViewerSoftWrap",
 43 |     });
 44 | 
 45 |     nano.editor.set_line_wrap(wrap !== false);
 46 | };
 47 | 
 48 | // ----------------------------------------------------------------------------------------------------------------- //
 49 | 
 50 | nano.render_filter = async () => {
 51 |     const on_msg = (details) => {
 52 |         if (details && details.content) {
 53 |             let content = details.content;
 54 | 
 55 |             if (!content.endsWith("\n"))
 56 |                 content += "\n";
 57 | 
 58 |             nano.editor.set_value_focus(content, -1);
 59 |         } else {
 60 |             nano.editor.set_value_focus("", -1);
 61 | 
 62 |             if (nano.active_asset !== "user-filters") {
 63 |                 const anno = [
 64 |                     {
 65 |                         text: vAPI.i18n("nano_v_read_error"),
 66 |                         type: "error",
 67 |                         row: 0,
 68 |                     }
 69 |                 ];
 70 |                 nano.editor.set_anno(anno);
 71 |             }
 72 |         }
 73 |     };
 74 | 
 75 |     if (nano.active_asset === "") {
 76 |         on_msg();
 77 |     } else {
 78 |         on_msg(await vAPI.messaging.send("default", {
 79 |             what: "getAssetContent",
 80 |             url: nano.active_asset,
 81 |         }));
 82 |     }
 83 | };
 84 | 
 85 | // ----------------------------------------------------------------------------------------------------------------- //
 86 | 
 87 | nano.init = async () => {
 88 |     const url = new URL(document.location);
 89 |     const params = url.searchParams;
 90 |     const key = params.get("url");
 91 | 
 92 |     if (typeof key === "string")
 93 |         nano.active_asset = key;
 94 | 
 95 |     await nano.load_settings();
 96 |     await nano.render_filter();
 97 | };
 98 | 
 99 | // ----------------------------------------------------------------------------------------------------------------- //
100 | 
101 | nano.init();
102 | 
103 | // ----------------------------------------------------------------------------------------------------------------- //
104 | 


--------------------------------------------------------------------------------
/patches/integration/10_1_compile_flags.patch:
--------------------------------------------------------------------------------
  1 | diff --git a/src/js/background.js b/src/js/background.js
  2 | index 98278f21..920072e6 100644
  3 | --- a/src/js/background.js
  4 | +++ b/src/js/background.js
  5 | @@ -65,6 +65,9 @@ const µBlock = (( ) => { // jshint ignore:line
  6 |          filterAuthorMode: false,
  7 |          loggerPopupType: 'popup',
  8 |          manualUpdateAssetFetchPeriod: 500,
  9 | +        nanoIgnoreThirdPartyWhitelist: false,
 10 | +        nanoMakeThirdPartyFiltersPrivileged: false,
 11 | +        nanoMakeUserFiltersPrivileged: false,
 12 |          popupFontSize: 'unset',
 13 |          popupPanelDisabledSections: 0,
 14 |          popupPanelLockedSections: 0,
 15 | @@ -164,6 +167,7 @@ const µBlock = (( ) => { // jshint ignore:line
 16 |          assetsBootstrapLocation: undefined,
 17 |  
 18 |          userFiltersPath: 'user-filters',
 19 | +        nanoPartialUserFiltersPath: 'nano-partial-user-filters',
 20 |          pslAssetKey: 'public_suffix_list.dat',
 21 |  
 22 |          selectedFilterLists: [],
 23 | diff --git a/src/js/static-ext-filtering.js b/src/js/static-ext-filtering.js
 24 | index 43806e76..1c2aab1a 100644
 25 | --- a/src/js/static-ext-filtering.js
 26 | +++ b/src/js/static-ext-filtering.js
 27 | @@ -900,6 +900,8 @@
 28 |          // Exception filter?
 29 |          parsed.exception = raw.charCodeAt(lpos + 1) === 0x40 /* '@' */;
 30 |  
 31 | +        if ( parsed.exception && nano.cf.strip_whitelist ) { return true; }
 32 | +
 33 |          // Extract the hostname(s), punycode if required.
 34 |          if ( lpos === 0 ) {
 35 |              parsed.hostnames = emptyArray;
 36 | diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
 37 | index 8c75be41..b88e4974 100644
 38 | --- a/src/js/static-net-filtering.js
 39 | +++ b/src/js/static-net-filtering.js
 40 | @@ -2337,6 +2337,10 @@ const FilterParser = class {
 41 |              }
 42 |              // https://github.com/uBlockOrigin/uAssets/issues/192
 43 |              if ( opt === 'badfilter' ) {
 44 | +                if ( nano.cf.strip_whitelist ) {
 45 | +                    this.unsupported = true;
 46 | +                    break;
 47 | +                }
 48 |                  this.badFilter = true;
 49 |                  continue;
 50 |              }
 51 | @@ -2422,6 +2426,10 @@ const FilterParser = class {
 52 |          // block or allow filter?
 53 |          // Important: this must be executed before parsing options
 54 |          if ( s.startsWith('@@') ) {
 55 | +            if ( nano.cf.strip_whitelist ) {
 56 | +                this.unsupported = true;
 57 | +                return this;
 58 | +            }
 59 |              this.action = AllowAction;
 60 |              s = s.slice(2);
 61 |          }
 62 | diff --git a/src/js/storage.js b/src/js/storage.js
 63 | index 9672f38f..3e0a27a4 100644
 64 | --- a/src/js/storage.js
 65 | +++ b/src/js/storage.js
 66 | @@ -418,7 +418,8 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
 67 |  
 68 |      const compiledFilters = this.compileFilters(
 69 |          filters,
 70 | -        { assetKey: this.userFiltersPath }
 71 | +        { assetKey: this.userFiltersPath },
 72 | +        nano.ub.nanoPartialUserFiltersPath
 73 |      );
 74 |      const snfe = this.staticNetFilteringEngine;
 75 |      const cfe = this.cosmeticFilteringEngine;
 76 | @@ -783,7 +784,7 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
 77 |  
 78 |  /******************************************************************************/
 79 |  
 80 | -µBlock.compileFilters = function(rawText, details) {
 81 | +µBlock.compileFilters = function(rawText, details, nanoAssetKeyOverride) {
 82 |      const writer = new this.CompiledLineIO.Writer();
 83 |  
 84 |      // Populate the writer with information potentially useful to the
 85 | @@ -794,6 +795,9 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
 86 |          }
 87 |      }
 88 |  
 89 | +    const nanoKey = nanoAssetKeyOverride || details.assetKey;
 90 | +    nano.cf.update(nanoKey);
 91 | +
 92 |      // Useful references:
 93 |      //    https://adblockplus.org/en/filter-cheatsheet
 94 |      //    https://adblockplus.org/en/filters
 95 | @@ -855,6 +859,8 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
 96 |          staticNetFilteringEngine.compile(line, writer);
 97 |      }
 98 |  
 99 | +    nano.cf.reset();
100 | +
101 |      return writer.toString();
102 |  };
103 |  
104 | 


--------------------------------------------------------------------------------
/term/term.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Terminal utilities
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | const child_process = require("child_process");
 30 | 
 31 | // ----------------------------------------------------------------------------------------------------------------- //
 32 | 
 33 | // Only one terminal manager can be active at any given time
 34 | // Unless otherwise mentioned, all methods return the keyword this
 35 | // Constructor takes in the event listener, which will receive trimmed command strings from user
 36 | 
 37 | module.exports = class {
 38 |     constructor(func) {
 39 |         if (func)
 40 |             this.set_listener(func);
 41 | 
 42 |         this._paused = false;
 43 | 
 44 |         this._handler = (line) => {
 45 |             if (this._paused)
 46 |                 return;
 47 | 
 48 |             if (this._func)
 49 |                 this._func(line.trim());
 50 |             else
 51 |                 this.write_line("ERROR: No command handler.");
 52 |         };
 53 | 
 54 |         process.stdin.setEncoding("utf8");
 55 |         process.stdin.on("data", this._handler);
 56 |         process.stdin.resume();
 57 |     }
 58 | 
 59 |     destructor() {
 60 |         process.stdin.pause();
 61 |         process.stdin.removeListener("data", this._handler);
 62 |     }
 63 | 
 64 |     title(title) {
 65 |         return this.write("\x1B]0;" + title + "\x07");
 66 |     }
 67 | 
 68 |     // String or buffer
 69 |     write(data) {
 70 |         process.stdout.write(data);
 71 |         return this;
 72 |     }
 73 | 
 74 |     // String only
 75 |     write_line(line) {
 76 |         return this.write(line + "\n");
 77 |     }
 78 | 
 79 |     // Overwrites current listener
 80 |     set_listener(func) {
 81 |         this._func = func;
 82 |         return this;
 83 |     }
 84 | 
 85 |     ready() {
 86 |         return this.write("> ");
 87 |     }
 88 | 
 89 |     // Options:
 90 |     // cwd     - Current working directory
 91 |     // on_data - Listener for stdout
 92 |     //
 93 |     // Resolves the exit code
 94 |     exec(cmd, opt, ...args) {
 95 |         return new Promise((resolve, reject) => {
 96 |             const child = child_process.spawn(cmd, args, {
 97 |                 cwd: opt.cwd,
 98 |             });
 99 | 
100 |             child.on("error", reject);
101 | 
102 |             child.stdout.setEncoding("utf8");
103 | 
104 |             child.stdout.on("data", (data) => {
105 |                 this.write(data);
106 | 
107 |                 if (opt.on_data)
108 |                     opt.on_data(data);
109 |             });
110 | 
111 |             child.stderr.setEncoding("utf8");
112 | 
113 |             child.stderr.on("data", (data) => {
114 |                 this.write(data);
115 |             });
116 | 
117 |             this._paused = true;
118 | 
119 |             const on_user_input = (data) => {
120 |                 child.stdin.write(data);
121 |             };
122 | 
123 |             process.stdin.on("data", on_user_input);
124 | 
125 |             child.on("close", (code) => {
126 |                 process.stdin.removeListener("data", on_user_input);
127 | 
128 |                 this._paused = false;
129 |                 this.write_line("Command exited with code " + code.toString());
130 | 
131 |                 resolve(code);
132 |             });
133 |         });
134 |     }
135 | };
136 | 
137 | // ----------------------------------------------------------------------------------------------------------------- //
138 | 


--------------------------------------------------------------------------------
/patches/20_0_configuration_tweaks.patch:
--------------------------------------------------------------------------------
  1 | diff --git a/src/js/assets.js b/src/js/assets.js
  2 | index efbb9353..3b529bdf 100644
  3 | --- a/src/js/assets.js
  4 | +++ b/src/js/assets.js
  5 | @@ -373,7 +373,7 @@ const registerAssetSource = function(assetKey, dict) {
  6 |          entry.contentURL = [];
  7 |      }
  8 |      if ( typeof entry.updateAfter !== 'number' ) {
  9 | -        entry.updateAfter = 5;
 10 | +        entry.updateAfter = 3;
 11 |      }
 12 |      if ( entry.submitter ) {
 13 |          entry.submitTime = Date.now(); // To detect stale entries
 14 | @@ -851,7 +851,7 @@ api.rmrf = function() {
 15 |  /******************************************************************************/
 16 |  
 17 |  // Asset updater area.
 18 | -const updaterAssetDelayDefault = 120000;
 19 | +const updaterAssetDelayDefault = 180000;
 20 |  const updaterUpdated = [];
 21 |  const updaterFetched = new Set();
 22 |  
 23 | diff --git a/src/js/background.js b/src/js/background.js
 24 | index fc7c4497..6dd56bc0 100644
 25 | --- a/src/js/background.js
 26 | +++ b/src/js/background.js
 27 | @@ -39,9 +39,9 @@ const µBlock = (( ) => { // jshint ignore:line
 28 |          allowGenericProceduralFilters: false,
 29 |          assetFetchTimeout: 30,
 30 |          autoCommentFilterTemplate: '{{date}} {{origin}}',
 31 | -        autoUpdateAssetFetchPeriod: 120,
 32 | +        autoUpdateAssetFetchPeriod: 180,
 33 |          autoUpdateDelayAfterLaunch: 180,
 34 | -        autoUpdatePeriod: 7,
 35 | +        autoUpdatePeriod: 4,
 36 |          benchmarkDatasetURL: 'unset',
 37 |          blockingProfiles: '11111/#F00 11011/#C0F 11001/#00F 00001',
 38 |          cacheStorageAPI: 'unset',
 39 | @@ -59,12 +59,12 @@ const µBlock = (( ) => { // jshint ignore:line
 40 |          debugScriptlets: false,
 41 |          debugScriptletInjector: false,
 42 |          disableWebAssembly: false,
 43 | -        extensionUpdateForceReload: false,
 44 | +        extensionUpdateForceReload: true,
 45 |          ignoreRedirectFilters: false,
 46 |          ignoreScriptInjectFilters: false,
 47 |          filterAuthorMode: false,
 48 |          loggerPopupType: 'popup',
 49 | -        manualUpdateAssetFetchPeriod: 500,
 50 | +        manualUpdateAssetFetchPeriod: 1,
 51 |          nanoIgnoreThirdPartyWhitelist: false,
 52 |          nanoMakeThirdPartyFiltersPrivileged: false,
 53 |          nanoMakeUserFiltersPrivileged: false,
 54 | @@ -94,7 +94,7 @@ const µBlock = (( ) => { // jshint ignore:line
 55 |              externalLists: [],
 56 |              firewallPaneMinimized: true,
 57 |              hyperlinkAuditingDisabled: true,
 58 | -            ignoreGenericCosmeticFilters: vAPI.webextFlavor.soup.has('mobile'),
 59 | +            ignoreGenericCosmeticFilters: false,
 60 |              largeMediaSize: 50,
 61 |              nanoEditorSoftWrap: false,
 62 |              nanoViewerSoftWrap: true,
 63 | @@ -124,8 +124,10 @@ const µBlock = (( ) => { // jshint ignore:line
 64 |              'about-scheme',
 65 |              'chrome-extension-scheme',
 66 |              'chrome-scheme',
 67 | +            'edge-extension-scheme',       // For legacy Edge
 68 |              'edge-scheme',
 69 |              'moz-extension-scheme',
 70 | +            'ms-browser-extension-scheme', // For legacy Edge
 71 |              'opera-scheme',
 72 |              'vivaldi-scheme',
 73 |              'wyciwyg-scheme',   // Firefox's "What-You-Cache-Is-What-You-Get"
 74 | diff --git a/src/js/start.js b/src/js/start.js
 75 | index e080eb0e..cefa7cd7 100644
 76 | --- a/src/js/start.js
 77 | +++ b/src/js/start.js
 78 | @@ -252,6 +252,7 @@ const createDefaultProps = function() {
 79 |          ].join('\n'),
 80 |          'urlFilteringString': '',
 81 |          'hostnameSwitchesString': [
 82 | +            'no-csp-reports: * true',
 83 |              'no-large-media: behind-the-scene false',
 84 |          ].join('\n'),
 85 |          'lastRestoreFile': '',
 86 | diff --git a/src/js/storage.js b/src/js/storage.js
 87 | index 38978579..04bae91b 100644
 88 | --- a/src/js/storage.js
 89 | +++ b/src/js/storage.js
 90 | @@ -1307,7 +1307,7 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
 91 |              next = 0;
 92 |              this.assets.updateStart({
 93 |                  delay: this.hiddenSettings.autoUpdateAssetFetchPeriod * 1000 ||
 94 | -                       120000,
 95 | +                       180000,
 96 |                  auto: true,
 97 |              });
 98 |          }, updateDelay);
 99 | @@ -1394,7 +1394,7 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
100 |              this.loadFilterLists();
101 |          }
102 |          if ( this.userSettings.autoUpdate ) {
103 | -            this.scheduleAssetUpdater(this.hiddenSettings.autoUpdatePeriod * 3600000 || 25200000);
104 | +            this.scheduleAssetUpdater(this.hiddenSettings.autoUpdatePeriod * 3600000 || 10800000);
105 |          } else {
106 |              this.scheduleAssetUpdater(0);
107 |          }
108 | 


--------------------------------------------------------------------------------
/config.nano.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Configuration file
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | (() => {
 30 | 
 31 |     return {
 32 | 
 33 |         // --------------------------------------------------------------------------------------------------------- //
 34 | 
 35 |         Patches: [
 36 | 
 37 |             // ----------------------------------------------------------------------------------------------------- //
 38 | 
 39 |             "./patches/integration/00_0_about.patch",
 40 |             "./patches/integration/00_1_version_parsing.patch",
 41 |             "./patches/integration/00_2_vapi_icon.patch",
 42 |             "./patches/integration/00_3_favicon.patch",
 43 | 
 44 |             "./patches/integration/10_0_load_scripts.patch",
 45 |             "./patches/integration/10_1_compile_flags.patch",
 46 |             "./patches/integration/10_2_extended_resources.patch",
 47 |             "./patches/integration/10_3_force_recompile.patch",
 48 |             "./patches/integration/10_4_extended_options.patch",
 49 |             "./patches/integration/10_5_linters.patch",
 50 |             "./patches/integration/10_6_lint_filters.patch",
 51 |             "./patches/integration/10_7_filter_editor.patch",
 52 |             "./patches/integration/10_8_filter_viewer.patch",
 53 | 
 54 |             "./patches/integration/20_0_force_scroll_background.patch",
 55 |             "./patches/integration/20_1_bug_reporter_background.patch",
 56 |             "./patches/integration/21_0_popup_tweaks.patch",
 57 |             "./patches/integration/21_1_force_scroll.patch",
 58 |             "./patches/integration/21_2_bug_reporter.patch",
 59 |             "./patches/integration/22_0_new_popup_tweaks.patch",
 60 |             "./patches/integration/22_1_font_awesome.patch",
 61 |             "./patches/integration/22_2_new_force_scroll.patch",
 62 |             "./patches/integration/22_3_new_bug_reporter.patch",
 63 | 
 64 |             "./patches/integration/30_0_settings_tweaks.patch",
 65 |             "./patches/integration/30_1_editor_settings.patch",
 66 |             "./patches/integration/30_2_link_differences.patch",
 67 | 
 68 |             "./patches/integration/90_0_settings_migration.patch",
 69 | 
 70 |             // ----------------------------------------------------------------------------------------------------- //
 71 | 
 72 |             "./patches/00_0_textarea_spacing.patch",
 73 | 
 74 |             "./patches/10_0_user_css.patch",
 75 | 
 76 |             "./patches/20_0_configuration_tweaks.patch",
 77 |             "./patches/20_1_header_parsing.patch",
 78 |             "./patches/20_2_hard_purge_any_key.patch",
 79 |             "./patches/20_3_reset_hard.patch",
 80 |             "./patches/20_4_log_script_snippet_errors.patch",
 81 |             "./patches/20_5_other_editors_style.patch",
 82 |             "./patches/20_6_autocomment_href.patch",
 83 | 
 84 |             "./patches/30_0_link_resources.patch",
 85 | 
 86 |             "./patches/90_0_assets_migration.patch",
 87 |             "./patches/90_1_cherry_pick_fixes.patch",
 88 |             "./patches/90_2_resources_updates.patch",
 89 | 
 90 |             // ----------------------------------------------------------------------------------------------------- //
 91 | 
 92 |         ],
 93 | 
 94 |         // --------------------------------------------------------------------------------------------------------- //
 95 | 
 96 |         Source: "./temp/uBlock/",
 97 |         Target: "./temp/NanoCore2DevEnv/",
 98 |         Output: "./temp/NanoCore2Latest.patch",
 99 | 
100 |         // --------------------------------------------------------------------------------------------------------- //
101 | 
102 |     };
103 | 
104 | })();
105 | 
106 | // ----------------------------------------------------------------------------------------------------------------- //
107 | 


--------------------------------------------------------------------------------
/notes/sanity_tests.md:
--------------------------------------------------------------------------------
  1 | # Sanity Tests
  2 | 
  3 | Until a reliable unit tests and integration tests system is up and running, a
  4 | sanity test need to be performed manually before each release.
  5 | 
  6 | ## Setup
  7 | 
  8 | **Actions**
  9 | 1. Go to the extension manager
 10 | 1. Open the details page for the sideloaded Nano Adblocker
 11 | 1. Open the background console
 12 | 1. Enable error collection
 13 | 
 14 | **Expected**
 15 | 1. No error is ever logged to the background console
 16 | 1. No error is ever collected
 17 | 
 18 | ## Dashboard
 19 | 
 20 | **Actions**
 21 | 1. Open the dashboard using the popup panel
 22 | 
 23 | **Expected**
 24 | 1. Correct icon shows in the top left corner
 25 | 
 26 | ### Settings Tab
 27 | 
 28 | **Actions**
 29 | 1. Go to `Settings` tab
 30 | 1. Click `Reset to default settings...`
 31 | 1. Confirm action
 32 | 
 33 | **Expected**
 34 | 1. The confirm prompt mentions `Nano`
 35 | 1. Settings are restored (check outdated warning markers in `Filter lists` tab)
 36 | 1. Filters cache is purged (check the last modified timestamp of `EasyList`)
 37 | 1. Filters are reloaded from the extension package (check `Network` tab of the
 38 |    background console)
 39 | 1. The subfilter of the uBlock base filter is properly loaded
 40 | 
 41 | **Actions**
 42 | 1. Open the advanced settings page
 43 | 
 44 | **Expected**
 45 | 1. Correct highlighting style is used
 46 | 
 47 | ### My Filters Tab
 48 | 
 49 | **Actions**
 50 | 1. Go to `My filters` tab
 51 | 1. Add these filters:
 52 | ```
 53 | ||www1.example.com^$mp4
 54 | ||www2.example.com^$empty
 55 | ||www3.example.com^$redirect=
 56 | ||www4.example.com^$redirect=noopjs
 57 | */*$redirect=nooptext
 58 | /[w\d]\.example\.com/$mp4
 59 | ||www5.example.com^$mp4,empty
 60 | @@||www6.example.com^$mp4
 61 | 
 62 | 1
 63 | 
 64 | ||ww2.example.com^$xmlhtprequest
 65 | 
 66 | www1.example.com#@#+js()
 67 | www2.example.com##+js()
 68 | www3.example.com##+js(nanop-click-elements-onload, a)
 69 | 
 70 | ||example.com^$csp=default-src 'none'; report-to https://other.example.com;
 71 | ```
 72 | 
 73 | **Expected**
 74 | 1. No error thrown in the background console
 75 | 1. Highlighter markers:
 76 |    1. Section `1`:
 77 |       1. Line `3`: `redirect=` marked as invalid
 78 |    1. Section `3`:
 79 |       1. Line `1`: `xmlhtprequest` marked as invalid
 80 |    1. Section `4`:
 81 |       1. Line `2`: `##+js()` marked as invalid
 82 | 1. Linter markers:
 83 |    1. Section `1`:
 84 |       1. Line `3`: `1` warning
 85 |       1. Line `4`: `1` warning
 86 |       1. Line `5`: `2` warnings
 87 |       1. Line `6`: `1` warning
 88 |       1. Line `7`: `1` error
 89 |       1. Line `8`: `1` error
 90 |    1. Section `2`:
 91 |       1. Line `1`: `1` error
 92 |    1. Section `3`:
 93 |       1. Line `1`: `1` error
 94 |    1. Section `4`:
 95 |       1. Line `2`: `1` error
 96 |       1. Line `3`: `1` error
 97 |    1. Section `5`:
 98 |       1. Line `1`: `1` error
 99 | 1. `Filter lists` tab shows `5` total filters for `My filters`
100 | 
101 | **Actions**
102 | 1. Refresh the dashboard
103 | 
104 | **Expected**
105 | 1. Warnings and errors are reloaded
106 | 
107 | **Cleanup**
108 | 1. Remove added filters
109 | 
110 | ### Whitelist Tab
111 | 
112 | **Actions**
113 | 1. Go to `Whitelist` tab
114 | 
115 | **Expected**
116 | 1. Correct highlighting style is used
117 | 
118 | ### About Tab
119 | 
120 | **Actions**
121 | 1. Go to `About` tab
122 | 
123 | **Expected**
124 | 1. Page shows the correct information
125 | 
126 | ## Popup Panel
127 | 
128 | **Actions**
129 | 1. Go to `example.com`
130 | 1. Open the popup panel
131 | 
132 | **Expected**
133 | 1. Refresh button is visible
134 | 1. 6 buttons are shown in the bottom toolbar
135 | 1. Correct extension name and version are displayed
136 | 
137 | **Actions**
138 | 1. Click `Less` until the popup panel is completely contracted
139 | 1. Click `More` twice
140 | 
141 | **Expected**
142 | 1. The top toolbar appears, then the firewall panel appears
143 | 
144 | **Actions**
145 | 1. Click `Less` twice
146 | 
147 | **Expected**
148 | 1. The firewall panel disappears, then the top toolbar disappears
149 | 
150 | **Actions**
151 | 1. Open the bug reporter using the popup panel
152 | 
153 | **Expected**
154 | 1. Quick Issue Reporter opens
155 | 1. Correct URL is filled into the form automatically
156 | 
157 | ## Logger
158 | 
159 | **Actions**
160 | 1. Open the logger using the popup panel
161 | 1. Go to `example.com`
162 | 
163 | **Expected**
164 | 1. Appropriate network requests are logged
165 | 1. Correct icons are shown in the toolbar
166 | 
167 | **Actions**
168 | 1. Bring up the popup panel inside the logger
169 | 
170 | **Expected**
171 | 1. Icon in the toolbar changes properly
172 | 1. Correct extension name and version are displayed
173 | 1. Two rows of tools are visible
174 | 1. Refresh button is visible
175 | 
176 | ## Cosmetic Filtering
177 | 
178 | **Actions**
179 | 1. Go to `https://gorhill.github.io/uBlock/tests/`
180 | 1. Click `CSS selector-based cosmetic filters`
181 | 1. Add filters as instructed
182 | 1. Reload the page
183 | 1. Wait 5 seconds
184 | 1. Repeat for `Procedural cosmetic filters`
185 | 
186 | **Expected**
187 | 1. All boxes are green and stay green
188 | 1. No highlighter marker and no linter marker in `My filters` tab
189 | 
190 | **Cleanup**
191 | 1. Remove added filters
192 | 
193 | ## Element Picker
194 | 
195 | **Actions**
196 | 1. Go to `example.com`
197 | 1. Bring up the element picker using the popup panel
198 | 1. Pick some text
199 | 1. Add the filter
200 | 1. Refresh the page
201 | 
202 | **Expected**
203 | 1. Picked text stays hidden
204 | 1. No highlight marker and no linter marker in my filters tab
205 | 
206 | **Cleanup**
207 | 1. Remove added filter
208 | 


--------------------------------------------------------------------------------
/patches/integration/21_0_popup_tweaks.patch:
--------------------------------------------------------------------------------
  1 | diff --git a/src/css/popup.css b/src/css/popup.css
  2 | index 4537769d..c08d4f98 100644
  3 | --- a/src/css/popup.css
  4 | +++ b/src/css/popup.css
  5 | @@ -11,7 +11,6 @@ h2 {
  6 |      background-color: var(--bg-popup-cell-1);
  7 |      border: 0;
  8 |      color: var(--fg-0-70);
  9 | -    cursor: pointer;
 10 |      font-size: 100%;
 11 |      font-weight: normal;
 12 |      padding: 0.2em;
 13 | @@ -94,7 +93,7 @@ p {
 14 |      color: var(--popup-power-ink);
 15 |      fill: var(--popup-power-ink);
 16 |      cursor: pointer;
 17 | -    font-size: 700%;
 18 | +    font-size: 600%;
 19 |      margin: 0;
 20 |      padding: 0;
 21 |      }
 22 | @@ -106,8 +105,12 @@ body.off #switch .fa-icon {
 23 |      color: var(--fg-0-20);
 24 |      fill: var(--fg-0-20);
 25 |      }
 26 | -#basicTools {
 27 | +#basicTools, #basicTools2 {
 28 |      margin: 1.2em 0 0.5em 0;
 29 | +    text-align: center;
 30 | +    }
 31 | +#basicTools {
 32 | +    margin-bottom: 1.2em;
 33 |      }
 34 |  .tool:first-child {
 35 |      margin-left: 0;
 36 | @@ -179,26 +182,22 @@ body.responsive #extraTools {
 37 |      fill: inherit;
 38 |      }
 39 |  
 40 | +#nanoCacheControlStrip {
 41 | +    margin: 0px;
 42 | +    }
 43 |  #refresh {
 44 | -    background-color: var(--bg-transient-notice);
 45 | -    border: 1px solid #ddc;
 46 | -    border-radius: 4px;
 47 |      cursor: pointer;
 48 | -    display: none;
 49 | +    display: flex;
 50 |      fill: var(--fg-0-50);
 51 | -    font-size: 3em;
 52 | +    font-size: 2.3em;
 53 |      justify-content: center;
 54 | -    left: 4px;
 55 |      line-height: 1;
 56 | -    padding: 0.15em;
 57 | -    position: absolute;
 58 | -    right: 4px;
 59 |      }
 60 |  body.dirty #refresh {
 61 | -    display: flex;
 62 | +    fill: var(--red-60);
 63 |      }
 64 | -body.dirty #refresh:hover {
 65 | -    fill: inherit;
 66 | +#refresh:hover {
 67 | +    fill: inherit !important;
 68 |      }
 69 |  
 70 |  #tooltip {
 71 | @@ -228,8 +227,6 @@ body[dir="rtl"] #tooltip {
 72 |      direction: rtl;
 73 |      }
 74 |  #tooltip.show {
 75 | -    transition: opacity 0.15s 0.5s;
 76 | -    -webkit-transition: opacity 0.15s 0.5s;
 77 |      visibility: visible;
 78 |      opacity: 1;
 79 |      }
 80 | diff --git a/src/js/popup.js b/src/js/popup.js
 81 | index 5442dbb2..2799f0fb 100644
 82 | --- a/src/js/popup.js
 83 | +++ b/src/js/popup.js
 84 | @@ -558,7 +558,7 @@ const renderTooltips = function(selector) {
 85 |  
 86 |  const tooltipTargetSelectors = new Map([
 87 |      [
 88 | -        '#switch',
 89 | +        '#switch .fa-icon',
 90 |          {
 91 |              state: 'body.off',
 92 |              i18n: 'popupPowerSwitchInfo',
 93 | @@ -734,7 +734,7 @@ const toggleNetFilteringSwitch = function(ev) {
 94 |          state: !uDom('body').toggleClass('off').hasClass('off'),
 95 |          tabId: popupData.tabId,
 96 |      });
 97 | -    renderTooltips('#switch');
 98 | +    renderTooltips('#switch .fa-icon');
 99 |      hashFromPopupData();
100 |  };
101 |  
102 | @@ -1203,10 +1203,10 @@ const onHideTooltip = function() {
103 |      getPopupData(tabId);
104 |  })();
105 |  
106 | -uDom('#switch').on('click', toggleNetFilteringSwitch);
107 | +uDom('#switch .fa-icon').on('click', toggleNetFilteringSwitch);
108 |  uDom('#gotoZap').on('click', gotoZap);
109 |  uDom('#gotoPick').on('click', gotoPick);
110 | -uDom('h2').on('click', toggleFirewallPane);
111 | +uDom('#nanoFirewallPaneToggle').on('click', toggleFirewallPane);
112 |  uDom('.hnSwitch').on('click', ev => { toggleHostnameSwitch(ev); });
113 |  uDom('#saveRules').on('click', saveFirewallRules);
114 |  uDom('#revertRules').on('click', ( ) => { revertFirewallRules(); });
115 | diff --git a/src/popup.html b/src/popup.html
116 | index 7df02d25..ebe163eb 100644
117 | --- a/src/popup.html
118 | +++ b/src/popup.html
119 | @@ -15,23 +15,29 @@
120 |  <div id="appinfo"><span id="appname">&nbsp;</span>&nbsp;<span id="version">&nbsp;</span></div>
121 |  <div id="panes">
122 |      <div class="tooltipContainer">
123 | -        <p id="switch" role="button" aria-label data-tip-position="under" tabindex="0"><span class="fa-icon">power-off</span></p>
124 | +        <p id="switch" role="button" tabindex="0"><span class="fa-icon" aria-label data-tip-position="under">power-off</span></p>
125 |          <p id="basicTools">
126 | -            <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
127 |              <span id="gotoPick" class="fa-icon tool" data-i18n-tip="popupTipPicker" data-tip-position="under">eye-dropper</span>
128 | +            <span id="nanoFirewallPaneToggle" class="fa tool enabled" data-i18n-tip="nano_p_open_firewall_pane" data-tip-position="under">&#xf0db;</span>
129 |              <a href="logger-ui.html#_" class="fa-icon tool enabled" aria-label="data-tip" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger" tabindex="0">list-alt</a>
130 | -            <a href="dashboard.html" class="fa-icon tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">sliders</a>
131 | +            <a href="dashboard.html" class="fa tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">&#xf0ad;</a>
132 | +        </p>
133 | +        <p id="basicTools2">
134 | +            <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
135 |          </p>
136 |          <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
137 |          <p class="statName">
138 |              <span data-i18n="popupBlockedOnThisPagePrompt">&nbsp;</span>
139 |          </p>
140 |          <p class="statValue" id="page-blocked">?</p>
141 | -        <div id="refresh" class="fa-icon">refresh</div>
142 |          <p class="statName">
143 |              <span data-i18n="popupBlockedSinceInstallPrompt">&nbsp;</span>
144 |          </p>
145 |          <p class="statValue" id="total-blocked">?</p>
146 | +        <h2 data-i18n="nano_p_cache_control">&nbsp;</h2>
147 | +        <p id="nanoCacheControlStrip">
148 | +            <span id="refresh" class="fa-icon" data-i18n-tip="nano_p_refresh_button">refresh</span>
149 | +        </p>
150 |          <h2 data-i18n="popupHitDomainCountPrompt">&nbsp;</h2>
151 |          <p class="statValue" id="popupHitDomainCount">&nbsp;</p>
152 |          <div id="extraTools">
153 | 


--------------------------------------------------------------------------------
/term/data.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Build data
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | const assert = require("assert");
 30 | 
 31 | // ----------------------------------------------------------------------------------------------------------------- //
 32 | 
 33 | exports.version = "1.0.0.153";
 34 | 
 35 | exports.based_on = [
 36 |     "uBlock Origin",
 37 |     "Version/1.27.10",
 38 |     "Commit/76eaef4",
 39 |     "UserCSS/disabled",
 40 | ].join(" ");
 41 | 
 42 | exports.chromium_id = "gabbbocakeomblphkmmnoamkioajlkfo";
 43 | 
 44 | // ----------------------------------------------------------------------------------------------------------------- //
 45 | 
 46 | exports.manifest = (browser) => {
 47 |     assert(browser === "chromium" || browser === "edge");
 48 | 
 49 |     const manifest = {
 50 |         author: "Nano Core 2 Contributors",
 51 |         background: {
 52 |             page: "background.html",
 53 |         },
 54 |         browser_action: {
 55 |             default_icon: {
 56 |                 128: "img/128_on.png",
 57 |             },
 58 |             default_popup: "popup-fenix.html",
 59 |             default_title: "Nano Adblocker",
 60 |         },
 61 |         commands: {
 62 |             "launch-element-picker": {
 63 |                 description: "__MSG_popupTipPicker__",
 64 |             },
 65 |             "launch-element-zapper": {
 66 |                 description: "__MSG_popupTipZapper__",
 67 |             },
 68 |             "launch-logger": {
 69 |                 description: "__MSG_popupTipLog__",
 70 |             },
 71 |             "open-dashboard": {
 72 |                 description: "__MSG_popupTipDashboard__",
 73 |             },
 74 |             "relax-blocking-mode": {
 75 |                 description: "__MSG_relaxBlockingMode__",
 76 |             },
 77 |         },
 78 |         content_scripts: [
 79 |             {
 80 |                 all_frames: true,
 81 |                 js: [
 82 |                     "js/vapi.js",
 83 |                     "js/vapi-client.js",
 84 |                     "js/vapi-usercss.js",
 85 |                     "js/vapi-usercss.real.js",
 86 |                     "js/vapi-usercss.pseudo.js",
 87 |                     "js/contentscript.js",
 88 |                 ],
 89 |                 matches: [
 90 |                     "http://*/*",
 91 |                     "https://*/*",
 92 |                 ],
 93 |                 run_at: "document_start",
 94 |             },
 95 |             {
 96 |                 all_frames: false,
 97 |                 js: [
 98 |                     "js/scriptlets/subscriber.js",
 99 |                 ],
100 |                 matches: [
101 |                     "http://*/*",
102 |                     "https://*/*",
103 |                 ],
104 |                 run_at: "document_idle",
105 |             },
106 |         ],
107 | 
108 |         // TODO: I do not like how this is being done upstream
109 |         //       https://bit.ly/2m2iFQx
110 |         //content_security_policy: "script-src 'self'; object-src 'self'",
111 | 
112 |         default_locale: "en",
113 |         description: "An adblocker",
114 |         icons: {
115 |             128: "img/128_on.png",
116 |         },
117 |         incognito: "split",
118 |         manifest_version: 2,
119 |         minimum_chrome_version: "51.0",
120 |         name: "Nano Adblocker",
121 |         options_ui: {
122 |             open_in_tab: true,
123 |             page: "dashboard.html",
124 |         },
125 |         permissions: [
126 |             "<all_urls>",
127 |             "contextMenus",
128 |             "privacy",
129 |             "storage",
130 |             "tabs",
131 |             "unlimitedStorage",
132 |             "webNavigation",
133 |             "webRequest",
134 |             "webRequestBlocking",
135 |         ],
136 |         storage: {
137 |             managed_schema: "managed_storage.json",
138 |         },
139 |         version: exports.version,
140 |         web_accessible_resources: [
141 |             "web_accessible_resources/*",
142 |         ],
143 |     };
144 | 
145 |     // Legaycy Edge
146 |     if (browser === "edge") {
147 |         // Edge does not care if the size is actually right but does care if the key name is right
148 |         manifest["-ms-preload"] = {
149 |             backgroundScript: "js/edgyfy.js",
150 |             contentScript: "js/edgyfy.js",
151 |         };
152 |         manifest.background.persistent = true;
153 |         manifest.browser_action.default_icon = {
154 |             "38": "img/128_on.png",
155 |         };
156 |         manifest.browser_specific_settings = {
157 |             "edge": {
158 |                 "browser_action_next_to_addressbar": true,
159 |             },
160 |         };
161 |         manifest.icons = {
162 |             "128": "img/128_on.png",
163 |             "16": "img/128_on.png",
164 |         };
165 |         delete manifest.minimum_chrome_version;
166 |         manifest.minimum_edge_version = "41.16299.248.0";
167 |         manifest.options_page = "dashboard.html";
168 |         delete manifest.options_ui;
169 |         {
170 |             const i = manifest.version.indexOf(".");
171 |             manifest.version = manifest.version.substring(i + 1) + ".0";
172 |         }
173 | 
174 |         // TODO: Remove when Edge properly support split mode
175 |         manifest.incognito = "spanning";
176 |     }
177 | 
178 |     return JSON.stringify(manifest, null, 2);
179 | };
180 | 
181 | // ----------------------------------------------------------------------------------------------------------------- //
182 | 


--------------------------------------------------------------------------------
/term/store.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Publish extension to Web Store
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | const assert = require("assert");
 30 | const fs = require("fs-extra");
 31 | const https = require("https");
 32 | const url = require("url");
 33 | 
 34 | // ----------------------------------------------------------------------------------------------------------------- //
 35 | 
 36 | // client  - Google API application client
 37 | // secret  - Google API application secret
 38 | // account - Google developer account refresh token
 39 | const credentials = require("../../Prototype/NanoCore2/credentials.js");
 40 | 
 41 | // ----------------------------------------------------------------------------------------------------------------- //
 42 | 
 43 | const serialize = (obj) => {
 44 |     let str = "";
 45 | 
 46 |     for (const key in obj) {
 47 |         if (str !== "")
 48 |             str += "&";
 49 | 
 50 |         assert(typeof obj[key] === "string");
 51 | 
 52 |         str = str + key + "=" + encodeURIComponent(obj[key]);
 53 |     }
 54 | 
 55 |     return str;
 56 | };
 57 | 
 58 | const stream_to_text = (stream, on_done, on_error) => {
 59 |     let data = "";
 60 | 
 61 |     stream.setEncoding("utf8");
 62 | 
 63 |     stream.on("data", (c) => {
 64 |         data += c;
 65 |     });
 66 | 
 67 |     stream.on("end", () => {
 68 |         on_done(data);
 69 |     });
 70 | 
 71 |     stream.on("error", on_error);
 72 | };
 73 | 
 74 | // ----------------------------------------------------------------------------------------------------------------- //
 75 | 
 76 | 
 77 | exports.publish = async (file, ext_id, term = null) => {
 78 |     assert(typeof credentials.client === "string");
 79 |     assert(typeof credentials.secret === "string");
 80 |     assert(typeof credentials.account === "string");
 81 | 
 82 |     assert(typeof ext_id === "string");
 83 | 
 84 |     const file_stat = await fs.lstat(file);
 85 | 
 86 |     assert(file.endsWith(".zip"));
 87 |     assert(!file_stat.isSymbolicLink() && file_stat.isFile());
 88 | 
 89 |     // TODO: Assertion inside event handlers are not caught by Promise
 90 | 
 91 |     const token = await new Promise((resolve, reject) => {
 92 |         const payload = serialize({
 93 |             client_id: credentials.client,
 94 |             client_secret: credentials.secret,
 95 |             refresh_token: credentials.account,
 96 |             grant_type: "refresh_token",
 97 |         });
 98 | 
 99 |         const opt = url.parse("https://accounts.google.com/o/oauth2/token");
100 | 
101 |         opt.method = "POST";
102 | 
103 |         opt.headers = {
104 |             "Content-Type": "application/x-www-form-urlencoded",
105 |             "Content-Length": Buffer.byteLength(payload),
106 |         };
107 | 
108 |         const on_response = (res) => {
109 |             stream_to_text(res, on_data, reject);
110 |         };
111 | 
112 |         const on_data = (data) => {
113 |             data = JSON.parse(data);
114 | 
115 |             assert(typeof data.access_token === "string");
116 | 
117 |             resolve(data.access_token);
118 |         };
119 | 
120 |         const req = https.request(opt, on_response);
121 | 
122 |         req.on("error", reject);
123 | 
124 |         req.end(payload);
125 |     });
126 | 
127 |     await new Promise((resolve, reject) => {
128 |         const payload = fs.createReadStream(file);
129 | 
130 |         payload.on("error", reject);
131 | 
132 |         const opt = url.parse("https://www.googleapis.com/upload/chromewebstore/v1.1/items/" + ext_id);
133 | 
134 |         opt.method = "PUT";
135 | 
136 |         opt.headers = {
137 |             Authorization: "Bearer " + token,
138 |             "X-Goog-API-Version": "2",
139 |         };
140 | 
141 |         const on_response = (res) => {
142 |             stream_to_text(res, on_data, reject);
143 |         };
144 | 
145 |         const on_data = (data) => {
146 |             data = JSON.parse(data);
147 | 
148 |             if (term) {
149 |                 term.write_line("Package uploaded.");
150 |                 term.write_line(JSON.stringify(data, null, 2));
151 |             }
152 | 
153 |             assert(data.uploadState === "SUCCESS");
154 | 
155 |             resolve();
156 |         };
157 | 
158 |         const req = https.request(opt, on_response);
159 | 
160 |         req.on("error", reject);
161 | 
162 |         payload.pipe(req);
163 |     });
164 | 
165 |     await new Promise((resolve, reject) => {
166 |         const opt = url.parse("https://www.googleapis.com/chromewebstore/v1.1/items/" + ext_id + "/publish");
167 | 
168 |         opt.method = "POST";
169 | 
170 |         opt.headers = {
171 |             "Authorization": "Bearer " + token,
172 |             "X-Goog-API-Version": "2",
173 |             "Content-Length": "0",
174 |         };
175 | 
176 |         const on_response = (res) => {
177 |             stream_to_text(res, on_data, reject);
178 |         };
179 | 
180 |         const on_data = (data) => {
181 |             data = JSON.parse(data);
182 | 
183 |             if (term) {
184 |                 term.write_line("Publish requested.");
185 |                 term.write_line(JSON.stringify(data, null, 2));
186 |             }
187 | 
188 |             assert(
189 |                 data.status.includes("OK") ||
190 |                 data.status.includes("ITEM_PENDING_REVIEW") ||
191 |                 data.status.includes("PUBLISHED_WITH_FRICTION_WARNING")
192 |             );
193 | 
194 |             resolve();
195 |         };
196 | 
197 |         const req = https.request(opt, on_response);
198 | 
199 |         req.on("error", reject);
200 | 
201 |         req.end();
202 |     });
203 | };
204 | 
205 | // ----------------------------------------------------------------------------------------------------------------- //
206 | 


--------------------------------------------------------------------------------
/term/crowdin.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Crowdin project helper
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | const fs = require("fs-extra");
 30 | const https = require("https");
 31 | const path = require("path");
 32 | const url = require("url");
 33 | const yauzl = require("yauzl");
 34 | 
 35 | // ----------------------------------------------------------------------------------------------------------------- //
 36 | 
 37 | // Supported locales
 38 | // Crowdin key to Chromium key
 39 | const locales = new Map([
 40 |     ["es-ES", "es"],
 41 |     ["de", "de"],
 42 |     ["fi", "fi"],
 43 |     ["it", "it"],
 44 |     ["ja", "ja"],
 45 |     ["nb", "nb"],
 46 |     ["pl", "pl"],
 47 |     ["pt-BR", "pt_BR"],
 48 |     ["ru", "ru"],
 49 |     ["sv-SE", "sv"],
 50 |     ["tr", "tr"],
 51 |     ["zh-CN", "zh_CN"],
 52 |     ["zh-TW", "zh_TW"],
 53 | ]);
 54 | 
 55 | // ----------------------------------------------------------------------------------------------------------------- //
 56 | 
 57 | const stream_to_buffer = (stream, on_done, on_error) => {
 58 |     const data = [];
 59 | 
 60 |     stream.on("data", (chunk) => {
 61 |         data.push(chunk);
 62 |     });
 63 | 
 64 |     stream.on("end", () => {
 65 |         on_done(Buffer.concat(data));
 66 |     });
 67 | 
 68 |     stream.on("error", on_error);
 69 | };
 70 | 
 71 | const download = (link, on_done, on_error, no_redir = false) => {
 72 |     const opt = url.parse(link);
 73 | 
 74 |     const req = https.request(opt, (res) => {
 75 |         if (res.statusCode === 301 || res.statusCode === 302 || res.statusCode === 307 || res.statusCode === 308) {
 76 |             const new_link = res.headers["location"];
 77 | 
 78 |             if (no_redir)
 79 |                 on_error(new Error("Too many redirects."));
 80 |             else if (typeof new_link !== "string" || !new_link.startsWith("https://"))
 81 |                 on_error(new Error("Bad server response."));
 82 |             else
 83 |                 download(new_link, on_done, on_error, true);
 84 | 
 85 |             res.resume();
 86 | 
 87 |             return;
 88 |         }
 89 | 
 90 |         if (res.statusCode !== 200) {
 91 |             on_error(new Error("Connection error."));
 92 | 
 93 |             res.resume();
 94 | 
 95 |             return;
 96 |         }
 97 | 
 98 |         stream_to_buffer(res, on_done, on_error);
 99 |     });
100 | 
101 |     req.on("error", on_error);
102 | 
103 |     req.end();
104 | };
105 | 
106 | // Validates JSON
107 | const validated_write = (file, stream, on_done, on_error) => {
108 |     let data = "";
109 | 
110 |     stream.setEncoding("utf8");
111 | 
112 |     stream.on("data", (c) => {
113 |         data += c;
114 |     });
115 | 
116 |     const on_end = () => {
117 |         try {
118 |             data = JSON.parse(data);
119 |         } catch (err) {
120 |             return void on_error(err);
121 |         }
122 | 
123 |         fs.writeFile(file, JSON.stringify(data, null, 2), on_wrote);
124 |     };
125 | 
126 |     const on_wrote = (err) => {
127 |         if (err)
128 |             on_error(err);
129 |         else
130 |             on_done();
131 |     };
132 | 
133 |     stream.on("end", on_end);
134 | 
135 |     stream.on("error", on_error);
136 | };
137 | 
138 | // ----------------------------------------------------------------------------------------------------------------- //
139 | 
140 | // Download, safely unpack, validate, then build supported non-English locales from Crowdin
141 | // Note that you still have to manually build the project on Crowdin when there are changes
142 | exports.sync = async () => {
143 |     const file = await new Promise((resolve, reject) => {
144 |         download("https://crowdin.com/backend/download/project/nano-adblocker.zip", resolve, reject);
145 |     });
146 | 
147 |     await new Promise((resolve, reject) => {
148 |         const done = new Set();
149 | 
150 |         yauzl.fromBuffer(file, { lazyEntries: true }, (err, zip) => {
151 |             if (err)
152 |                 return void reject(err);
153 | 
154 |             const next = () => {
155 |                 zip.readEntry();
156 |             };
157 | 
158 |             zip.on("entry", (entry) => {
159 |                 const name = entry.fileName;
160 | 
161 |                 if (name.endsWith("/"))
162 |                     return void next();
163 | 
164 |                 const [key, messages, ...rest] = name.split("/");
165 | 
166 |                 if (messages !== "messages.json" || rest.length !== 0)
167 |                     return void reject(new Error("Unexpected file '" + name + "'"));
168 |                 if (!locales.has(key))
169 |                     return void reject(new Error("Locale '" + key + "' is not recognized."));
170 | 
171 |                 const norm_key = locales.get(key);
172 | 
173 |                 done.add(key);
174 | 
175 |                 const outdir = path.resolve("./src/_locales", norm_key);
176 | 
177 |                 fs.mkdirp(outdir, (err) => {
178 |                     if (err)
179 |                         return void reject(err);
180 | 
181 |                     zip.openReadStream(entry, (err, stream) => {
182 |                         if (err)
183 |                             return void reject(err);
184 | 
185 |                         validated_write(path.resolve(outdir, "messages.json"), stream, next, reject);
186 |                     });
187 |                 });
188 |             });
189 | 
190 |             zip.on("end", () => {
191 |                 if (locales.size !== done.size)
192 |                     reject(new Error("Some locale files are missing."));
193 |                 else
194 |                     resolve();
195 |             });
196 | 
197 |             zip.on("error", reject);
198 | 
199 |             next();
200 |         });
201 |     });
202 | };
203 | 
204 | // ----------------------------------------------------------------------------------------------------------------- //
205 | 


--------------------------------------------------------------------------------
/README.MD:
--------------------------------------------------------------------------------
  1 | # Important Announcements Regarding Recent Changes
  2 | 
  3 | Please read important announcements here: https://github.com/NanoAdblocker/NanoCore/issues/362
  4 | 
  5 | # Nano Core 2
  6 | 
  7 | Restarting fresh
  8 | 
  9 | A patch driven fork of uBlock Origin.
 10 | 
 11 | Upstream commit pin: `76eaef4d2b13bbc1b64d230182cac8f6523a9b17` or `1.27.10`
 12 | 
 13 | **Please submit issues to the
 14 | [Nano Core issues tracker](https://github.com/NanoAdblocker/NanoCore/issues).**
 15 | 
 16 | ## Localization
 17 | 
 18 | Nano Core 2 has some extra locale strings, most of them are for Nano Linter.
 19 | 
 20 | You can contribute to localization here:
 21 | https://crowdin.com/project/nano-adblocker
 22 | 
 23 | Your language is not listed? Submit an issue to let me know.
 24 | 
 25 | ## Setup
 26 | 
 27 | 1. Install latest version of Git and Node.js.
 28 | 1. In an appropriate directory, run:
 29 |    1. `git clone --depth 1 https://github.com/NanoAdblocker/NanoCore2.git`
 30 |    1. `git clone --depth 1 https://github.com/NanoAdblocker/NanoFilters.git`
 31 |    1. `git clone --depth 1 https://github.com/jspenguin2017/Edgyfy.git`
 32 |    1. `git clone --depth 1 https://github.com/jspenguin2017/uBlockProtector`
 33 | 1. Run `git clone https://github.com/gorhill/uBlock.git` in an appropriate
 34 |    directory to get upstream. Check out a tag or commit as appropriate.
 35 | 1. In Nano Core 2 repository:
 36 |    1. Navigate to `/term` directory and run `npm install`.
 37 |    1. Update `/config.nano.js` as appropriate.
 38 |    1. Run `node ./term` to open Nano Core 2 Terminal.
 39 | 
 40 | Note: The private repository `Prototype` is required for publishing.
 41 | 
 42 | ## Development
 43 | 
 44 | You should not modify the upstream repository, instead, use Nano Core 2
 45 | Terminal to create and manage development environment.
 46 | 
 47 | ```
 48 | reset    Delete development environment and create a fresh one using upstream
 49 |          repository, uncommitted changes in the fresh development environment
 50 |          will be cleared
 51 | apply    Apply all existing patches, in order, starting from the beginning
 52 | sync     Resynchronize all existing patches, in order, starting from the
 53 |          beginning
 54 | cont     Clear uncommitted changes and continue to resynchronize patches
 55 |          starting from the last one that failed or from the beginning as
 56 |          appropriate
 57 | mark     Create a patch based on the difference between tip of resynchronize
 58 |          patches and current code in development environment
 59 | 
 60 | make     Build extension from development environment
 61 | pack     Build, test, then package the extension
 62 | check    Check the syntax of files under the "/src" directory
 63 | publish  Build, test, package, then publish the extension
 64 |          Optionally pass browser name to publish for only one browser
 65 | clean    Remove all build files
 66 | 
 67 | lmake    Build English locale file from locale definition
 68 | lsync    Synchronize (non-English) locale files with the latest build of the
 69 |          Crowdin project
 70 |          This will not rebuild the Crowdin project even if there are changes
 71 | 
 72 | config   Print active configuration data
 73 | reload   Reload configuration data
 74 | exit     Exit the terminal
 75 | ```
 76 | 
 77 | ### Creating a New Patch
 78 | 
 79 | 1. Run `mark`
 80 | 1. Copy generated patch file to an appropriate directory
 81 | 1. Give the new patch a good name
 82 | 1. Add it to the README file
 83 | 1. Add it to the configuration file
 84 | 1. Run `reload` in the Terminal
 85 | 
 86 | ### Renaming a Patch
 87 | 
 88 | 1. Give the patch a new name
 89 | 1. Update the README file
 90 | 1. Update the configuration file
 91 | 1. Run `reload` in the Terminal
 92 | 
 93 | ### Removing a Patch
 94 | 
 95 | 1. Delete the patch file
 96 | 1. Update the README file
 97 | 1. Update the configuration file
 98 | 1. Run `reload` in the Terminal
 99 | 
100 | ## Version Update Checklist
101 | 
102 | 1. Pull filters updates
103 | 1. If needed, pull upstream updates then update about string and commit pin
104 | 1. If needed, pull upstream updates to build scripts
105 | 1. If needed, pull upstream updates to `assets.json` and `manifest.json`
106 | 1. If needed, pull upstream updates to `1p-filters.js` and `asset-viewer.js`
107 | 1. If needed, build and pull locale updates
108 | 1. Bump version number
109 | 1. Perform [sanity tests](notes/sanity_tests.md)
110 | 1. Add tags to repositories, and upload packages
111 | 1. Upload packages to extension stores
112 | 
113 | ## Version Update Extended Checklist
114 | 
115 | These are the potential problems to look out for:
116 | 
117 | 1. Changes to development build detection logic
118 | 1. Changes to Font Awesome related CSS
119 | 1. Changes to image resources
120 |    - Update build scripts to adapt
121 | 1. Changes to `/assets` directory structure
122 | 1. Changes to `scriptlets.js` format
123 |    - Update build scripts and extended script snippets manifest to adapt
124 | 1. Changes to redirect declaration maps format in `redirect-engine.js`
125 |    - Update `nano-background.js` to adapt
126 | 1. Renaming or removal of `messaging` and `popupData` variables in `popup.js`
127 |    and `popup-fenix.js`
128 | 1. Changes to filters header parsing logic in `storage.js`
129 |    - Update MirrorEngine to adapt
130 | 1. Changes to CNAME uncloaking Chromium support
131 |    - Consider changing the default settings to disabled
132 | 1. Changes to local IP detection logic in `storage.js`
133 |    - Update build scripts in NanoFilters and NanoMeow legacy server to adapt
134 | 1. Changes to filters syntax
135 |    - Update NanoFilters, NanoContrib, and Nano Defender Integration to adapt
136 | 1. Changes to documented behaviors
137 |    - Update documentations in NanoCore, NanoCore2, and NanoDoc to adapt
138 | 
139 | ## Assets Manifest Update Checklist
140 | 
141 | 1. When assets are removed
142 |    - Open an issue in UltimateMirror to schedule removal of matching mirrored
143 |      file
144 |    - Remove the mirrored file after a few months
145 | 1. When assets that are enabled by default have changed
146 |    - Update NanoFilters build scripts
147 |    - Delete and refresh third party assets cache
148 | 
149 | ## Subresource Integrity Incidence Response Protocol
150 | 
151 | When there is a severe issue with the content of a subresource, an intervention
152 | can be easily placed with the help of
153 | [UltimateMirror](https://github.com/NanoMeow/UltimateMirror) and
154 | [MirrorEngine](https://github.com/NanoMeow/MirrorEngine):
155 | 
156 | 1. Lock the subresource in UltimateMirror
157 | 1. Remove problematic content from UltimateMirror, if needed
158 | 1. Update `assets.json` so the sanitized subresource will be loaded from
159 |    UltimateMirror
160 | 
161 | Later, the intervention can be lifted as follows:
162 | 
163 | 1. Update `assets.json` as appropriate, the subresource should no longer be
164 |    loaded from UltimateMirror
165 | 1. Wait a bit for cache to expire (takes about 10 minutes), then restart
166 |    MirrorEngine
167 | 1. Unlock the subresource in UltimateMirror
168 | 
169 | ## External Dependencies
170 | 
171 | 1. Ace
172 |    - `src-noconflict/ace.js` `15.04.20` (`1.4.10`)
173 |    - `src-noconflict/ext-searchbox.js` `21.02.19`
174 | 
175 | ## Tips
176 | 
177 | To update a patch, simply paste further changes to the bottom of that patch and
178 | `sync` them in.
179 | 
180 | To fix conflict, either edit the broken patch file manually or disable it along
181 | with patches after it then recreate the changes.
182 | 


--------------------------------------------------------------------------------
/patches/integration/30_0_settings_tweaks.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/src/settings.html b/src/settings.html
 2 | index 78a36ea2..dff29650 100644
 3 | --- a/src/settings.html
 4 | +++ b/src/settings.html
 5 | @@ -16,27 +16,31 @@
 6 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="collapseBlocked" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsCollapseBlockedPrompt"></span></label></div>
 7 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="showIconBadge" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsIconBadgePrompt"></span></label></div>
 8 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="contextMenuEnabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsContextMenuPrompt"></span></label></div>
 9 | -    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="tooltipsDisabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsTooltipsPrompt"></span></label></div>
10 | -    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="colorBlindFriendly" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsColorBlindPrompt"></span></label></div>
11 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="cloudStorageEnabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsCloudStorageEnabledPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Cloud-storage" target="_blank">info-circle</a></span></label></div>
12 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="advancedUserEnabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsAdvancedUserPrompt"></span>&nbsp;<a class="fa-icon info" href="advanced-settings.html" data-i18n-title="settingsAdvancedUserSettings">cogs</a></span></label></div>
13 |  </div>
14 |  <hr>
15 | +<div class="fieldset">
16 | +    <div class="fieldset-header" data-i18n="nano_d_ui_group"></div>
17 | +    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="tooltipsDisabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsTooltipsPrompt"></span></label></div>
18 | +    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="colorBlindFriendly" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="settingsColorBlindPrompt"></span></label></div>
19 | +</div>
20 | +<hr>
21 |  <div class="fieldset">
22 |      <div class="fieldset-header" data-i18n="3pGroupPrivacy"></div>
23 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="prefetchingDisabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsPrefetchingDisabledPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Settings#disable-pre-fetching" target="_blank">info-circle</a></span></label></div>
24 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="hyperlinkAuditingDisabled" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsHyperlinkAuditingDisabledPrompt"></span>&nbsp;<a class="fa-icon info important" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Settings#disable-hyperlink-auditing" target="_blank">info-circle</a></span></label></div>
25 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="webrtcIPAddressHidden" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsWebRTCIPAddressHiddenPrompt"></span>&nbsp;<a class="fa-icon info important" href="https://github.com/gorhill/uBlock/wiki/Prevent-WebRTC-from-leaking-local-IP-address" target="_blank">info-circle</a></span></label></div>
26 | -    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noCSPReports" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoCSPReportsPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Settings#block-csp-reports" target="_blank">info-circle</a></span></label></div>
27 |  </div>
28 |  <hr>
29 |  <div class="fieldset">
30 |      <div class="fieldset-header" data-i18n="settingPerSiteSwitchGroup"></div>
31 |      <div class="li synopsis"><legend><span data-i18n="settingPerSiteSwitchGroupSynopsis"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Per-site-switches" target="_blank">info-circle</a></legend></div>
32 | -    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noCosmeticFiltering" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoCosmeticFilteringPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-cosmetic-filtering" target="_blank">info-circle</a></span></label></div>
33 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noLargeMedia" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoLargeMediaPrompt"><input type="number" min="0"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-large-media-elements" target="_blank">info-circle</a></span></label></div>
34 | +    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noCosmeticFiltering" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoCosmeticFilteringPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-cosmetic-filtering" target="_blank">info-circle</a></span></label></div>
35 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noRemoteFonts" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoRemoteFontsPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-remote-fonts" target="_blank">info-circle</a></span></label></div>
36 |      <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noScripting" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoScriptingPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-scripting" target="_blank">info-circle</a></span></label></div>
37 | +    <div class="li"><label><span class="input checkbox"><input type="checkbox" data-setting-name="noCSPReports" data-setting-type="bool"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="settingsNoCSPReportsPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Settings#block-csp-reports" target="_blank">info-circle</a></span></label></div>
38 |  </div>
39 |  <hr>
40 |  <div id="localData" class="fieldset">
41 | 


--------------------------------------------------------------------------------
/src/js/nano-1p-filters.js:
--------------------------------------------------------------------------------
  1 | // ----------------------------------------------------------------------------------------------------------------- //
  2 | 
  3 | // Nano Core 2 - An adblocker
  4 | // Copyright (C) 2018-2019  Nano Core 2 contributors
  5 | //
  6 | // This program is free software: you can redistribute it and/or modify
  7 | // it under the terms of the GNU General Public License as published by
  8 | // the Free Software Foundation, either version 3 of the License, or
  9 | // (at your option) any later version.
 10 | //
 11 | // This program is distributed in the hope that it will be useful,
 12 | // but WITHOUT ANY WARRANTY; without even the implied warranty of
 13 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 14 | // GNU General Public License for more details.
 15 | //
 16 | // You should have received a copy of the GNU General Public License
 17 | // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 18 | 
 19 | // ----------------------------------------------------------------------------------------------------------------- //
 20 | 
 21 | // Dashboard my filters tab script
 22 | 
 23 | // ----------------------------------------------------------------------------------------------------------------- //
 24 | 
 25 | "use strict";
 26 | 
 27 | // ----------------------------------------------------------------------------------------------------------------- //
 28 | 
 29 | var nano = nano || {};
 30 | 
 31 | // ----------------------------------------------------------------------------------------------------------------- //
 32 | 
 33 | nano.filters_cache = "";
 34 | 
 35 | nano.editor = new nano.Editor("userFilters", true, false);
 36 | 
 37 | nano.has_unsaved_changes = false;
 38 | 
 39 | // ----------------------------------------------------------------------------------------------------------------- //
 40 | 
 41 | window.hasUnsavedData = () => {
 42 |     return nano.has_unsaved_changes;
 43 | };
 44 | 
 45 | // ----------------------------------------------------------------------------------------------------------------- //
 46 | 
 47 | nano.load_settings = async () => {
 48 |     const wrap = await vAPI.messaging.send("dashboard", {
 49 |         what: "userSettings",
 50 |         name: "nanoEditorSoftWrap",
 51 |     });
 52 | 
 53 |     nano.editor.set_line_wrap(wrap === true);
 54 |     nano.render_filters(true);
 55 | };
 56 | 
 57 | // ----------------------------------------------------------------------------------------------------------------- //
 58 | 
 59 | nano.render_filters = async (first) => {
 60 |     const details = await vAPI.messaging.send("dashboard", {
 61 |         what: "readUserFilters",
 62 |     });
 63 | 
 64 |     if (details instanceof Object === false || details.error)
 65 |         return;
 66 | 
 67 |     let content = details.content.trim();
 68 | 
 69 |     nano.filters_cache = content;
 70 | 
 71 |     if (content.length > 0)
 72 |         content += "\n";
 73 |     nano.editor.set_value_focus(content);
 74 | 
 75 |     nano.filters_changed(false);
 76 |     nano.render_anno();
 77 | 
 78 |     if (first)
 79 |         nano.editor.reset_undo();
 80 | };
 81 | 
 82 | nano.render_anno = async () => {
 83 |     const data = await vAPI.messaging.send("dashboard", {
 84 |         what: "nanoGetFilterLinterResult",
 85 |     });
 86 | 
 87 |     if (data)
 88 |         nano.editor.set_anno(data.errors.concat(data.warnings));
 89 | };
 90 | 
 91 | // ----------------------------------------------------------------------------------------------------------------- //
 92 | 
 93 | nano.filters_changed = (changed) => {
 94 |     if (typeof changed !== "boolean")
 95 |         changed = nano.editor.get_unix_value().trim() !== nano.filters_cache;
 96 | 
 97 |     const apply_disable = (id, disabled) => {
 98 |         const elem = document.getElementById(id);
 99 |         if (disabled)
100 |             elem.setAttribute("disabled", "");
101 |         else
102 |             elem.removeAttribute("disabled");
103 |     };
104 | 
105 |     apply_disable("userFiltersApply", !changed);
106 |     apply_disable("userFiltersRevert", !changed);
107 | 
108 |     nano.has_unsaved_changes = changed;
109 | };
110 | 
111 | nano.filters_saved = () => {
112 |     vAPI.messaging.send("dashboard", {
113 |         what: "reloadAllFilters",
114 |     });
115 | 
116 |     const btn = document.getElementById("userFiltersApply");
117 |     btn.setAttribute("disabled", "");
118 | 
119 |     // Wait a bit for filters to finish compiling
120 |     setTimeout(nano.render_anno, 1000);
121 | };
122 | 
123 | nano.filters_apply = async () => {
124 |     const details = await vAPI.messaging.send("dashboard", {
125 |         what: "writeUserFilters",
126 |         content: nano.editor.get_unix_value(),
127 |     });
128 | 
129 |     if (details instanceof Object === false || details.error)
130 |         return;
131 | 
132 |     nano.filters_cache = details.content.trim();
133 |     nano.editor.set_value_focus(details.content);
134 | 
135 |     nano.filters_changed(false);
136 |     nano.filters_saved();
137 | 
138 |     // TODO: Set the cursor back to its original position?
139 |     // TODO: Clear undo history?
140 | };
141 | 
142 | nano.filters_revert = () => {
143 |     let content = nano.filters_cache;
144 | 
145 |     if (content.length > 0)
146 |         content += "\n";
147 | 
148 |     nano.editor.set_value_focus(content);
149 |     nano.filters_changed(false);
150 | };
151 | 
152 | // ----------------------------------------------------------------------------------------------------------------- //
153 | 
154 | nano.import_picked = function () {
155 |     const abp_importer = (s) => {
156 |         const re_abp_subscription_extractor =
157 |             /\n\[Subscription\]\n+url=~[^\n]+([\x08-\x7E]*?)(?:\[Subscription\]|$)/ig;
158 |         const re_abp_filter_extractor = /\[Subscription filters\]([\x08-\x7E]*?)(?:\[Subscription\]|$)/i;
159 | 
160 |         let matches = re_abp_subscription_extractor.exec(s);
161 | 
162 |         if (matches === null)
163 |             return s;
164 | 
165 |         const out = [];
166 | 
167 |         do {
168 |             if (matches.length === 2) {
169 |                 let filter_match = re_abp_filter_extractor.exec(matches[1].trim());
170 |                 if (filter_match !== null && filter_match.length === 2)
171 |                     out.push(filter_match[1].trim().replace(/\\\[/g, "["));
172 |             }
173 |             matches = re_abp_subscription_extractor.exec(s);
174 |         } while (matches !== null);
175 | 
176 |         return out.join("\n");
177 |     };
178 | 
179 |     const on_file_reader_load = function () {
180 |         let content = abp_importer(this.result);
181 |         content = uBlockDashboard.mergeNewLines(nano.editor.get_unix_value().trim(), content);
182 | 
183 |         nano.editor.set_value_focus(content + "\n");
184 |         nano.filters_changed();
185 |     };
186 | 
187 |     const file = this.files[0];
188 | 
189 |     if (file === undefined || file.name === "")
190 |         return;
191 |     if (!file.type.startsWith("text"))
192 |         return;
193 | 
194 |     const fr = new FileReader();
195 |     fr.onload = on_file_reader_load;
196 |     fr.readAsText(file);
197 | };
198 | 
199 | nano.import_filters = () => {
200 |     const input = document.getElementById("importFilePicker");
201 |     input.value = "";
202 |     input.click();
203 | };
204 | 
205 | // ----------------------------------------------------------------------------------------------------------------- //
206 | 
207 | nano.export_filters = () => {
208 |     const val = nano.editor.get_platform_value().trim();
209 | 
210 |     if (val === "")
211 |         return;
212 | 
213 |     const filename = vAPI.i18n("1pExportFilename")
214 |         .replace("{{datetime}}", uBlockDashboard.dateNowToSensibleString())
215 |         .replace(/ +/g, "_");
216 | 
217 |     vAPI.download({
218 |         "url": "data:text/plain;charset=utf-8," + encodeURIComponent(val + nano.editor.get_platform_line_break()),
219 |         "filename": filename,
220 |     });
221 | };
222 | 
223 | // ----------------------------------------------------------------------------------------------------------------- //
224 | 
225 | nano.init = () => {
226 |     let elem = document.getElementById("importUserFiltersFromFile");
227 |     elem.addEventListener("click", nano.import_filters);
228 | 
229 |     elem = document.getElementById("importFilePicker");
230 |     elem.addEventListener("change", nano.import_picked);
231 | 
232 |     elem = document.getElementById("exportUserFiltersToFile");
233 |     elem.addEventListener("click", nano.export_filters);
234 | 
235 |     elem = document.getElementById("userFiltersApply");
236 |     elem.addEventListener("click", nano.filters_apply);
237 | 
238 |     elem = document.getElementById("userFiltersRevert");
239 |     elem.addEventListener("click", nano.filters_revert);
240 | 
241 |     nano.editor.on("change", nano.filters_changed);
242 |     nano.load_settings();
243 | };
244 | 
245 | // ----------------------------------------------------------------------------------------------------------------- //
246 | 
247 | cloud.onPush = () => {
248 |     return nano.editor.get_unix_value();
249 | };
250 | 
251 | cloud.onPull = (data, append) => {
252 |     if (typeof data !== "string")
253 |         return;
254 | 
255 |     if (append)
256 |         data = uBlockDashboard.mergeNewLines(nano.editor.get_unix_value(), data);
257 | 
258 |     nano.editor.set_value_focus(data);
259 |     nano.filters_changed();
260 | };
261 | 
262 | // ----------------------------------------------------------------------------------------------------------------- //
263 | 
264 | nano.init();
265 | 
266 | nano.editor.on_key("save", "Ctrl-S", () => {
267 |     const btn = document.getElementById("userFiltersApply");
268 |     btn.click();
269 | });
270 | 
271 | // ----------------------------------------------------------------------------------------------------------------- //
272 | 


--------------------------------------------------------------------------------
/src/_locales/zh_CN/messages.json:
--------------------------------------------------------------------------------
  1 | {
  2 |   "nano_d_ui_group": {
  3 |     "message": "界面",
  4 |     "description": "Group 'User interface' of settings tab"
  5 |   },
  6 |   "nano_d_line_wrap_e": {
  7 |     "message": "在规则编辑器中启用自动换行（ soft warp ）",
  8 |     "description": "English: Soft wrap long lines in filter editor"
  9 |   },
 10 |   "nano_d_line_wrap_v": {
 11 |     "message": "在规则查看器中启用自动换行（ soft warp ）",
 12 |     "description": "English: Soft wrap long lines in filter viewer"
 13 |   },
 14 |   "nano_d_recompile_filters": {
 15 |     "message": "强制重新编译规则",
 16 |     "description": "Button in advanced settings to recompile filters"
 17 |   },
 18 |   "nano_d_resources_links": {
 19 |     "message": "Nano 拥有两套资源，<a href='https://github.com/gorhill/uBlock/wiki/Resources-Library'> uBlock Origin 的资源</a>和<a href='https://github.com/NanoAdblocker/NanoCore2/blob/master/src/snippets.js'> Nano 的额外资源</a>。",
 20 |     "description": "Resources reference links, 'Resources' and 'Extra Resources' should be translated"
 21 |   },
 22 |   "nano_d_ace_help": {
 23 |     "message": "Nano 规则编辑器是由 Ace 驱动的，大部分快捷键都一样。",
 24 |     "description": "[Not Used] Explain the similarity between Nano Filter Editor and Ace in terms of shortcut keys"
 25 |   },
 26 |   "nano_d_about_based_on": {
 27 |     "message": "基于 {{@data}}",
 28 |     "description": "English: Based on {{@data}}"
 29 |   },
 30 |   "nano_v_title": {
 31 |     "message": "Nano — 规则查看器",
 32 |     "description": "Title of the filter viewer"
 33 |   },
 34 |   "nano_v_read_error": {
 35 |     "message": "内容读取失败，请刷新。",
 36 |     "description": "Message when filter content could not be loaded"
 37 |   },
 38 |   "nano_p_cache_control": {
 39 |     "message": "缓存控制",
 40 |     "description": "The cache control strip name, can be at most 20 English characters wide"
 41 |   },
 42 |   "nano_p_open_firewall_pane": {
 43 |     "message": "显示或隐藏概要边窗",
 44 |     "description": "Tooltip for toggle firewall details (sometimes called overview panel) button"
 45 |   },
 46 |   "nano_p_refresh_button": {
 47 |     "message": "单击：刷新当前页面\n\nCtrl + 单击：无视缓存并刷新当前页面",
 48 |     "description": "English: Click to refresh this page.\n\nCtrl+click to refresh this page while bypassing cache."
 49 |   },
 50 |   "nano_p_force_scroll": {
 51 |     "message": "（测试阶段）进入强制滚动模式（会破坏布局）",
 52 |     "description": "Tooltip for force scroll button"
 53 |   },
 54 |   "nano_p_bug_reporter": {
 55 |     "message": "（测试阶段）打开问题汇报器",
 56 |     "description": "Tooltip for bug reporter button"
 57 |   },
 58 |   "nano_l_whitelist_aborted_w": {
 59 |     "message": "Nano 没有检查剩下的白名单，因为已经有过多的警告。",
 60 |     "description": "Warning when too many warnings in whitelists"
 61 |   },
 62 |   "nano_l_whitelist_suspecious_re": {
 63 |     "message": "这行被解析成了正则表达式，您确定这是正确的么？",
 64 |     "description": "Warning when parsed as regular expression but is unlikely the intention of user"
 65 |   },
 66 |   "nano_l_whitelist_aborted_e": {
 67 |     "message": "Nano 没有验证剩下的白名单，因为已经有过多的错误。",
 68 |     "description": "Error when too many errors in whitelists"
 69 |   },
 70 |   "nano_l_whitelist_invalid_hostname": {
 71 |     "message": "这个主机名称无效。",
 72 |     "description": "Error when hostname not valid"
 73 |   },
 74 |   "nano_l_whitelist_invalid_re": {
 75 |     "message": "这个正则表达式有语法错误。",
 76 |     "description": "Error when regular expression has syntax errors"
 77 |   },
 78 |   "nano_l_whitelist_invalid_url": {
 79 |     "message": "这个网址无效。",
 80 |     "description": "Error when a URL not valid"
 81 |   },
 82 |   "nano_l_filter_aborted_w": {
 83 |     "message": "Nano 没有检查剩下的规则，因为已经有过多的警告。",
 84 |     "description": "Warning when too many warnings in filter rules"
 85 |   },
 86 |   "nano_l_filter_script_snippet_double_exception": {
 87 |     "message": "Nano 弃置了一个反选域名，因为它不能在脚本片段注入例外规则中使用。",
 88 |     "description": "Warning when negated domain used with script snippet exception"
 89 |   },
 90 |   "nano_l_filter_converted_to_exception": {
 91 |     "message": "Nano 将这个规则转换成了一个例外规则，因为它只有反选域名。",
 92 |     "description": "Warning when a rule is convered to exception because all negated domains"
 93 |   },
 94 |   "nano_l_filter_negated_html_filtering": {
 95 |     "message": "反选域名暂时不能在 HTML 文档过滤规则中使用。",
 96 |     "description": "Warning when negated domains used with HTML filtering"
 97 |   },
 98 |   "nano_l_filter_discarded_non_negatable_type": {
 99 |     "message": "Nano 弃置了 '{{type}}' 类型选项，因为它不能被反选。",
100 |     "description": "[Not Used] English: Nano discarded the type option '{{type}}' because it cannot be negated."
101 |   },
102 |   "nano_l_filter_expanded_mp4_option": {
103 |     "message": "Nano 将 'mp4' 选项替换成了 'media,redirect=noop-1s.mp4' 。",
104 |     "description": "Warning when 'mp4' is replaced"
105 |   },
106 |   "nano_l_filter_unsupported_type_ignored": {
107 |     "message": "Nano 弃置了目前不支持的类型选项。",
108 |     "description": "Warning when unsupported types discarded but not entire rule"
109 |   },
110 |   "nano_l_filter_resource_not_found": {
111 |     "message": "资源 '{{res}}' 不存在，您确定拼写是正确的么？",
112 |     "description": "Warning when resource not found"
113 |   },
114 |   "nano_l_filter_resource_not_redirectable": {
115 |     "message": "资源 '{{res}}' 不能用作重定向目标。",
116 |     "description": "Warning when resource not redirectable"
117 |   },
118 |   "nano_l_filter_resource_not_injectable": {
119 |     "message": "资源 '{{res}}' 不能当作脚本片段注入。",
120 |     "description": "Warning when resource not injectable"
121 |   },
122 |   "nano_l_filter_resource_alias_used": {
123 |     "message": "'{{alias}}' 是 '{{res}}' 的别名，请考虑使用原名。",
124 |     "description": "Warning when resource alias used"
125 |   },
126 |   "nano_l_html_filtering_not_supported": {
127 |     "message": "您的浏览器不支持 HTML 过滤。",
128 |     "description": "Warning when HTML filtering is used on unsupported platforms"
129 |   },
130 |   "nano_l_filter_comment_bracket": {
131 |     "message": "用 '[' 来标注注解是不赞成的，请改用 '!' 。",
132 |     "description": "Deprecation when '[' used for comments"
133 |   },
134 |   "nano_l_filter_inline_comment": {
135 |     "message": "内联注解是不赞成的。",
136 |     "description": "Deprecation when inline comments"
137 |   },
138 |   "nano_l_filter_script_contains": {
139 |     "message": "'##script:contains(...)' 是不赞成的，请改用 '##^script:has-text(...)' 。",
140 |     "description": "Deprecation when 'script:contains' is used"
141 |   },
142 |   "nano_l_filter_mp4_option": {
143 |     "message": "使用 'mp4' 选项是不赞成的，请写出完整的选项。",
144 |     "description": "Deprecation when 'mp4'"
145 |   },
146 |   "nano_l_filter_aborted_e": {
147 |     "message": "Nano 没有验证剩下的规则，因为已经有过多的错误。",
148 |     "description": "Error when too many errors in filter rules"
149 |   },
150 |   "nano_l_filter_ag_js_injection": {
151 |     "message": "为了防止安全隐患，未经审查的 JavaScript 脚本注入是不允许的。",
152 |     "description": "Error when raw JavaScript injection"
153 |   },
154 |   "nano_l_filter_bad_selector": {
155 |     "message": "这个规则的选择器有语法错误。",
156 |     "description": "Error when selector has syntax errors"
157 |   },
158 |   "nano_l_filter_too_expensive": {
159 |     "message": "这个规则不能为泛型。",
160 |     "description": "Error when expensive rule is generic"
161 |   },
162 |   "nano_l_filter_style_injection_syntax_error": {
163 |     "message": "这个 CSS 注入规则有语法错误。",
164 |     "description": "Error when CSS injection has syntax errors"
165 |   },
166 |   "nano_l_filter_assets_access_violation": {
167 |     "message": "低权限的规则列表不能使用高权限列表专用的资源。",
168 |     "description": "Error when unprivileged filter references a privileged resources"
169 |   },
170 |   "nano_l_filter_localhost_entry": {
171 |     "message": "这个主机名条目已被弃置，因为它是本地主机声明。",
172 |     "description": "Error when localhost declaration"
173 |   },
174 |   "nano_l_filter_ag_element_remove": {
175 |     "message": "元素移除规则暂时不支持 AdGuard 的语法，请改用 '##^' 。",
176 |     "description": "Error when AdGuard style element remove rule"
177 |   },
178 |   "nano_l_filter_negated_generichide": {
179 |     "message": "'generichide' ， 'ghide' ，和 'elemhide' 选项不能被反选。",
180 |     "description": "Error when 'generichide' is negated"
181 |   },
182 |   "nano_l_filter_bad_domain_option_arguments": {
183 |     "message": "这个 'domain=...' 选项有无效参数。",
184 |     "description": "Error when 'domain=' has invalid arguments"
185 |   },
186 |   "nano_l_filter_bad_denyallow_option_arguments": {
187 |     "message": "这个 'denyallow=...' 选项有无效的参数。",
188 |     "description": "Error when 'denyallow=' has invalid arguments"
189 |   },
190 |   "nano_l_filter_bad_csp_option_arguments": {
191 |     "message": "这个 'csp=...' 选项没有参数或有无效参数。",
192 |     "description": "Error when 'csp=' has no arguments or has invalid arguments"
193 |   },
194 |   "nano_l_filter_unknown_option": {
195 |     "message": "'{{option}}' 选项未能被识别。",
196 |     "description": "English: The option '{{option}}' is not recognized."
197 |   },
198 |   "nano_l_filter_only_unsupported_type": {
199 |     "message": "这个规则只选择了不被支持的类型选项。",
200 |     "description": "Error when filter rule selected only unsupported types"
201 |   },
202 |   "nano_l_filter_no_type": {
203 |     "message": "这个规则明确地选择了零个类型选项。",
204 |     "description": "Error when filter rule explicitly selected no types"
205 |   },
206 |   "nano_l_filter_bad_re": {
207 |     "message": "这个网络过滤规则的正则表达式有语法错误。",
208 |     "description": "Error when network rule has regular expression syntax errors"
209 |   },
210 |   "nano_l_filter_too_short": {
211 |     "message": "这个网络过滤规则太短了。",
212 |     "description": "Error when network rule is too short"
213 |   },
214 |   "nano_l_filter_matcher_too_long": {
215 |     "message": "此网络规则的匹配器太长了。",
216 |     "description": "Error when network matcher is too long"
217 |   },
218 |   "nano_l_filter_generic_js_in_block": {
219 |     "message": "选择了所有资源的脚本注入语法只能在例外规则中使用。",
220 |     "description": "Error when '##+js()' is used"
221 |   },
222 |   "nano_l_filter_intervention_smed79": {
223 |     "message": "'^' 不能紧跟在域名锚点的后面。",
224 |     "description": "Error when the bad rule from SMed79 is discarded"
225 |   },
226 |   "nano_r_no_type": {
227 |     "message": "Nano 弃置了此规则的重定向部分，因为它必须选择一个类型选项。",
228 |     "description": "Warning when redirect selected no types"
229 |   },
230 |   "nano_r_too_many_types": {
231 |     "message": "Nano 弃置了此规则的重定向部分，因为它选择了太多类型选项。",
232 |     "description": "Warning when redirect selected too many types"
233 |   },
234 |   "nano_r_no_resource_token": {
235 |     "message": "Nano 弃置了此规则的重定向部分，因为它没有参数。",
236 |     "description": "Warning when redirect has no arguments"
237 |   },
238 |   "nano_r_no_supported_type": {
239 |     "message": "Nano 弃置了此规则的重定向部分，因为它没有选择任何被支持的类型选项。",
240 |     "description": "Warning when redirect selected no supported type"
241 |   },
242 |   "nano_r_negated_domain": {
243 |     "message": "Nano 弃置了此规则的重定向部分的一部分，因为反选域名不能与重定向一起使用。",
244 |     "description": "Warning when negated domain used with redirect"
245 |   },
246 |   "nano_r_no_destination": {
247 |     "message": "Nano 弃置了此规则的重定向部分，因为它没有有效的目标域名。",
248 |     "description": "Warning when redirect has no destination"
249 |   },
250 |   "nano_r_does_not_match_re": {
251 |     "message": "Nano 弃置了此规则的重定向部分，因为此网络规则与这个正则表达式不匹配： {{regexp}}",
252 |     "description": "Warning when redirect failed initial test, use '{{regexp}}' to denote the tester if needed"
253 |   },
254 |   "nano_r_simplified_to_star": {
255 |     "message": "Nano 将此规则的匹配器简化为 '*'。",
256 |     "description": "Warning when the '*/*' workaround is simplified"
257 |   },
258 |   "nano_r_redirect_in_exception": {
259 |     "message": "重定向规则不能是例外。",
260 |     "description": "Error when redirect used in exception"
261 |   },
262 |   "nano_r_redirected_twice": {
263 |     "message": "重定向规则只能包含一个重定向指令。",
264 |     "description": "Error when two redirects in one rule"
265 |   },
266 |   "nano_b_cosmetic_filter_passed_through": {
267 |     "message": "这个规则暂时无效。更多信息：https://github.com/NanoAdblocker/NanoCore/issues/77",
268 |     "description": "https://github.com/NanoAdblocker/NanoCore/issues/77"
269 |   }
270 | }


--------------------------------------------------------------------------------
/src/_locales/zh_TW/messages.json:
--------------------------------------------------------------------------------
  1 | {
  2 |   "nano_d_ui_group": {
  3 |     "message": "界面",
  4 |     "description": "Group 'User interface' of settings tab"
  5 |   },
  6 |   "nano_d_line_wrap_e": {
  7 |     "message": "在過濾規則編輯器中啟用自動換行（soft warp）",
  8 |     "description": "English: Soft wrap long lines in filter editor"
  9 |   },
 10 |   "nano_d_line_wrap_v": {
 11 |     "message": "在過濾規則檢視器中啟用自動換行（soft warp）",
 12 |     "description": "English: Soft wrap long lines in filter viewer"
 13 |   },
 14 |   "nano_d_recompile_filters": {
 15 |     "message": "強制重新編譯過濾規則",
 16 |     "description": "Button in advanced settings to recompile filters"
 17 |   },
 18 |   "nano_d_resources_links": {
 19 |     "message": "Nano 擁有兩組資源，<a href='https://github.com/gorhill/uBlock/wiki/Resources-Library'> uBlock Origin 的資源</a>和<a href='https://github.com/NanoAdblocker/NanoCore2/blob/master/src/snippets.js'> Nano 的額外資源</a>。",
 20 |     "description": "Resources reference links, 'Resources' and 'Extra Resources' should be translated"
 21 |   },
 22 |   "nano_d_ace_help": {
 23 |     "message": "Nano 過濾規則編輯器是由 Ace 驅動的，大部分快速鍵都一樣。",
 24 |     "description": "[Not Used] Explain the similarity between Nano Filter Editor and Ace in terms of shortcut keys"
 25 |   },
 26 |   "nano_d_about_based_on": {
 27 |     "message": "基於 {{@data}}",
 28 |     "description": "English: Based on {{@data}}"
 29 |   },
 30 |   "nano_v_title": {
 31 |     "message": "Nano — 過濾規則檢視器",
 32 |     "description": "Title of the filter viewer"
 33 |   },
 34 |   "nano_v_read_error": {
 35 |     "message": "內容讀取失敗，請重新整理。",
 36 |     "description": "Message when filter content could not be loaded"
 37 |   },
 38 |   "nano_p_cache_control": {
 39 |     "message": "快取控制",
 40 |     "description": "The cache control strip name, can be at most 20 English characters wide"
 41 |   },
 42 |   "nano_p_open_firewall_pane": {
 43 |     "message": "顯示或隱藏概要邊窗",
 44 |     "description": "Tooltip for toggle firewall details (sometimes called overview panel) button"
 45 |   },
 46 |   "nano_p_refresh_button": {
 47 |     "message": "按一下：重新整理目前頁面\n\nCtrl + 按一下：無視快取並重新整理目前頁面",
 48 |     "description": "English: Click to refresh this page.\n\nCtrl+click to refresh this page while bypassing cache."
 49 |   },
 50 |   "nano_p_force_scroll": {
 51 |     "message": "（測試階段）進入強制捲動模式（會破壞佈局）",
 52 |     "description": "Tooltip for force scroll button"
 53 |   },
 54 |   "nano_p_bug_reporter": {
 55 |     "message": "（測試階段）打開錯誤報告器",
 56 |     "description": "Tooltip for bug reporter button"
 57 |   },
 58 |   "nano_l_whitelist_aborted_w": {
 59 |     "message": "Nano 沒有檢查剩下的白名單，因為已經有太多的警告。",
 60 |     "description": "Warning when too many warnings in whitelists"
 61 |   },
 62 |   "nano_l_whitelist_suspecious_re": {
 63 |     "message": "這行被解析成了正則表示式，您確定這是正確的嗎？",
 64 |     "description": "Warning when parsed as regular expression but is unlikely the intention of user"
 65 |   },
 66 |   "nano_l_whitelist_aborted_e": {
 67 |     "message": "Nano 沒有驗證剩下的白名單，因為已經有太多錯誤。",
 68 |     "description": "Error when too many errors in whitelists"
 69 |   },
 70 |   "nano_l_whitelist_invalid_hostname": {
 71 |     "message": "這個主機名稱無效。",
 72 |     "description": "Error when hostname not valid"
 73 |   },
 74 |   "nano_l_whitelist_invalid_re": {
 75 |     "message": "這個正規表示式有語法錯誤。",
 76 |     "description": "Error when regular expression has syntax errors"
 77 |   },
 78 |   "nano_l_whitelist_invalid_url": {
 79 |     "message": "這個網址無效 。",
 80 |     "description": "Error when a URL not valid"
 81 |   },
 82 |   "nano_l_filter_aborted_w": {
 83 |     "message": "Nano 沒有檢查剩下的過濾規則，因為已經有太多的警告。",
 84 |     "description": "Warning when too many warnings in filter rules"
 85 |   },
 86 |   "nano_l_filter_script_snippet_double_exception": {
 87 |     "message": "Nano 放棄了一個反選網域，因為它不能在指令碼語言片段中被例外規則使用。",
 88 |     "description": "Warning when negated domain used with script snippet exception"
 89 |   },
 90 |   "nano_l_filter_converted_to_exception": {
 91 |     "message": "Nano 將這個規則轉換成了一個例外規則，因為它只有反選網域。",
 92 |     "description": "Warning when a rule is convered to exception because all negated domains"
 93 |   },
 94 |   "nano_l_filter_negated_html_filtering": {
 95 |     "message": "反選網域暫時不能在 HTML 文檔過濾規則中使用。",
 96 |     "description": "Warning when negated domains used with HTML filtering"
 97 |   },
 98 |   "nano_l_filter_discarded_non_negatable_type": {
 99 |     "message": "Nano 捨棄了 '{{type}}' 類型選項，因為它不能被反選。",
100 |     "description": "[Not Used] English: Nano discarded the type option '{{type}}' because it cannot be negated."
101 |   },
102 |   "nano_l_filter_expanded_mp4_option": {
103 |     "message": "Nano 將 'mp4' 選項取代為 'media,redirect=noop-1s.mp4' 。",
104 |     "description": "Warning when 'mp4' is replaced"
105 |   },
106 |   "nano_l_filter_unsupported_type_ignored": {
107 |     "message": "Nano 捨棄了目前不支持的類型選項。",
108 |     "description": "Warning when unsupported types discarded but not entire rule"
109 |   },
110 |   "nano_l_filter_resource_not_found": {
111 |     "message": "找不到資源 ‘{{res}}’ ，拼寫是否正確？",
112 |     "description": "Warning when resource not found"
113 |   },
114 |   "nano_l_filter_resource_not_redirectable": {
115 |     "message": "資源 '{{res}}' 不能作爲重新導向的目標。",
116 |     "description": "Warning when resource not redirectable"
117 |   },
118 |   "nano_l_filter_resource_not_injectable": {
119 |     "message": "資源 '{{res}}' 不能作爲腳本片段注入。",
120 |     "description": "Warning when resource not injectable"
121 |   },
122 |   "nano_l_filter_resource_alias_used": {
123 |     "message": "'{{alias}}' 是 '{{res}}' 的別名，請考慮使用原名。",
124 |     "description": "Warning when resource alias used"
125 |   },
126 |   "nano_l_html_filtering_not_supported": {
127 |     "message": "您的瀏覽器不支援 HTML 過濾。",
128 |     "description": "Warning when HTML filtering is used on unsupported platforms"
129 |   },
130 |   "nano_l_filter_comment_bracket": {
131 |     "message": "使用 '[' 表示註解已被捨棄，請使用 '!' 代替。",
132 |     "description": "Deprecation when '[' used for comments"
133 |   },
134 |   "nano_l_filter_inline_comment": {
135 |     "message": "內聯註解已被捨棄。",
136 |     "description": "Deprecation when inline comments"
137 |   },
138 |   "nano_l_filter_script_contains": {
139 |     "message": "'##script:contains(...)' 已被捨棄，请改用 '##^script:has-text(...)' 。",
140 |     "description": "Deprecation when 'script:contains' is used"
141 |   },
142 |   "nano_l_filter_mp4_option": {
143 |     "message": "使用 'mp4' 選項是被捨棄的，請寫出完整的選項。",
144 |     "description": "Deprecation when 'mp4'"
145 |   },
146 |   "nano_l_filter_aborted_e": {
147 |     "message": "Nano 沒有驗證剩下的過濾規則，因為已經有太多的錯誤。",
148 |     "description": "Error when too many errors in filter rules"
149 |   },
150 |   "nano_l_filter_ag_js_injection": {
151 |     "message": "Raw JavaScript injection is not allowed due to security concerns.",
152 |     "description": "Error when raw JavaScript injection"
153 |   },
154 |   "nano_l_filter_bad_selector": {
155 |     "message": "這個規則的選擇器有語法錯誤。",
156 |     "description": "Error when selector has syntax errors"
157 |   },
158 |   "nano_l_filter_too_expensive": {
159 |     "message": "這個規則不能是通用規則。",
160 |     "description": "Error when expensive rule is generic"
161 |   },
162 |   "nano_l_filter_style_injection_syntax_error": {
163 |     "message": "這個 CSS 注入規則有語法錯誤。",
164 |     "description": "Error when CSS injection has syntax errors"
165 |   },
166 |   "nano_l_filter_assets_access_violation": {
167 |     "message": "低權限的過濾器不能引用高權限的資源。",
168 |     "description": "Error when unprivileged filter references a privileged resources"
169 |   },
170 |   "nano_l_filter_localhost_entry": {
171 |     "message": "這個主機檔案條目已被捨棄，因為它是本地主機聲明。",
172 |     "description": "Error when localhost declaration"
173 |   },
174 |   "nano_l_filter_ag_element_remove": {
175 |     "message": "元素刪除規則暫時不支援 AdGuard 的语法，请改用 '##^' 。",
176 |     "description": "Error when AdGuard style element remove rule"
177 |   },
178 |   "nano_l_filter_negated_generichide": {
179 |     "message": "'generichide' ， 'ghide' ，和 'elemhide' 選項不能被反選。",
180 |     "description": "Error when 'generichide' is negated"
181 |   },
182 |   "nano_l_filter_bad_domain_option_arguments": {
183 |     "message": "這個 'domain=...' 選項有無效參數。",
184 |     "description": "Error when 'domain=' has invalid arguments"
185 |   },
186 |   "nano_l_filter_bad_denyallow_option_arguments": {
187 |     "message": "選項 'denyallow=...' 存在無效參數。",
188 |     "description": "Error when 'denyallow=' has invalid arguments"
189 |   },
190 |   "nano_l_filter_bad_csp_option_arguments": {
191 |     "message": "選項 'csp=...' 沒有或存在無效參數。",
192 |     "description": "Error when 'csp=' has no arguments or has invalid arguments"
193 |   },
194 |   "nano_l_filter_unknown_option": {
195 |     "message": "'{{option}}' 選項無法被識別。",
196 |     "description": "English: The option '{{option}}' is not recognized."
197 |   },
198 |   "nano_l_filter_only_unsupported_type": {
199 |     "message": "此篩選規則僅選擇了不受支援的類型選項。",
200 |     "description": "Error when filter rule selected only unsupported types"
201 |   },
202 |   "nano_l_filter_no_type": {
203 |     "message": "此規則明確地選擇了無類型的選項。",
204 |     "description": "Error when filter rule explicitly selected no types"
205 |   },
206 |   "nano_l_filter_bad_re": {
207 |     "message": "這個網絡過濾規則的正規表示式有語法錯誤。",
208 |     "description": "Error when network rule has regular expression syntax errors"
209 |   },
210 |   "nano_l_filter_too_short": {
211 |     "message": "這個網路規則過短。",
212 |     "description": "Error when network rule is too short"
213 |   },
214 |   "nano_l_filter_matcher_too_long": {
215 |     "message": "此網路規則的匹配器過長。",
216 |     "description": "Error when network matcher is too long"
217 |   },
218 |   "nano_l_filter_generic_js_in_block": {
219 |     "message": "Script injection syntax that selects all resources can only be used in exception filters.",
220 |     "description": "Error when '##+js()' is used"
221 |   },
222 |   "nano_l_filter_intervention_smed79": {
223 |     "message": "'^' 不能紧跟在域名锚点的後面。",
224 |     "description": "Error when the bad rule from SMed79 is discarded"
225 |   },
226 |   "nano_r_no_type": {
227 |     "message": "Nano discarded the redirect portion of this rule because it must select a type option.",
228 |     "description": "Warning when redirect selected no types"
229 |   },
230 |   "nano_r_too_many_types": {
231 |     "message": "Nano discarded the redirect portion of this rule because it selected too many type options.",
232 |     "description": "Warning when redirect selected too many types"
233 |   },
234 |   "nano_r_no_resource_token": {
235 |     "message": "Nano discarded the redirect portion of this rule because it has no arguments.",
236 |     "description": "Warning when redirect has no arguments"
237 |   },
238 |   "nano_r_no_supported_type": {
239 |     "message": "Nano discarded the redirect portion of this rule because it did not select any supported type options.",
240 |     "description": "Warning when redirect selected no supported type"
241 |   },
242 |   "nano_r_negated_domain": {
243 |     "message": "Nano discarded part of the redirect portion of this rule because negated domains cannot be used with redirect.",
244 |     "description": "Warning when negated domain used with redirect"
245 |   },
246 |   "nano_r_no_destination": {
247 |     "message": "Nano discarded the redirect portion of this rule because it has no valid destination domain.",
248 |     "description": "Warning when redirect has no destination"
249 |   },
250 |   "nano_r_does_not_match_re": {
251 |     "message": "Nano discarded the redirect portion of this rule because this network rule does not match this regular expression: {{regexp}}",
252 |     "description": "Warning when redirect failed initial test, use '{{regexp}}' to denote the tester if needed"
253 |   },
254 |   "nano_r_simplified_to_star": {
255 |     "message": "Nano 簡化了此規則的匹配器至 '*'。",
256 |     "description": "Warning when the '*/*' workaround is simplified"
257 |   },
258 |   "nano_r_redirect_in_exception": {
259 |     "message": "Redirect rules cannot be exceptions.",
260 |     "description": "Error when redirect used in exception"
261 |   },
262 |   "nano_r_redirected_twice": {
263 |     "message": "重新導向規則只能包含一個重新導向指示詞。",
264 |     "description": "Error when two redirects in one rule"
265 |   },
266 |   "nano_b_cosmetic_filter_passed_through": {
267 |     "message": "此規則暫時被拒用。更多資訊：https://github.com/NanoAdblocker/NanoCore/issues/77",
268 |     "description": "https://github.com/NanoAdblocker/NanoCore/issues/77"
269 |   }
270 | }


--------------------------------------------------------------------------------
/src/_locales/ja/messages.json:
--------------------------------------------------------------------------------
  1 | {
  2 |   "nano_d_ui_group": {
  3 |     "message": "ユーザーインターフェイス",
  4 |     "description": "Group 'User interface' of settings tab"
  5 |   },
  6 |   "nano_d_line_wrap_e": {
  7 |     "message": "Soft wrap long lines in filter editor",
  8 |     "description": "English: Soft wrap long lines in filter editor"
  9 |   },
 10 |   "nano_d_line_wrap_v": {
 11 |     "message": "Soft wrap long lines in filter viewer",
 12 |     "description": "English: Soft wrap long lines in filter viewer"
 13 |   },
 14 |   "nano_d_recompile_filters": {
 15 |     "message": "フィルターを強制的に再コンパイルする",
 16 |     "description": "Button in advanced settings to recompile filters"
 17 |   },
 18 |   "nano_d_resources_links": {
 19 |     "message": "Nanoには、<a href='https://github.com/gorhill/uBlock/wiki/Resources-Library'>uBlock Originリソース</a>と<a href='https://github.com/NanoAdblocker/NanoCore2/blob/master/src/snippets.js'>Nanoエクストラリソース</a>の2つのリソースが付属しています。",
 20 |     "description": "Resources reference links, 'Resources' and 'Extra Resources' should be translated"
 21 |   },
 22 |   "nano_d_ace_help": {
 23 |     "message": "NanoフィルターエディターはAceを搭載しており、ほとんどのショートカットキーは同様に機能します。",
 24 |     "description": "[Not Used] Explain the similarity between Nano Filter Editor and Ace in terms of shortcut keys"
 25 |   },
 26 |   "nano_d_about_based_on": {
 27 |     "message": "{{@data}} に基づく",
 28 |     "description": "English: Based on {{@data}}"
 29 |   },
 30 |   "nano_v_title": {
 31 |     "message": "Nano — フィルタービューアー",
 32 |     "description": "Title of the filter viewer"
 33 |   },
 34 |   "nano_v_read_error": {
 35 |     "message": "コンテンツを読み込めませんでした。更新してください。",
 36 |     "description": "Message when filter content could not be loaded"
 37 |   },
 38 |   "nano_p_cache_control": {
 39 |     "message": "キャッシュコントロール",
 40 |     "description": "The cache control strip name, can be at most 20 English characters wide"
 41 |   },
 42 |   "nano_p_open_firewall_pane": {
 43 |     "message": "Toggle the overview panel",
 44 |     "description": "Tooltip for toggle firewall details (sometimes called overview panel) button"
 45 |   },
 46 |   "nano_p_refresh_button": {
 47 |     "message": "クリック：現在のページを更新\n\nCtrl + クリック：キャッシュを無視して現在のページを更新",
 48 |     "description": "English: Click to refresh this page.\n\nCtrl+click to refresh this page while bypassing cache."
 49 |   },
 50 |   "nano_p_force_scroll": {
 51 |     "message": "(beta) Enter force scroll mode (will break layout)",
 52 |     "description": "Tooltip for force scroll button"
 53 |   },
 54 |   "nano_p_bug_reporter": {
 55 |     "message": "(beta) バグレポーターを開く",
 56 |     "description": "Tooltip for bug reporter button"
 57 |   },
 58 |   "nano_l_whitelist_aborted_w": {
 59 |     "message": "Nano did not scan the rest of the whitelists for warnings because there are too many warnings.",
 60 |     "description": "Warning when too many warnings in whitelists"
 61 |   },
 62 |   "nano_l_whitelist_suspecious_re": {
 63 |     "message": "この行は正規表現として扱われますが、意図されたものですか？",
 64 |     "description": "Warning when parsed as regular expression but is unlikely the intention of user"
 65 |   },
 66 |   "nano_l_whitelist_aborted_e": {
 67 |     "message": "Nano did not scan the rest of the whitelists for errors because there are too many errors.",
 68 |     "description": "Error when too many errors in whitelists"
 69 |   },
 70 |   "nano_l_whitelist_invalid_hostname": {
 71 |     "message": "このホスト名は無効です。",
 72 |     "description": "Error when hostname not valid"
 73 |   },
 74 |   "nano_l_whitelist_invalid_re": {
 75 |     "message": "この正規表現には構文エラーがあります。",
 76 |     "description": "Error when regular expression has syntax errors"
 77 |   },
 78 |   "nano_l_whitelist_invalid_url": {
 79 |     "message": "このURLは無効です。",
 80 |     "description": "Error when a URL not valid"
 81 |   },
 82 |   "nano_l_filter_aborted_w": {
 83 |     "message": "Nano did not scan the rest of the filter rules for warnings because there are too many warnings.",
 84 |     "description": "Warning when too many warnings in filter rules"
 85 |   },
 86 |   "nano_l_filter_script_snippet_double_exception": {
 87 |     "message": "スクリプトスニペットの例外ルールで使用できないため、Nanoは拒否されたドメインを破棄しました。",
 88 |     "description": "Warning when negated domain used with script snippet exception"
 89 |   },
 90 |   "nano_l_filter_converted_to_exception": {
 91 |     "message": "拒否されたドメインのみを含むため、Nanoはこのルールを例外ルールに変換しました。",
 92 |     "description": "Warning when a rule is convered to exception because all negated domains"
 93 |   },
 94 |   "nano_l_filter_negated_html_filtering": {
 95 |     "message": "拒否されたドメインは、HTMLフィルタリングではまだサポートされていません。",
 96 |     "description": "Warning when negated domains used with HTML filtering"
 97 |   },
 98 |   "nano_l_filter_discarded_non_negatable_type": {
 99 |     "message": "拒否できないため、Nanoは オプション '{{type}}' を破棄しました。",
100 |     "description": "[Not Used] English: Nano discarded the type option '{{type}}' because it cannot be negated."
101 |   },
102 |   "nano_l_filter_expanded_mp4_option": {
103 |     "message": "Nanoは、オプション 'mp4' を 'media,redirect=noop-1s.mp4' に置き換えました。",
104 |     "description": "Warning when 'mp4' is replaced"
105 |   },
106 |   "nano_l_filter_unsupported_type_ignored": {
107 |     "message": "Nanoは、まだサポートされていないタイプオプションを破棄しました。",
108 |     "description": "Warning when unsupported types discarded but not entire rule"
109 |   },
110 |   "nano_l_filter_resource_not_found": {
111 |     "message": "リソース '{{res}}' が見つかりませんでした。スペルは正しいですか？",
112 |     "description": "Warning when resource not found"
113 |   },
114 |   "nano_l_filter_resource_not_redirectable": {
115 |     "message": "リソース '{{res}}' はリダイレクトターゲットとして使用できません。",
116 |     "description": "Warning when resource not redirectable"
117 |   },
118 |   "nano_l_filter_resource_not_injectable": {
119 |     "message": "リソース '{{res}}' はスクリプトスニペットとして挿入できません。",
120 |     "description": "Warning when resource not injectable"
121 |   },
122 |   "nano_l_filter_resource_alias_used": {
123 |     "message": "'{{alias}}' は '{{res}}' のエイリアスですが、代わりに実名を使用することを検討してください。",
124 |     "description": "Warning when resource alias used"
125 |   },
126 |   "nano_l_html_filtering_not_supported": {
127 |     "message": "お使いのブラウザではHTMLフィルタリングがサポートされていません。",
128 |     "description": "Warning when HTML filtering is used on unsupported platforms"
129 |   },
130 |   "nano_l_filter_comment_bracket": {
131 |     "message": "'[' を使ってコメントを表すのは非推奨です。代わりに '!' を使用してください。",
132 |     "description": "Deprecation when '[' used for comments"
133 |   },
134 |   "nano_l_filter_inline_comment": {
135 |     "message": "インラインコメントは非推奨です。",
136 |     "description": "Deprecation when inline comments"
137 |   },
138 |   "nano_l_filter_script_contains": {
139 |     "message": "'##script:contains(...)' は非推奨です。代わりに '##^script:has-text(...)' を使用してください。",
140 |     "description": "Deprecation when 'script:contains' is used"
141 |   },
142 |   "nano_l_filter_mp4_option": {
143 |     "message": "オプション 'mp4' の使用は非推奨です。代わりに完全なオプションを記述してください。",
144 |     "description": "Deprecation when 'mp4'"
145 |   },
146 |   "nano_l_filter_aborted_e": {
147 |     "message": "Nano did not scan the rest of the filter rules for errors because there are too many errors.",
148 |     "description": "Error when too many errors in filter rules"
149 |   },
150 |   "nano_l_filter_ag_js_injection": {
151 |     "message": "Raw JavaScript injection is not allowed due to security concerns.",
152 |     "description": "Error when raw JavaScript injection"
153 |   },
154 |   "nano_l_filter_bad_selector": {
155 |     "message": "このルールのセレクターには構文エラーがあります。",
156 |     "description": "Error when selector has syntax errors"
157 |   },
158 |   "nano_l_filter_too_expensive": {
159 |     "message": "This rule cannot be generic.",
160 |     "description": "Error when expensive rule is generic"
161 |   },
162 |   "nano_l_filter_style_injection_syntax_error": {
163 |     "message": "このCSSインジェクションルールには構文エラーがあります。",
164 |     "description": "Error when CSS injection has syntax errors"
165 |   },
166 |   "nano_l_filter_assets_access_violation": {
167 |     "message": "非特権フィルターは、特権リソースを参照できません。",
168 |     "description": "Error when unprivileged filter references a privileged resources"
169 |   },
170 |   "nano_l_filter_localhost_entry": {
171 |     "message": "このホストファイルエントリはlocalhost宣言であるため破棄されます。",
172 |     "description": "Error when localhost declaration"
173 |   },
174 |   "nano_l_filter_ag_element_remove": {
175 |     "message": "AdGuard構文の要素削除ルールはまだサポートされていません。代わりに '##^' を使用してください。",
176 |     "description": "Error when AdGuard style element remove rule"
177 |   },
178 |   "nano_l_filter_negated_generichide": {
179 |     "message": "The options 'generichide', 'ghide', and 'elemhide' cannot be negated.",
180 |     "description": "Error when 'generichide' is negated"
181 |   },
182 |   "nano_l_filter_bad_domain_option_arguments": {
183 |     "message": "オプション 'domain=...' に無効な引数があります。",
184 |     "description": "Error when 'domain=' has invalid arguments"
185 |   },
186 |   "nano_l_filter_bad_denyallow_option_arguments": {
187 |     "message": "オプション 'denyallow=...' に無効な引数があります。",
188 |     "description": "Error when 'denyallow=' has invalid arguments"
189 |   },
190 |   "nano_l_filter_bad_csp_option_arguments": {
191 |     "message": "オプション 'csp=...' に引数がないか、無効な引数があります。",
192 |     "description": "Error when 'csp=' has no arguments or has invalid arguments"
193 |   },
194 |   "nano_l_filter_unknown_option": {
195 |     "message": "オプション '{{option}}' は認識されません。",
196 |     "description": "English: The option '{{option}}' is not recognized."
197 |   },
198 |   "nano_l_filter_only_unsupported_type": {
199 |     "message": "このフィルタールールは、サポートされていないタイプのオプションのみを選択しました。",
200 |     "description": "Error when filter rule selected only unsupported types"
201 |   },
202 |   "nano_l_filter_no_type": {
203 |     "message": "This filter rule explicitly selected no type options.",
204 |     "description": "Error when filter rule explicitly selected no types"
205 |   },
206 |   "nano_l_filter_bad_re": {
207 |     "message": "このネットワークルールには正規表現の構文エラーがあります。",
208 |     "description": "Error when network rule has regular expression syntax errors"
209 |   },
210 |   "nano_l_filter_too_short": {
211 |     "message": "このネットワークルールは短すぎます。",
212 |     "description": "Error when network rule is too short"
213 |   },
214 |   "nano_l_filter_matcher_too_long": {
215 |     "message": "このネットワークルールのマッチャーが長すぎます。",
216 |     "description": "Error when network matcher is too long"
217 |   },
218 |   "nano_l_filter_generic_js_in_block": {
219 |     "message": "すべてのリソースを選択するスクリプトを挿入する構文は、例外フィルターでのみ使用できます。",
220 |     "description": "Error when '##+js()' is used"
221 |   },
222 |   "nano_l_filter_intervention_smed79": {
223 |     "message": "ドメインアンカーの直後に '^' を付けることはできません。",
224 |     "description": "Error when the bad rule from SMed79 is discarded"
225 |   },
226 |   "nano_r_no_type": {
227 |     "message": "タイプオプションを選択する必要があるため、Nanoはこのルールのリダイレクト部分を破棄しました。",
228 |     "description": "Warning when redirect selected no types"
229 |   },
230 |   "nano_r_too_many_types": {
231 |     "message": "選択されたタイプオプションが多すぎるため、Nanoはこのルールのリダイレクト部分を破棄しました。",
232 |     "description": "Warning when redirect selected too many types"
233 |   },
234 |   "nano_r_no_resource_token": {
235 |     "message": "引数がないため、Nanoはこのルールのリダイレクト部分を破棄しました。",
236 |     "description": "Warning when redirect has no arguments"
237 |   },
238 |   "nano_r_no_supported_type": {
239 |     "message": "サポートされているタイプオプションを選択しなかったため、Nanoはこのルールのリダイレクト部分を破棄しました。",
240 |     "description": "Warning when redirect selected no supported type"
241 |   },
242 |   "nano_r_negated_domain": {
243 |     "message": "Nano discarded part of the redirect portion of this rule because negated domains cannot be used with redirect.",
244 |     "description": "Warning when negated domain used with redirect"
245 |   },
246 |   "nano_r_no_destination": {
247 |     "message": "有効な宛先のドメインがないため、Nanoはこのルールのリダイレクト部分を破棄しました。",
248 |     "description": "Warning when redirect has no destination"
249 |   },
250 |   "nano_r_does_not_match_re": {
251 |     "message": "このネットワークルールが次の正規表現に一致しないため、Nanoはこのルールのリダイレクト部分を破棄しました：{{regexp}}",
252 |     "description": "Warning when redirect failed initial test, use '{{regexp}}' to denote the tester if needed"
253 |   },
254 |   "nano_r_simplified_to_star": {
255 |     "message": "Nanoはこのルールのマッチャーを '*' に簡略化しました。",
256 |     "description": "Warning when the '*/*' workaround is simplified"
257 |   },
258 |   "nano_r_redirect_in_exception": {
259 |     "message": "リダイレクトルールを例外にすることはできません。",
260 |     "description": "Error when redirect used in exception"
261 |   },
262 |   "nano_r_redirected_twice": {
263 |     "message": "リダイレクトルールに含めることができるリダイレクトディレクティブは1つだけです。",
264 |     "description": "Error when two redirects in one rule"
265 |   },
266 |   "nano_b_cosmetic_filter_passed_through": {
267 |     "message": "このルールは現在拒否されています。 詳細：https://github.com/NanoAdblocker/NanoCore/issues/77",
268 |     "description": "https://github.com/NanoAdblocker/NanoCore/issues/77"
269 |   }
270 | }


--------------------------------------------------------------------------------
/src/_locales/en/messages.json:
--------------------------------------------------------------------------------
  1 | {
  2 |   "nano_d_ui_group": {
  3 |     "message": "User interface",
  4 |     "description": "Group 'User interface' of settings tab"
  5 |   },
  6 |   "nano_d_line_wrap_e": {
  7 |     "message": "Soft wrap long lines in filter editor",
  8 |     "description": "English: Soft wrap long lines in filter editor"
  9 |   },
 10 |   "nano_d_line_wrap_v": {
 11 |     "message": "Soft wrap long lines in filter viewer",
 12 |     "description": "English: Soft wrap long lines in filter viewer"
 13 |   },
 14 |   "nano_d_recompile_filters": {
 15 |     "message": "Force recompile filters",
 16 |     "description": "Button in advanced settings to recompile filters"
 17 |   },
 18 |   "nano_d_resources_links": {
 19 |     "message": "Nano comes with two sets of resources, <a href='https://github.com/gorhill/uBlock/wiki/Resources-Library'>uBlock Origin Resources</a> and <a href='https://github.com/NanoAdblocker/NanoCore2/blob/master/src/snippets.js'>Nano Extra Resources</a>.",
 20 |     "description": "Resources reference links, 'Resources' and 'Extra Resources' should be translated"
 21 |   },
 22 |   "nano_d_ace_help": {
 23 |     "message": "Nano Filter Editor is powered by Ace and most shortcut keys works the same.",
 24 |     "description": "[Not Used] Explain the similarity between Nano Filter Editor and Ace in terms of shortcut keys"
 25 |   },
 26 |   "nano_d_about_based_on": {
 27 |     "message": "Based on {{@data}}",
 28 |     "description": "English: Based on {{@data}}"
 29 |   },
 30 |   "nano_v_title": {
 31 |     "message": "Nano — Filter Viewer",
 32 |     "description": "Title of the filter viewer"
 33 |   },
 34 |   "nano_v_read_error": {
 35 |     "message": "Could not load content, please refresh.",
 36 |     "description": "Message when filter content could not be loaded"
 37 |   },
 38 |   "nano_p_cache_control": {
 39 |     "message": "cache control",
 40 |     "description": "The cache control strip name, can be at most 20 English characters wide"
 41 |   },
 42 |   "nano_p_open_firewall_pane": {
 43 |     "message": "Toggle the overview panel",
 44 |     "description": "Tooltip for toggle firewall details (sometimes called overview panel) button"
 45 |   },
 46 |   "nano_p_refresh_button": {
 47 |     "message": "Click to refresh this page.\n\nCtrl+click to refresh this page while bypassing cache.",
 48 |     "description": "English: Click to refresh this page.\n\nCtrl+click to refresh this page while bypassing cache."
 49 |   },
 50 |   "nano_p_force_scroll": {
 51 |     "message": "(beta) Enter force scroll mode (will break layout)",
 52 |     "description": "Tooltip for force scroll button"
 53 |   },
 54 |   "nano_p_bug_reporter": {
 55 |     "message": "(beta) Open the bug reporter",
 56 |     "description": "Tooltip for bug reporter button"
 57 |   },
 58 |   "nano_l_whitelist_aborted_w": {
 59 |     "message": "Nano did not scan the rest of the whitelists for warnings because there are too many warnings.",
 60 |     "description": "Warning when too many warnings in whitelists"
 61 |   },
 62 |   "nano_l_whitelist_suspecious_re": {
 63 |     "message": "This line is treated as a regular expression, is that intended?",
 64 |     "description": "Warning when parsed as regular expression but is unlikely the intention of user"
 65 |   },
 66 |   "nano_l_whitelist_aborted_e": {
 67 |     "message": "Nano did not scan the rest of the whitelists for errors because there are too many errors.",
 68 |     "description": "Error when too many errors in whitelists"
 69 |   },
 70 |   "nano_l_whitelist_invalid_hostname": {
 71 |     "message": "This hostname is not valid.",
 72 |     "description": "Error when hostname not valid"
 73 |   },
 74 |   "nano_l_whitelist_invalid_re": {
 75 |     "message": "This regular expression has syntax errors.",
 76 |     "description": "Error when regular expression has syntax errors"
 77 |   },
 78 |   "nano_l_whitelist_invalid_url": {
 79 |     "message": "This URL is not valid.",
 80 |     "description": "Error when a URL not valid"
 81 |   },
 82 |   "nano_l_filter_aborted_w": {
 83 |     "message": "Nano did not scan the rest of the filter rules for warnings because there are too many warnings.",
 84 |     "description": "Warning when too many warnings in filter rules"
 85 |   },
 86 |   "nano_l_filter_script_snippet_double_exception": {
 87 |     "message": "Nano discarded a negated domain because it cannot be used in a script snippet exception rule.",
 88 |     "description": "Warning when negated domain used with script snippet exception"
 89 |   },
 90 |   "nano_l_filter_converted_to_exception": {
 91 |     "message": "Nano converted this rule to an exception rule because it only contain negated domains.",
 92 |     "description": "Warning when a rule is convered to exception because all negated domains"
 93 |   },
 94 |   "nano_l_filter_negated_html_filtering": {
 95 |     "message": "Negated domains are not yet supported for HTML filtering.",
 96 |     "description": "Warning when negated domains used with HTML filtering"
 97 |   },
 98 |   "nano_l_filter_discarded_non_negatable_type": {
 99 |     "message": "Nano discarded the type option '{{type}}' because it cannot be negated.",
100 |     "description": "[Not Used] English: Nano discarded the type option '{{type}}' because it cannot be negated."
101 |   },
102 |   "nano_l_filter_expanded_mp4_option": {
103 |     "message": "Nano replaced the option 'mp4' with 'media,redirect=noop-1s.mp4'.",
104 |     "description": "Warning when 'mp4' is replaced"
105 |   },
106 |   "nano_l_filter_unsupported_type_ignored": {
107 |     "message": "Nano discarded type options that are not yet supported.",
108 |     "description": "Warning when unsupported types discarded but not entire rule"
109 |   },
110 |   "nano_l_filter_resource_not_found": {
111 |     "message": "The resource '{{res}}' could not be found, is it spelled correctly?",
112 |     "description": "Warning when resource not found"
113 |   },
114 |   "nano_l_filter_resource_not_redirectable": {
115 |     "message": "The resource '{{res}}' cannot be used as a redirect target.",
116 |     "description": "Warning when resource not redirectable"
117 |   },
118 |   "nano_l_filter_resource_not_injectable": {
119 |     "message": "The resource '{{res}}' cannot be injected as a script snippet.",
120 |     "description": "Warning when resource not injectable"
121 |   },
122 |   "nano_l_filter_resource_alias_used": {
123 |     "message": "'{{alias}}' is the alias of '{{res}}', consider using the real name instead.",
124 |     "description": "Warning when resource alias used"
125 |   },
126 |   "nano_l_html_filtering_not_supported": {
127 |     "message": "HTML filtering is not supported by your browser.",
128 |     "description": "Warning when HTML filtering is used on unsupported platforms"
129 |   },
130 |   "nano_l_filter_comment_bracket": {
131 |     "message": "Using '[' to denote comment is deprecated, use '!' instead.",
132 |     "description": "Deprecation when '[' used for comments"
133 |   },
134 |   "nano_l_filter_inline_comment": {
135 |     "message": "Inline comments are deprecated.",
136 |     "description": "Deprecation when inline comments"
137 |   },
138 |   "nano_l_filter_script_contains": {
139 |     "message": "'##script:contains(...)' is deprecated, use '##^script:has-text(...)' instead.",
140 |     "description": "Deprecation when 'script:contains' is used"
141 |   },
142 |   "nano_l_filter_mp4_option": {
143 |     "message": "The use of the option 'mp4' is deprecated, write out the full options instead.",
144 |     "description": "Deprecation when 'mp4'"
145 |   },
146 |   "nano_l_filter_aborted_e": {
147 |     "message": "Nano did not scan the rest of the filter rules for errors because there are too many errors.",
148 |     "description": "Error when too many errors in filter rules"
149 |   },
150 |   "nano_l_filter_ag_js_injection": {
151 |     "message": "Raw JavaScript injection is not allowed due to security concerns.",
152 |     "description": "Error when raw JavaScript injection"
153 |   },
154 |   "nano_l_filter_bad_selector": {
155 |     "message": "The selector in this rule has syntax errors.",
156 |     "description": "Error when selector has syntax errors"
157 |   },
158 |   "nano_l_filter_too_expensive": {
159 |     "message": "This rule cannot be generic.",
160 |     "description": "Error when expensive rule is generic"
161 |   },
162 |   "nano_l_filter_style_injection_syntax_error": {
163 |     "message": "This CSS injection rule has syntax errors.",
164 |     "description": "Error when CSS injection has syntax errors"
165 |   },
166 |   "nano_l_filter_assets_access_violation": {
167 |     "message": "Unprivileged filters may not reference privileged resources.",
168 |     "description": "Error when unprivileged filter references a privileged resources"
169 |   },
170 |   "nano_l_filter_localhost_entry": {
171 |     "message": "This host file entry is discarded because it is localhost declaration.",
172 |     "description": "Error when localhost declaration"
173 |   },
174 |   "nano_l_filter_ag_element_remove": {
175 |     "message": "Element remove rules with AdGuard syntax are not yet supported, use '##^' instead.",
176 |     "description": "Error when AdGuard style element remove rule"
177 |   },
178 |   "nano_l_filter_negated_generichide": {
179 |     "message": "The options 'generichide', 'ghide', and 'elemhide' cannot be negated.",
180 |     "description": "Error when 'generichide' is negated"
181 |   },
182 |   "nano_l_filter_bad_domain_option_arguments": {
183 |     "message": "The option 'domain=...' has invalid arguments.",
184 |     "description": "Error when 'domain=' has invalid arguments"
185 |   },
186 |   "nano_l_filter_bad_denyallow_option_arguments": {
187 |     "message": "The option 'denyallow=...' has invalid arguments.",
188 |     "description": "Error when 'denyallow=' has invalid arguments"
189 |   },
190 |   "nano_l_filter_bad_csp_option_arguments": {
191 |     "message": "The option 'csp=...' has no arguments or has invalid arguments.",
192 |     "description": "Error when 'csp=' has no arguments or has invalid arguments"
193 |   },
194 |   "nano_l_filter_unknown_option": {
195 |     "message": "The option '{{option}}' is not recognized.",
196 |     "description": "English: The option '{{option}}' is not recognized."
197 |   },
198 |   "nano_l_filter_only_unsupported_type": {
199 |     "message": "This filter rule selected only unsupported type options.",
200 |     "description": "Error when filter rule selected only unsupported types"
201 |   },
202 |   "nano_l_filter_no_type": {
203 |     "message": "This filter rule explicitly selected no type options.",
204 |     "description": "Error when filter rule explicitly selected no types"
205 |   },
206 |   "nano_l_filter_bad_re": {
207 |     "message": "This network rule has regular expression syntax errors.",
208 |     "description": "Error when network rule has regular expression syntax errors"
209 |   },
210 |   "nano_l_filter_too_short": {
211 |     "message": "This network rule is too short.",
212 |     "description": "Error when network rule is too short"
213 |   },
214 |   "nano_l_filter_matcher_too_long": {
215 |     "message": "The matcher of this network rule is too long.",
216 |     "description": "Error when network matcher is too long"
217 |   },
218 |   "nano_l_filter_generic_js_in_block": {
219 |     "message": "Script injection syntax that selects all resources can only be used in exception filters.",
220 |     "description": "Error when '##+js()' is used"
221 |   },
222 |   "nano_l_filter_intervention_smed79": {
223 |     "message": "The domain anchor may not be immediately followed by '^'.",
224 |     "description": "Error when the bad rule from SMed79 is discarded"
225 |   },
226 |   "nano_r_no_type": {
227 |     "message": "Nano discarded the redirect portion of this rule because it must select a type option.",
228 |     "description": "Warning when redirect selected no types"
229 |   },
230 |   "nano_r_too_many_types": {
231 |     "message": "Nano discarded the redirect portion of this rule because it selected too many type options.",
232 |     "description": "Warning when redirect selected too many types"
233 |   },
234 |   "nano_r_no_resource_token": {
235 |     "message": "Nano discarded the redirect portion of this rule because it has no arguments.",
236 |     "description": "Warning when redirect has no arguments"
237 |   },
238 |   "nano_r_no_supported_type": {
239 |     "message": "Nano discarded the redirect portion of this rule because it did not select any supported type options.",
240 |     "description": "Warning when redirect selected no supported type"
241 |   },
242 |   "nano_r_negated_domain": {
243 |     "message": "Nano discarded part of the redirect portion of this rule because negated domains cannot be used with redirect.",
244 |     "description": "Warning when negated domain used with redirect"
245 |   },
246 |   "nano_r_no_destination": {
247 |     "message": "Nano discarded the redirect portion of this rule because it has no valid destination domain.",
248 |     "description": "Warning when redirect has no destination"
249 |   },
250 |   "nano_r_does_not_match_re": {
251 |     "message": "Nano discarded the redirect portion of this rule because this network rule does not match this regular expression: {{regexp}}",
252 |     "description": "Warning when redirect failed initial test, use '{{regexp}}' to denote the tester if needed"
253 |   },
254 |   "nano_r_simplified_to_star": {
255 |     "message": "Nano simplified the matcher of this rule to '*'.",
256 |     "description": "Warning when the '*/*' workaround is simplified"
257 |   },
258 |   "nano_r_redirect_in_exception": {
259 |     "message": "Redirect rules cannot be exceptions.",
260 |     "description": "Error when redirect used in exception"
261 |   },
262 |   "nano_r_redirected_twice": {
263 |     "message": "Redirect rules can only contain one redirect directive.",
264 |     "description": "Error when two redirects in one rule"
265 |   },
266 |   "nano_b_cosmetic_filter_passed_through": {
267 |     "message": "This rule is rejected for now. More information: https://github.com/NanoAdblocker/NanoCore/issues/77",
268 |     "description": "https://github.com/NanoAdblocker/NanoCore/issues/77"
269 |   }
270 | }


--------------------------------------------------------------------------------