From 6f73fac75c83da592928c330c34f5cd07cb8ba3a Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Sat, 9 Jun 2018 01:41:43 +0300 Subject: [PATCH] feat: Detect if coming from SSR --- src/mixins/can-render.js | 3 +-- src/plugins/platform.js | 4 ++++ src/utils/modal-fn.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mixins/can-render.js b/src/mixins/can-render.js index 6a2d436207f..9b3c67c37fd 100644 --- a/src/mixins/can-render.js +++ b/src/mixins/can-render.js @@ -2,9 +2,8 @@ export default { data () { - const is = this.$q.platform.is return { - canRender: is.cordova || is.electron + canRender: !this.$q.platform.is.fromSSR } }, mounted () { diff --git a/src/plugins/platform.js b/src/plugins/platform.js index b84ba55154d..7cb626149cf 100644 --- a/src/plugins/platform.js +++ b/src/plugins/platform.js @@ -156,6 +156,10 @@ function getPlatform (userAgent) { else if (window._cordovaNative || window.cordova) { browser.cordova = true } + + browser.fromSSR = browser.cordova === void 0 && + browser.electron === void 0 && + !!document.querySelector('[data-server-rendered]') } return browser diff --git a/src/utils/modal-fn.js b/src/utils/modal-fn.js index 96fd90c896b..a0ee8dc33f1 100644 --- a/src/utils/modal-fn.js +++ b/src/utils/modal-fn.js @@ -7,7 +7,7 @@ export default function (Component, Vue) { const node = document.createElement('div') document.body.appendChild(node) - + const ok = data => { resolve(data)