fix transition hidden check (fix vuejs#1781)

yyx990803 · yyx990803 · commit 01825aa120bf · 2015-11-10T16:03:44.000-05:00
diff --git a/src/directives/public/show.js b/src/directives/public/show.js
@@ -19,14 +19,8 @@ module.exports = {
   },
 
   apply: function (el, value) {
-    function done () {
+    transition.apply(el, value ? 1 : -1, function () {
       el.style.display = value ? '' : 'none'
-    }
-    // do not apply transition if not in doc
-    if (_.inDoc(el)) {
-      transition.apply(el, value ? 1 : -1, done, this.vm)
-    } else {
-      done()
-    }
+    }, this.vm)
   }
 }
diff --git a/src/transition/transition.js b/src/transition/transition.js
@@ -358,8 +358,8 @@ p.setupCssCb = function (event, cb) {
 
 function isHidden (el) {
   return !(
-    el.offsetWidth &&
-    el.offsetHeight &&
+    el.offsetWidth ||
+    el.offsetHeight ||
     el.getClientRects().length
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,8 @@ p.setupCssCb = function (event, cb) {`
`358`	`358`
`359`	`359`	`function isHidden (el) {`
`360`	`360`	`return !(`
`361`		`- el.offsetWidth &&`
`362`		`- el.offsetHeight &&`
	`361`	`+ el.offsetWidth \|\|`
	`362`	`+ el.offsetHeight \|\|`
`363`	`363`	`el.getClientRects().length`
`364`	`364`	`)`
`365`	`365`	`}`