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

Delta Between Two Patch Sets: lib/url.js

Issue 4544964214128640: Issue 1841 - Replaced URI class with built-in URL objects (Closed)
Left Patch Set: Created Jan. 21, 2015, 7:54 a.m.
Right Patch Set: Addressed comments Created Jan. 21, 2015, 5:47 p.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/basedomain.js ('k') | lib/whitelisting.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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 window.URL = (function() 18 window.URL = (function()
19 { 19 {
20 let URL = window.URL || window.webkitURL; 20 let URL = window.URL || window.webkitURL;
21 let URLproperties = ["href", "protocol", "host", "hostname", "port", "pathname ", "search"]; 21 let URLProperties = ["href", "protocol", "host", "hostname", "port", "pathname ", "search"];
Wladimir Palant 2015/01/21 15:33:44 Nit: This isn't proper camel case, should be URLPr
Sebastian Noack 2015/01/21 17:48:18 Done.
22 22
23 if (!URL || !URLproperties.every(prop => prop in new URL(""))) 23 if (!URL || !URLProperties.every(prop => prop in new URL("")))
Wladimir Palant 2015/01/21 15:33:44 This will create seven URL instances, seems unnece
Sebastian Noack 2015/01/21 15:58:04 So what? This code runs only once, and an empty st
24 { 24 {
25 let doc = document.implementation.createHTMLDocument(); 25 let doc = document.implementation.createHTMLDocument();
26 26
27 let base = doc.createElement("base"); 27 let base = doc.createElement("base");
28 doc.head.appendChild(base); 28 doc.head.appendChild(base);
Wladimir Palant 2015/01/21 15:33:44 I was about to suggest using xml:base (wouldn't re
29 29
30 let anchor = doc.createElement("a"); 30 let anchor = doc.createElement("a");
31 doc.body.appendChild(anchor); 31 doc.body.appendChild(anchor);
32 32
33 URL = function(url, baseUrl) 33 URL = function(url, baseUrl)
34 { 34 {
35 base.href = baseUrl; 35 if (baseUrl instanceof URL)
Wladimir Palant 2015/01/21 15:33:44 This will stringify baseUrl, meaning typically ass
Sebastian Noack 2015/01/21 17:48:18 Done.
36 base.href = baseUrl.href;
37 else
38 base.href = baseUrl || "";
36 anchor.href = url; 39 anchor.href = url;
37 40
38 for (var prop of URLproperties) 41 for (let prop of URLProperties)
Wladimir Palant 2015/01/21 15:33:44 Nit: let prop?
Sebastian Noack 2015/01/21 17:48:18 Done.
39 this[prop] = anchor[prop]; 42 this[prop] = anchor[prop];
40 }; 43 };
41 } 44 }
42 45
43 return URL; 46 return URL;
44 })(); 47 })();
LEFTRIGHT

Powered by Google App Engine
This is Rietveld