v-show should ignore inline display:none (ref #3484)

yyx990803 · yyx990803 · commit 3bd7e5880190 · 2016-08-19T12:51:15.000-04:00
diff --git a/src/platforms/web/runtime/directives/show.js b/src/platforms/web/runtime/directives/show.js
@@ -17,7 +17,7 @@ export default {
     if (value && transition && transition.appear && !isIE9) {
       enter(vnode)
     }
-    const originalDisplay = el.style.display
+    const originalDisplay = el.style.display === 'none' ? '' : el.style.display
     el.style.display = value ? originalDisplay : 'none'
     el.__vOriginalDisplay = originalDisplay
   },

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export default {`
`17`	`17`	`if (value && transition && transition.appear && !isIE9) {`
`18`	`18`	`enter(vnode)`
`19`	`19`	`}`
`20`		`- const originalDisplay = el.style.display`
	`20`	`+ const originalDisplay = el.style.display === 'none' ? '' : el.style.display`
`21`	`21`	`el.style.display = value ? originalDisplay : 'none'`
`22`	`22`	`el.__vOriginalDisplay = originalDisplay`
`23`	`23`	`},`