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

Delta Between Two Patch Sets: lib/url.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: Undo accidental whitespace change Created Jan. 16, 2017, 2:57 p.m.
Right Patch Set: Addressed some more feedback Created Jan. 18, 2017, 11:44 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/uninstall.js ('k') | lib/utils.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 url */ 18 /** @module url */
19 19
20 "use strict"; 20 "use strict";
21 21
22 let getDomain = require("tldjs").getDomain; 22 const {getDomain} = require("tldjs");
23 let punycode = require("punycode"); 23 const punycode = require("punycode");
24 24
25 let getDecodedHostname = 25 let getDecodedHostname =
26 /** 26 /**
27 * Gets the IDN-decoded hostname from a URL object. 27 * Gets the IDN-decoded hostname from a URL object.
28 * 28 *
29 * @param {URL} url 29 * @param {URL} url
30 * @return {string} 30 * @return {string}
31 * @static 31 * @static
32 */ 32 */
33 exports.getDecodedHostname = url => 33 exports.getDecodedHostname = url =>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 documentHost = documentHost.replace(/\.+$/, ""); 110 documentHost = documentHost.replace(/\.+$/, "");
111 111
112 if (requestHost == documentHost) 112 if (requestHost == documentHost)
113 return false; 113 return false;
114 114
115 if (!isDomain(requestHost) || !isDomain(documentHost)) 115 if (!isDomain(requestHost) || !isDomain(documentHost))
116 return true; 116 return true;
117 117
118 return getDomain(requestHost) != getDomain(documentHost); 118 return getDomain(requestHost) != getDomain(documentHost);
119 }; 119 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld