fix SSR tests

yyx990803 · yyx990803 · commit 84b7b82031ac · 2016-12-22T23:03:05.000-05:00
diff --git a/src/platforms/web/server/modules/dom-props.js b/src/platforms/web/server/modules/dom-props.js
@@ -20,14 +20,17 @@ export default function renderDOMProps (node: VNodeWithData): string {
     return res
   }
 
+  const attrs = node.data.attrs
   for (const key in props) {
     if (key === 'innerHTML') {
       setText(node, props[key], true)
     } else if (key === 'textContent') {
       setText(node, props[key])
     } else {
       const attr = propsToAttrMap[key] || key.toLowerCase()
-      if (isRenderableAttr(attr)) {
+      if (isRenderableAttr(attr) &&
+          // avoid rendering double-bound props/attrs twice
+          !(attrs && attrs[attr])) {
         res += renderAttr(attr, props[key])
       }
     }
diff --git a/src/platforms/web/server/util.js b/src/platforms/web/server/util.js
@@ -8,7 +8,7 @@ const isAttr = makeMap(
   'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' +
   'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' +
   'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' +
-  'form,formaction,headers,<th>,height,hidden,high,href,hreflang,http-equiv,' +
+  'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' +
   'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' +
   'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' +
   'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' +

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,17 @@ export default function renderDOMProps (node: VNodeWithData): string {`
`20`	`20`	`return res`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ const attrs = node.data.attrs`
`23`	`24`	`for (const key in props) {`
`24`	`25`	`if (key === 'innerHTML') {`
`25`	`26`	`setText(node, props[key], true)`
`26`	`27`	`} else if (key === 'textContent') {`
`27`	`28`	`setText(node, props[key])`
`28`	`29`	`} else {`
`29`	`30`	`const attr = propsToAttrMap[key] \|\| key.toLowerCase()`
`30`		`- if (isRenderableAttr(attr)) {`
	`31`	`+ if (isRenderableAttr(attr) &&`
	`32`	`+ // avoid rendering double-bound props/attrs twice`
	`33`	`+ !(attrs && attrs[attr])) {`
`31`	`34`	`res += renderAttr(attr, props[key])`
`32`	`35`	`}`
`33`	`36`	`}`