Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: lib/url.js

Issue 29340571: Issue 3687 - Add experimental support for Safari content blockers (Closed)
Left Patch Set: Rebased Created May 17, 2016, 9:19 a.m.
Right Patch Set: Addressed Nits Created May 18, 2016, 11:30 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/tldjs.js ('k') | metadata.chrome » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 /** @module url */ 18 /** @module url */
19 19
20 let getDomain = require("tldjs").getDomain; 20 let getDomain = require("tldjs").getDomain;
21 let punycode = require("punycode");
21 22
22 let getDecodedHostname = 23 let getDecodedHostname =
23 /** 24 /**
24 * Gets the IDN-decoded hostname from a URL object. 25 * Gets the IDN-decoded hostname from a URL object.
25 * 26 *
26 * @param {URL} url 27 * @param {URL} url
27 * @return {string} 28 * @return {string}
28 * @static 29 * @static
29 */ 30 */
30 exports.getDecodedHostname = function(url) 31 exports.getDecodedHostname = function(url)
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 documentHost = documentHost.replace(/\.+$/, ""); 108 documentHost = documentHost.replace(/\.+$/, "");
108 109
109 if (requestHost == documentHost) 110 if (requestHost == documentHost)
110 return false; 111 return false;
111 112
112 if (!isDomain(requestHost) || !isDomain(documentHost)) 113 if (!isDomain(requestHost) || !isDomain(documentHost))
113 return true; 114 return true;
114 115
115 return getDomain(requestHost) != getDomain(documentHost); 116 return getDomain(requestHost) != getDomain(documentHost);
116 }; 117 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld