feat: SSR support for Web Storage plugin

angelomedeiros · Jun 18, 2018 · 78d5d23 · 78d5d23
1 parent 3bd2f9d
commit 78d5d23
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/plugins/platform.js b/src/plugins/platform.js
@@ -169,20 +169,30 @@ function getPlatform (userAgent) {
   return browser
 }
 
-function getClientProperties () {
-  let webStorage = false
+let webStorage
+
+export function hasWebStorage () {
+  if (webStorage !== void 0) {
+    return webStorage
+  }
 
   try {
     if (window.localStorage) {
       webStorage = true
+      return true
     }
   }
   catch (e) {}
 
+  webStorage = false
+  return false
+}
+
+function getClientProperties () {
   return {
     has: {
       touch: (() => !!('ontouchstart' in document.documentElement) || window.navigator.msMaxTouchPoints > 0)(),
-      webStorage
+      webStorage: hasWebStorage()
     },
     within: {
       iframe: window.self !== window.top

diff --git a/src/plugins/web-storage.js b/src/plugins/web-storage.js
@@ -1,4 +1,4 @@
-import { onSSR } from './platform'
+import { onSSR, hasWebStorage } from './platform'
 
 function encode (value) {
   if (Object.prototype.toString.call(value) === '[object Date]') {
@@ -130,7 +130,7 @@ export const LocalStorage = {
       return
     }
 
-    if ($q.platform.has.webStorage) {
+    if (hasWebStorage()) {
       const storage = getStorage('local')
       $q.localStorage = storage
       Object.assign(this, storage)
@@ -145,7 +145,7 @@ export const SessionStorage = {
       return
     }
 
-    if ($q.platform.has.webStorage) {
+    if (hasWebStorage()) {
       const storage = getStorage('session')
       $q.sessionStorage = storage
       Object.assign(this, storage)