From 00a1b90f6be6df6dbe8976b457c2c6bb61360f49 Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 17 Apr 2015 10:20:45 -0400 Subject: [PATCH] this fixes #78 --- src/3p-filters.html | 1 + src/css/3p-filters.css | 9 ++++++++- src/js/3p-filters.js | 34 ++++++++++++++++++++++------------ 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/3p-filters.html b/src/3p-filters.html index f92af2eed..b5576013a 100644 --- a/src/3p-filters.html +++ b/src/3p-filters.html @@ -44,6 +44,7 @@ : diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css index b605cec3a..9816f00e9 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 b5e1cd725..67350baaf 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 'allFilterListsReloaded': + renderFilterLists(); + break; - case 'forceUpdateAssetsProgress': - renderBusyOverlay(true, msg.progress); - if ( msg.done ) { - messager.send({ what: 'reloadAllFilters' }); - } - 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', '');