diff options
author | gorhill <rhill@raymondhill.net> | 2015-06-07 20:27:19 -0400 |
---|---|---|
committer | gorhill <rhill@raymondhill.net> | 2015-06-07 20:27:19 -0400 |
commit | 90d009ea3f45b9493668bfdef748ba3a5ab3223b (patch) | |
tree | 05df8cbef3b94ebe7c48bc49a215da1d0b01af93 /src | |
parent | 8e55cdc4b89619a1f1b97e70dba8f967c5e59ea5 (diff) | |
download | uBlock-90d009ea3f45b9493668bfdef748ba3a5ab3223b.zip uBlock-90d009ea3f45b9493668bfdef748ba3a5ab3223b.tar.gz uBlock-90d009ea3f45b9493668bfdef748ba3a5ab3223b.tar.bz2 |
this fixes https://github.com/chrisaljoudi/uBlock/issues/675
Diffstat (limited to 'src')
-rw-r--r-- | src/js/3p-filters.js | 13 | ||||
-rw-r--r-- | src/js/assets.js | 1 | ||||
-rw-r--r-- | src/js/messaging.js | 11 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js index 1385d18..1330b21 100644 --- a/src/js/3p-filters.js +++ b/src/js/3p-filters.js @@ -90,7 +90,6 @@ var renderFilterLists = function() { }; var liFromListEntry = function(listKey) { - var elem, text; var entry = listDetails.available[listKey]; var li = listEntryTemplate.clone(); @@ -98,21 +97,21 @@ var renderFilterLists = function() { li.descendants('input').attr('checked', ''); } - elem = li.descendants('a:nth-of-type(1)'); + var elem = li.descendants('a:nth-of-type(1)'); elem.attr('href', 'asset-viewer.html?url=' + encodeURI(listKey)); elem.attr('type', 'text/html'); elem.attr('data-listkey', listKey); elem.text(listNameFromListKey(listKey) + '\u200E'); - elem = li.descendants('a:nth-of-type(2)'); - if ( entry.homeDomain ) { - elem.attr('href', 'http://' + encodeURI(entry.homeHostname)); - elem.text('(' + entry.homeDomain + ')'); + if ( entry.supportName ) { + elem = li.descendants('a:nth-of-type(2)'); + elem.attr('href', entry.supportURL); + elem.text('(' + entry.supportName + ')'); elem.css('display', ''); } elem = li.descendants('span:nth-of-type(1)'); - text = listStatsTemplate + var text = listStatsTemplate .replace('{{used}}', renderNumber(!entry.off && !isNaN(+entry.entryUsedCount) ? entry.entryUsedCount : 0)) .replace('{{total}}', !isNaN(+entry.entryCount) ? renderNumber(entry.entryCount) : '?'); elem.text(text); diff --git a/src/js/assets.js b/src/js/assets.js index 8a7e8a4..09ab790 100644 --- a/src/js/assets.js +++ b/src/js/assets.js @@ -1076,6 +1076,7 @@ exports.metadata = function(callback) { entryOut.localChecksum = entryRepo.localChecksum; entryOut.repoChecksum = entryRepo.repoChecksum; entryOut.homeURL = homeURLs[path] || ''; + entryOut.supportURL = entryRepo.supportURL || ''; entryOut.repoObsolete = entryOut.localChecksum !== entryOut.repoChecksum; } checkCacheObsolescence(); diff --git a/src/js/messaging.js b/src/js/messaging.js index da89c22..6dfecb7 100644 --- a/src/js/messaging.js +++ b/src/js/messaging.js @@ -663,15 +663,18 @@ var µb = µBlock; var prepEntries = function(entries) { var µburi = µb.URI; - var entry; + var entry, hn; for ( var k in entries ) { if ( entries.hasOwnProperty(k) === false ) { continue; } entry = entries[k]; - if ( typeof entry.homeURL === 'string' ) { - entry.homeHostname = µburi.hostnameFromURI(entry.homeURL); - entry.homeDomain = µburi.domainFromHostname(entry.homeHostname); + if ( typeof entry.supportURL === 'string' && entry.supportURL !== '' ) { + entry.supportName = µburi.hostnameFromURI(entry.supportURL); + } else if ( typeof entry.homeURL === 'string' && entry.homeURL !== '' ) { + hn = µburi.hostnameFromURI(entry.homeURL); + entry.supportURL = 'http://' + hn + '/'; + entry.supportName = µburi.domainFromHostname(hn); } } }; |