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

Delta Between Two Patch Sets: lib/tldjs.js

Issue 29340571: Issue 3687 - Add experimental support for Safari content blockers (Closed)
Left Patch Set: Improve comments about buggy behavouir Created May 17, 2016, 6:22 p.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/punycode.js ('k') | lib/url.js » ('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 tldjs */ 18 /** @module tldjs */
19 19
20 let getDomain = 20 let getDomain =
21 /** 21 /**
22 * Get the base domain for given hostname. 22 * Get the base domain for given hostname.
23 * 23 *
24 * @param {string} hostname 24 * @param {string} hostname
25 * @return {string} 25 * @return {string}
26 */ 26 */
27 exports.getDomain = function (hostname) 27 exports.getDomain = function(hostname)
Sebastian Noack 2016/05/17 18:35:26 Nit: Redundant space before argument list.
kzar 2016/05/17 19:20:23 Done.
28 { 28 {
29 let bits = hostname.split("."); 29 let bits = hostname.split(".");
30 let cutoff = bits.length - 2; 30 let cutoff = bits.length - 2;
31 31
32 for (let i = 0; i < bits.length; i++) 32 for (let i = 0; i < bits.length; i++)
33 { 33 {
34 let offset = publicSuffixes[bits.slice(i).join(".")]; 34 let offset = publicSuffixes[bits.slice(i).join(".")];
35 35
36 if (typeof offset != "undefined") 36 if (typeof offset != "undefined")
37 { 37 {
38 cutoff = i - offset; 38 cutoff = i - offset;
39 break; 39 break;
40 } 40 }
41 } 41 }
42 42
43 if (cutoff <= 0) 43 if (cutoff <= 0)
44 return hostname; 44 return hostname;
45 45
46 return bits.slice(cutoff).join("."); 46 return bits.slice(cutoff).join(".");
47 } 47 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld