diff options
| author | gorhill <rhill@raymondhill.net> | 2015-01-14 17:45:55 -0500 |
|---|---|---|
| committer | gorhill <rhill@raymondhill.net> | 2015-01-14 17:45:55 -0500 |
| commit | ee01803419fb36fa0acf9f04bb2a87fffa11ea53 (patch) | |
| tree | 271ca4ffd6e3507305bf2967d8221b6f201cf76b /src | |
| parent | 511b700517506ee9e88242eab18cc244b605c97d (diff) | |
| download | uBlock-ee01803419fb36fa0acf9f04bb2a87fffa11ea53.zip uBlock-ee01803419fb36fa0acf9f04bb2a87fffa11ea53.tar.gz uBlock-ee01803419fb36fa0acf9f04bb2a87fffa11ea53.tar.bz2 | |
this fixes one part of #498
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/messaging.js | 7 | ||||
| -rw-r--r-- | src/js/popup.js | 2 | ||||
| -rw-r--r-- | src/popup.html | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/js/messaging.js b/src/js/messaging.js index afed646..2b4efc4 100644 --- a/src/js/messaging.js +++ b/src/js/messaging.js @@ -342,6 +342,7 @@ var filterRequests = function(pageStore, details) { var µburi = µb.URI; // Create evaluation context + details.pageHostname = vAPI.punycodeHostname(details.pageHostname); details.pageDomain = µburi.domainFromHostname(details.pageHostname); details.rootHostname = pageStore.rootHostname; details.rootDomain = pageStore.rootDomain; @@ -356,8 +357,8 @@ var filterRequests = function(pageStore, details) { if ( tagNameToRequestTypeMap.hasOwnProperty(request.tagName) === false ) { continue; } - details.requestURL = request.url; - details.requestHostname = µburi.hostnameFromURI(request.url); + details.requestURL = vAPI.punycodeURL(request.url); + details.requestHostname = µburi.hostnameFromURI(details.requestURL); details.requestType = tagNameToRequestTypeMap[request.tagName]; result = pageStore.filterRequest(details); if ( pageStore.boolFromResult(result) ) { @@ -379,9 +380,11 @@ var filterRequest = function(pageStore, details) { return; } var µburi = µb.URI; + details.pageHostname = vAPI.punycodeHostname(details.pageHostname); details.pageDomain = µburi.domainFromHostname(details.pageHostname); details.rootHostname = pageStore.rootHostname; details.rootDomain = pageStore.rootDomain; + details.requestURL = vAPI.punycodeURL(details.requestURL); details.requestHostname = µburi.hostnameFromURI(details.requestURL); details.requestType = tagNameToRequestTypeMap[details.tagName]; var result = pageStore.filterRequest(details); diff --git a/src/js/popup.js b/src/js/popup.js index 57a8f95..a18b03c 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -139,7 +139,7 @@ var addDynamicFilterRow = function(des) { } row.descendants('[data-des]').attr('data-des', des); - row.descendants('span:nth-of-type(1)').text(des); + row.descendants('span:nth-of-type(1)').text(punycode.toUnicode(des)); var hnDetails = popupData.hostnameDict[des] || {}; diff --git a/src/popup.html b/src/popup.html index 6233f16..9679abf 100644 --- a/src/popup.html +++ b/src/popup.html @@ -42,6 +42,7 @@ <div id="hotspotTip"></div> </div> +<script src="lib/punycode.min.js"></script> <script src="js/vapi-common.js"></script> <script src="js/vapi-client.js"></script> <script src="js/vapi-popup.js"></script> |