From 7859a9131fcda359265dc16ef55933e5ed218119 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@gnu.org>
Date: Fri, 10 May 2019 19:05:20 -0400
Subject: Updated extensions bundle

---
 .../jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/pref.js       | 3 +++
 .../html/preferences_panel/preferences_panel.html                    | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel')

diff --git a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/pref.js b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/pref.js
index 9cecbb6..debb468 100644
--- a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/pref.js
+++ b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/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/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/preferences_panel.html b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/preferences_panel.html
index 70d3b86..081ae07 100644
--- a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/preferences_panel.html
+++ b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/html/preferences_panel/preferences_panel.html
@@ -29,6 +29,7 @@
     LibreJS preferences
   </title>
   <link rel="stylesheet" type="text/css" href="./prefs.css"/>
+  <script src="/html/mobile.js"></script>
   <script type="text/javascript" src="/common/Storage.js"></script>
 	<script type="text/javascript" src="pref.js"></script>
   </head>
@@ -44,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>
-- 
cgit v1.2.3