Tooltip: fix ssr, fixed #3173 (#3214)

4ac6fed6 · cinwell.li · baiyaaaaa · 3768ba2b · 4ac6fed6
Commit 4ac6fed6 authored Mar 09, 2017 by cinwell.li Committed by baiyaaaaa Mar 09, 2017
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 17 deletions

packages/tooltip/src/main.js packages/tooltip/src/main.js +17 -17

No files found.
--- a/packages/tooltip/src/main.js
+++ b/packages/tooltip/src/main.js
@@ -52,8 +52,7 @@ export default {
  },

  render(h) {
-    if (this.$isServer) return;
-
+    if (this.popperVM) {
      this.popperVM.node = (
        <transition
          name={ this.transition }
@@ -69,6 +68,7 @@ export default {
            { this.$slots.content || this.content }
          </div>
        </transition>);
+    }

    if (!this.$slots.default || !this.$slots.default.length) return this.$slots.default;