-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix #2067 (experimental) + support for hidden settings
- Loading branch information
Showing
20 changed files
with
437 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title data-i18n="advancedSettingsPageName"></title> | ||
| <link rel="stylesheet" type="text/css" href="css/common.css"> | ||
| <link rel="stylesheet" type="text/css" href="css/dashboard-common.css"> | ||
| <link rel="stylesheet" type="text/css" href="css/advanced-settings.css"> | ||
| <link rel="shortcut icon" type="image/png" href="img/icon_16.png"/> | ||
| </head> | ||
|
|
||
| <body> | ||
| <p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-user-features" target="_blank"></a> | ||
| <p> | ||
| <button id="advancedSettingsApply" class="custom important" type="button" disabled="true" data-i18n="genericApplyChanges"></button>  | ||
| <p><textarea id="advancedSettings" dir="auto" spellcheck="false"></textarea> | ||
|
|
||
| <script src="js/vapi-common.js"></script> | ||
| <script src="js/vapi-client.js"></script> | ||
| <script src="js/udom.js"></script> | ||
| <script src="js/i18n.js"></script> | ||
| <script src="js/dashboard-common.js"></script> | ||
| <script src="js/advanced-settings.js"></script> | ||
|
|
||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| div > p:first-child { | ||
| margin-top: 0; | ||
| } | ||
| div > p:last-child { | ||
| margin-bottom: 0; | ||
| } | ||
| textarea { | ||
| box-sizing: border-box; | ||
| font-size: smaller; | ||
| height: 60vh; | ||
| text-align: left; | ||
| white-space: pre; | ||
| width: 100%; | ||
| word-wrap: normal; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title></title> | ||
| </head> | ||
| <body> | ||
| <a href=""></a> | ||
| <script src="js/vapi-common.js"></script> | ||
| <script src="js/vapi-client.js"></script> | ||
| <script src="js/document-suspended.js"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /******************************************************************************* | ||
| uBlock Origin - a browser extension to block requests. | ||
| Copyright (C) 2016 Raymond Hill | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see {http://www.gnu.org/licenses/}. | ||
| Home: https://github.com/gorhill/uBlock | ||
| */ | ||
|
|
||
| /* global uDom */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| (function() { | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| var messaging = vAPI.messaging; | ||
| var cachedData = ''; | ||
| var rawAdvancedSettings = uDom.nodeFromId('advancedSettings'); | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| var hashFromAdvancedSettings = function(raw) { | ||
| return raw.trim().replace(/\s+/g, '|'); | ||
| }; | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| // This is to give a visual hint that the content of user blacklist has changed. | ||
|
|
||
| var advancedSettingsChanged = (function () { | ||
| var timer = null; | ||
|
|
||
| var handler = function() { | ||
| timer = null; | ||
| var changed = hashFromAdvancedSettings(rawAdvancedSettings.value) !== cachedData; | ||
| uDom.nodeFromId('advancedSettingsApply').disabled = !changed; | ||
| }; | ||
|
|
||
| return function() { | ||
| if ( timer !== null ) { | ||
| clearTimeout(timer); | ||
| } | ||
| timer = vAPI.setTimeout(handler, 100); | ||
| }; | ||
| })(); | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| function renderAdvancedSettings() { | ||
| var onRead = function(raw) { | ||
| cachedData = hashFromAdvancedSettings(raw); | ||
| var pretty = [], | ||
| whitespaces = ' ', | ||
| lines = raw.split('\n'), | ||
| max = 0, | ||
| pos, | ||
| i, n = lines.length; | ||
| for ( i = 0; i < n; i++ ) { | ||
| pos = lines[i].indexOf(' '); | ||
| if ( pos > max ) { | ||
| max = pos; | ||
| } | ||
| } | ||
| for ( i = 0; i < n; i++ ) { | ||
| pos = lines[i].indexOf(' '); | ||
| pretty.push(whitespaces.slice(0, max - pos) + lines[i]); | ||
| } | ||
| rawAdvancedSettings.value = pretty.join('\n') + '\n'; | ||
| advancedSettingsChanged(); | ||
| rawAdvancedSettings.focus(); | ||
| }; | ||
| messaging.send('dashboard', { what: 'readHiddenSettings' }, onRead); | ||
| } | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| var applyChanges = function() { | ||
| messaging.send( | ||
| 'dashboard', | ||
| { | ||
| what: 'writeHiddenSettings', | ||
| content: rawAdvancedSettings.value | ||
| }, | ||
| renderAdvancedSettings | ||
| ); | ||
| }; | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| // Handle user interaction | ||
| uDom('#advancedSettings').on('input', advancedSettingsChanged); | ||
| uDom('#advancedSettingsApply').on('click', applyChanges); | ||
|
|
||
| renderAdvancedSettings(); | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| })(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.