1 files changed, 18 insertions, 11 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index e6f0017a..969799ae 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -66,15 +66,7 @@
             fallback:           true
         },
         storage: {
-            enabled:            true,
-            supported:          function() {
-                try {
-                    return "localStorage" in window && window.localStorage !== null;
-                } 
-                catch(e) {
-                    return false;
-                }
-            }
+            enabled:            true
         }
     };
 
@@ -342,6 +334,21 @@
         return fullscreen;
     }
 
+    // Local storage
+    function _storage() {
+        var storage = {
+            supported: (function() {
+                try {
+                    return "localStorage" in window && window.localStorage !== null;
+                } 
+                catch(e) {
+                    return false;
+                }
+            })()
+        }
+        return storage;
+    }
+
     // Player instance
     function Plyr(container) {
         var player = this;
@@ -829,7 +836,7 @@
         function _setVolume(volume) {
             // Use default if needed
             if(typeof volume === "undefined") {
-                if(config.storage.enabled && config.storage.supported) {
+                if(config.storage.enabled && _storage().supported) {
                     volume = window.localStorage.plyr_volume || config.volume;
                 }
                 else {
@@ -846,7 +853,7 @@
             _checkMute();
 
             // Store the volume in storage
-            if(config.storage.enabled && config.storage.supported) {
+            if(config.storage.enabled && _storage().supported) {
                 window.localStorage.plyr_volume = volume;
             }
         }