diff options
| author | Ruben Rodriguez <ruben@fsf.org> | 2019-04-29 17:55:18 -0400 |
|---|---|---|
| committer | Ruben Rodriguez <ruben@fsf.org> | 2019-04-29 17:55:18 -0400 |
| commit | ef4efa91207e1ad42b4a0bf1d54a14e5c1bea298 (patch) | |
| tree | 5d67683fdf4f6e2de356bfcb6096820cd380b143 /html/preferences_panel | |
| parent | c6fafeed2ace4abd083b8e33d0846987dc9333fc (diff) | |
| parent | b4ab7ef958d7d3d0761650b1404bf286d05f26cd (diff) | |
Merge branch 'master' of ssh://pagure.io/librejs
Diffstat (limited to 'html/preferences_panel')
| -rw-r--r-- | html/preferences_panel/pref.js | 3 | ||||
| -rw-r--r-- | html/preferences_panel/preferences_panel.html | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/html/preferences_panel/pref.js b/html/preferences_panel/pref.js index 9cecbb6..debb468 100644 --- a/html/preferences_panel/pref.js +++ b/html/preferences_panel/pref.js @@ -40,6 +40,9 @@ error = "Only one single trailing path wildcard (/*) allowed"; } } catch (e) { + if (/^https?:\/\/\*\./.test(url)) { + return this.malformedUrl(url.replace("*.", "")); + } error = "Invalid URL"; if (url && !url.includes("://")) error += ": missing protocol, either http:// or https://"; else if (url.endsWith("://")) error += ": missing domain name"; diff --git a/html/preferences_panel/preferences_panel.html b/html/preferences_panel/preferences_panel.html index 3a0ad7a..081ae07 100644 --- a/html/preferences_panel/preferences_panel.html +++ b/html/preferences_panel/preferences_panel.html @@ -45,10 +45,10 @@ <h3>Settings</h3> </div> <div id="widgets"> - <fieldset id="section-lists"><legend>Allow or block scripts matching the following URLs ("*" matches any path)</legend> + <fieldset id="section-lists"><legend>Allow or block scripts matching the following URLs ("*."" matches any subdomain, "/*" matches any path)</legend> <label>Type a new whitelist / blacklist entry:</label> <div id="new-site"> - <input type="text" id="site" value="" placeholder="https://www.gnu.org/*"> + <input type="text" id="site" value="" placeholder="https://*.gnu.org/*"> <button id="cmd-whitelist-site" class="white" title="Whitelist this site" default>Whitelist</button> <button id="cmd-blacklist-site" class="red" title="Blacklist this site">Blacklist</button> </div> |