feat: Detect if coming from SSR

angelomedeiros · Jun 8, 2018 · 6f73fac · 6f73fac
1 parent 96041f1
commit 6f73fac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -7,7 +7,7 @@ export default function (Component, Vue) {
 
       const node = document.createElement('div')
       document.body.appendChild(node)
-      
+
       const
         ok = data => {
           resolve(data)