Fix spec bug (kinda) in reinitializing a hyperlink's internal URL

See whatwg/html#568; we do option 2 here since it avoids the performance hit of monitoring the attribute.
jsdom · Jan 27, 2016 · 0038dee · 0038dee
1 parent e268543
commit 0038dee
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 26 deletions.
diff --git a/lib/jsdom/living/nodes/HTMLHyperlinkElementUtils-impl.js b/lib/jsdom/living/nodes/HTMLHyperlinkElementUtils-impl.js
@@ -12,7 +12,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get href() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null) {
@@ -28,7 +28,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get origin() {
-    reinitializeURL(this);
+    setTheURL(this);
 
     if (this.url === null) {
       return "";
@@ -38,7 +38,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get protocol() {
-    reinitializeURL(this);
+    setTheURL(this);
 
     if (this.url === null) {
       return ":";
@@ -57,7 +57,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get username() {
-    reinitializeURL(this);
+    setTheURL(this);
 
     if (this.url === null) {
       return "";
@@ -78,7 +78,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get password() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.password === null) {
@@ -100,7 +100,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get host() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.host === null) {
@@ -115,7 +115,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set host(v) {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.nonRelative) {
@@ -127,7 +127,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get hostname() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.host === null) {
@@ -138,7 +138,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set hostname(v) {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.nonRelative) {
@@ -150,7 +150,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get port() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.port === null) {
@@ -161,7 +161,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set port(v) {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.host === null || url.nonRelative || url.scheme === "file") {
@@ -173,7 +173,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get pathname() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null) {
@@ -188,7 +188,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set pathname(v) {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.nonRelative) {
@@ -200,7 +200,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get search() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.query === null || url.query === "") {
@@ -211,7 +211,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set search(v) {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null) {
@@ -229,7 +229,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get hash() {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.fragment === null || url.fragment === "") {
@@ -240,7 +240,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set hash(v) {
-    reinitializeURL(this);
+    setTheURL(this);
     const url = this.url;
 
     if (url === null || url.scheme === "javascript") {
@@ -258,15 +258,6 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 };
 
-function reinitializeURL(hheu) {
-  const url = hheu.url;
-  if (url !== null && url.nonRelative) {
-    return;
-  }
-
-  setTheURL(hheu);
-}
-
 function setTheURL(hheu) {
   const href = hheu.getAttribute("href");
   try {

diff --git a/...mantics/links/links-created-by-a-and-area-elements/html-hyperlink-element-utils-href.html b/...mantics/links/links-created-by-a-and-area-elements/html-hyperlink-element-utils-href.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>HTMLHyperlinkElementUtils href setter</title>
+<link rel="author" title="Domenic Denicola" href="mailto:d@domenic.me">
+<link rel="help" href="https://html.spec.whatwg.org/#dom-hyperlink-href">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+test(() => {
+
+  const a = document.createElement("a");
+  a.setAttribute("href", "mycustomprotocol:abc");
+
+  assert_equals(a.protocol, "mycustomprotocol:");
+
+  a.href = "otherprot:test.js";
+  assert_equals(a.protocol, "otherprot:");
+
+}, "setting href IDL attribute also resets protocol on URLs with non-relative flag set");
+
+test(() => {
+
+  const a = document.createElement("a");
+  a.setAttribute("href", "mycustomprotocol:abc");
+
+  assert_equals(a.protocol, "mycustomprotocol:");
+
+  a.setAttribute("href", "otherprot:test.js");
+  assert_equals(a.protocol, "otherprot:");
+
+}, "setting href content attribute also resets protocol on URLs with non-relative flag set");
+
+</script>