aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2015-04-17 10:20:45 -0400
committergorhill <rhill@raymondhill.net>2015-04-17 10:20:45 -0400
commit00a1b90f6be6df6dbe8976b457c2c6bb61360f49 (patch)
treeb89ec9f80d61677fe43b3d1fcc0a3527a0deb13e
parentd81146db3c0c68198aab7d35e565503c32e29cdb (diff)
downloaduBlock-00a1b90f6be6df6dbe8976b457c2c6bb61360f49.zip
uBlock-00a1b90f6be6df6dbe8976b457c2c6bb61360f49.tar.gz
uBlock-00a1b90f6be6df6dbe8976b457c2c6bb61360f49.tar.bz2
this fixes #78
-rw-r--r--src/3p-filters.html1
-rw-r--r--src/css/3p-filters.css9
-rw-r--r--src/js/3p-filters.js36
3 files changed, 32 insertions, 14 deletions
diff --git a/src/3p-filters.html b/src/3p-filters.html
index f92af2e..b557601 100644
--- a/src/3p-filters.html
+++ b/src/3p-filters.html
@@ -44,6 +44,7 @@
<a type="text/plain" target="_blank" href=""></a>
<a href="" style="display: none;" target="_blank"></a>: <!--
--><span class="dim"></span><!--
+  --><span class="status unsecure" style="display: none;">https</span><!--
 --><span class="status new" style="display: none;" data-i18n="3pExternalListNew"></span><!--
 --><span class="status obsolete" style="display: none;" data-i18n="3pExternalListObsolete"></span><!--
 --><span class="status purge" style="display: none;" data-i18n="3pExternalListPurge"></span>
diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css
index b605cec..9816f00 100644
--- a/src/css/3p-filters.css
+++ b/src/css/3p-filters.css
@@ -106,7 +106,7 @@ body[dir=rtl] #buttonApply {
display: none;
}
span.status {
- margin: 0 0 0 1em;
+ margin: 0 0 0 0.5em;
border: 1px solid transparent;
padding: 1px 2px;
display: inline-block;
@@ -114,6 +114,13 @@ span.status {
line-height: 1;
opacity: 0.7;
}
+span.unsecure {
+ background-color: #fee;
+ border-color: #fcc;
+ color: #f00;
+ text-decoration: line-through;
+ text-decoration-style: dotted;
+ }
span.purge {
border-color: #ddd;
color: #444;
diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
index b5e1cd7..67350ba 100644
--- a/src/js/3p-filters.js
+++ b/src/js/3p-filters.js
@@ -41,19 +41,19 @@ var hasCachedContent = false;
var onMessage = function(msg) {
switch ( msg.what ) {
- case 'allFilterListsReloaded':
- renderFilterLists();
- break;
-
- case 'forceUpdateAssetsProgress':
- renderBusyOverlay(true, msg.progress);
- if ( msg.done ) {
- messager.send({ what: 'reloadAllFilters' });
- }
- break;
+ case 'allFilterListsReloaded':
+ renderFilterLists();
+ break;
+
+ case 'forceUpdateAssetsProgress':
+ renderBusyOverlay(true, msg.progress);
+ if ( msg.done ) {
+ messager.send({ what: 'reloadAllFilters' });
+ }
+ break;
- default:
- break;
+ default:
+ break;
}
};
@@ -115,10 +115,20 @@ var renderFilterLists = function() {
.replace('{{total}}', !isNaN(+entry.entryCount) ? renderNumber(entry.entryCount) : '?');
elem.text(text);
+ // https://github.com/gorhill/uBlock/issues/78
+ // Badge for non-secure connection
+ var remoteURL = listKey;
+ if ( remoteURL.lastIndexOf('http:', 0) !== 0 ) {
+ remoteURL = entry.homeURL || '';
+ }
+ if ( remoteURL.lastIndexOf('http:', 0) === 0 ) {
+ li.descendants('span.status.unsecure').css('display', '');
+ }
+
// https://github.com/chrisaljoudi/uBlock/issues/104
var asset = listDetails.cache[listKey] || {};
- // Update status
+ // Badge for update status
if ( entry.off !== true ) {
if ( asset.repoObsolete ) {
li.descendants('span.status.new').css('display', '');