Noissue - Merge current tip to Edge bookmark

lib/url.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 11 matching lines @@
 let getDecodedHostname =
 /**
  * Gets the IDN-decoded hostname from a URL object.
  *
  * @param {URL} url
  * @return {string}
  * @static
  */
 exports.getDecodedHostname = url =>
 {
-  let hostname = url.hostname;
+  let {hostname} = url;
 
   if (hostname.indexOf("xn--") == -1)
     return hostname;
 
   return punycode.toUnicode(hostname);
 };
 
 /**
  * Gets the IDN-decoded hostname from the URL of a frame.
  * If the URL don't have host information (like "about:blank"
@@ skipping 16 matching lines @@
 
 /**
  * Converts a URL object into a string. For HTTP(S) URLs
  * the hostname gets IDN-decoded and the hash is stripped.
  *
  * @param {URL} url
  * @return {string}
  */
 exports.stringifyURL = url =>
 {
-  let protocol = url.protocol;
-  let href = url.href;
+  let {protocol, href} = url;
 
   if (protocol == "http:" || protocol == "https:")
   {
-    let hostname = url.hostname;
+    let {hostname} = url;
     if (hostname.indexOf("xn--") != -1)
       href = href.replace(hostname, punycode.toUnicode(hostname));
 
     let hash = href.indexOf("#");
     if (hash != -1)
       href = href.substr(0, hash);
   }
 
   return href;
 };
@@ skipping 22 matching lines @@
   documentHost = documentHost.replace(/\.+$/, "");
 
   if (requestHost == documentHost)
     return false;
 
   if (!isDomain(requestHost) || !isDomain(documentHost))
     return true;
 
   return getDomain(requestHost) != getDomain(documentHost);
 };