Merge pull request #1979 from isiahmeadows/fix-option-value

Allow `xlink:href` to get removed, fix `option.value` in mock

docs/change-log.md

@@ -38,6 +38,7 @@
 - core: Event listeners allocate less memory, swap at low cost, and are properly diffed now when rendered via `m.mount()`/`m.redraw()`.
 - core: `Object.prototype` properties can no longer interfere with event listener calls.
 - API: Event handlers, when set to literally `undefined` (or any non-function), are now correctly removed.
+- core: `xlink:href` attributes are now correctly removed
 
 ---
 

render/render.js

@@ -476,7 +476,7 @@ module.exports = function($window) {
 		if (key[0] === "o" && key[1] === "n") return updateEvent(vnode, key, value)
 		if ((old === value && !isFormAttribute(vnode, key)) && typeof value !== "object" || value === undefined) return
 		var element = vnode.dom
-		if (key.slice(0, 6) === "xlink:") element.setAttributeNS("http://www.w3.org/1999/xlink", key.slice(6), value)
+		if (key.slice(0, 6) === "xlink:") element.setAttributeNS("http://www.w3.org/1999/xlink", key, value)
 		else if (key === "style") updateStyle(element, old, value)
 		else if (key in element && !isAttribute(key) && ns === undefined && !isCustomElement(vnode)) {
 			if (key === "value") {

render/tests/test-attributes.js

@@ -376,15 +376,15 @@ o.spec("attributes", function() {
 
 			o(a.dom.value).equals("1")
 		})
-		o("null becomes the empty string", function() {
+		o("null becomes 'null'", function() {
 			var a = {tag: "option", attrs: {value: null}}
 			var b = {tag: "option", attrs: {value: "test"}}
 			var c = {tag: "option", attrs: {value: null}}
 
 			render(root, [a]);
 
-			o(a.dom.value).equals("")
-			o(a.dom.getAttribute("value")).equals("")
+			o(a.dom.value).equals("null")
+			o(a.dom.getAttribute("value")).equals("null")
 
 			render(root, [b]);
 
@@ -393,8 +393,8 @@ o.spec("attributes", function() {
 
 			render(root, [c]);
 
-			o(c.dom.value).equals("")
-			o(c.dom.getAttribute("value")).equals("")
+			o(c.dom.value).equals("null")
+			o(c.dom.getAttribute("value")).equals("null")
 		})
 		o("'' and 0 are different values", function() {
 			var a = {tag: "option", attrs: {value: 0}, children:[{tag:"#", children:""}]}

render/tests/test-createElement.js

@@ -65,8 +65,8 @@ o.spec("createElement", function() {
 		o(vnode.dom.namespaceURI).equals("http://www.w3.org/2000/svg")
 		o(vnode.dom.firstChild.nodeName).equals("a")
 		o(vnode.dom.firstChild.namespaceURI).equals("http://www.w3.org/2000/svg")
-		o(vnode.dom.firstChild.attributes["href"].value).equals("javascript:;")
-		o(vnode.dom.firstChild.attributes["href"].namespaceURI).equals("http://www.w3.org/1999/xlink")
+		o(vnode.dom.firstChild.attributes["xlink:href"].value).equals("javascript:;")
+		o(vnode.dom.firstChild.attributes["xlink:href"].namespaceURI).equals("http://www.w3.org/1999/xlink")
 		o(vnode.dom.childNodes[1].nodeName).equals("foreignObject")
 		o(vnode.dom.childNodes[1].firstChild.nodeName).equals("body")
 		o(vnode.dom.childNodes[1].firstChild.namespaceURI).equals("http://www.w3.org/1999/xhtml")
@@ -77,6 +77,24 @@ o.spec("createElement", function() {
 
 		o(vnode.dom.attributes["viewBox"].value).equals("0 0 100 100")
 	})
+	o("removes xlink:href", function() {
+		var vnode = {tag: "svg", ns: "http://www.w3.org/2000/svg", children: [
+			{tag: "a", ns: "http://www.w3.org/2000/svg", attrs: {"xlink:href": "javascript:;"}}
+		]}
+		render(root, [vnode])
+
+		o(vnode.dom.nodeName).equals("svg")
+		o(vnode.dom.firstChild.attributes["xlink:href"].value).equals("javascript:;")
+		o(vnode.dom.firstChild.attributes["xlink:href"].namespaceURI).equals("http://www.w3.org/1999/xlink")
+
+		vnode = {tag: "svg", ns: "http://www.w3.org/2000/svg", children: [
+			{tag: "a", ns: "http://www.w3.org/2000/svg", attrs: {}}
+		]}
+		render(root, [vnode])
+
+		o(vnode.dom.nodeName).equals("svg")
+		o(vnode.dom.firstChild.attributes["xlink:href"]).equals(undefined)
+	})
 	o("creates mathml", function() {
 		var vnode = {tag: "math", ns: "http://www.w3.org/1998/Math/MathML", children: [{tag: "mrow", ns: "http://www.w3.org/1998/Math/MathML"}]}
 		render(root, [vnode])

test-utils/domMock.js

@@ -445,7 +445,7 @@ module.exports = function(options) {
 				if (element.nodeName === "OPTION") {
 					var valueSetter = spy(function(value) {
 						/*eslint-disable no-implicit-coercion*/
-						this.setAttribute("value", value === null ? "" : "" + value)
+						this.setAttribute("value", "" + value)
 						/*eslint-enable no-implicit-coercion*/
 					})
 					Object.defineProperty(element, "value", {

test-utils/tests/test-domMock.js

@@ -954,11 +954,11 @@ o.spec("domMock", function() {
 					o(select.selectedIndex).equals(1)
 				}
 			})
-			o("option.value = null is converted to the empty string", function() {
+			o("option.value = null is converted to 'null'", function() {
 				var option = $document.createElement("option")
 				option.value = null
 
-				o(option.value).equals("")
+				o(option.value).equals("null")
 			})
 			o("setting valid value works with optgroup", function() {
 				var select = $document.createElement("select")