1 files changed, 33 insertions, 13 deletions

diff --git a/assets/js/player.js b/assets/js/player.js
index 0cc4bab9..5ff55eb3 100644
--- a/assets/js/player.js
+++ b/assets/js/player.js
@@ -59,6 +59,16 @@ videojs.Hls.xhr.beforeRequest = function(options) {
 
 var player = videojs('player', options);
 
+const storage = (() => {
+    try {
+        if (localStorage.length !== -1) {
+            return localStorage;
+        }
+    } catch (e) {
+        console.info('No storage available: ' + e);
+    }
+    return undefined;
+})();
 
 if (location.pathname.startsWith('/embed/')) {
     player.overlay({
@@ -215,7 +225,7 @@ if (video_data.params.save_player_pos) {
         const raw = player.currentTime();
         const time = Math.floor(raw);
 
-        if(lastUpdated !== time) {
+        if(lastUpdated !== time && raw <= video_data.length_seconds - 15) {
             save_video_time(time);
             lastUpdated = time;
         }
@@ -386,25 +396,35 @@ function get_video_time() {
 }
 
 function set_all_video_times(times) {
-    const json = JSON.stringify(times);
-
-    localStorage.setItem(save_player_pos_key, json);
+    if (storage) {
+        if (times) {
+            try {
+                storage.setItem(save_player_pos_key, JSON.stringify(times));
+            } catch (e) {
+                console.debug('set_all_video_times: ' + e);
+            }
+        } else {
+            storage.removeItem(save_player_pos_key);
+        }
+    }
 }
 
 function get_all_video_times() {
-    try {
-        const raw = localStorage.getItem(save_player_pos_key);
-        const times = JSON.parse(raw);
-
-        return times || {};
-    }
-    catch {
-        return {};
+    if (storage) {
+        const raw = storage.getItem(save_player_pos_key);
+        if (raw !== null) {
+            try {
+                return JSON.parse(raw);
+            } catch (e) {
+                console.debug('get_all_video_times: ' + e);
+            }
+        }
     }
+    return {};
 }
 
 function remove_all_video_times() {
-    localStorage.removeItem(save_player_pos_key);
+    set_all_video_times(null);
 }
 
 function set_time_percent(percent) {