From bde21d527f1fae4a84b964f1b297d7b246526ba0 Mon Sep 17 00:00:00 2001
From: Wes van der Vleuten <16665772+WesVleuten@users.noreply.github.com>
Date: Sun, 19 Feb 2023 20:41:18 +0100
Subject: [PATCH] Fixed console error

---
 assets/js/watched_indicator.js              | 24 +++++++++++++++++++++
 assets/js/watched_widget.js                 | 24 ---------------------
 src/invidious/views/add_playlist_items.ecr  |  2 +-
 src/invidious/views/channel.ecr             |  2 +-
 src/invidious/views/edit_playlist.ecr       |  2 +-
 src/invidious/views/feeds/playlists.ecr     |  2 +-
 src/invidious/views/feeds/popular.ecr       |  2 +-
 src/invidious/views/feeds/subscriptions.ecr |  3 ++-
 src/invidious/views/feeds/trending.ecr      |  2 +-
 src/invidious/views/hashtag.ecr             |  2 +-
 src/invidious/views/playlist.ecr            |  2 +-
 src/invidious/views/search.ecr              |  2 +-
 12 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 assets/js/watched_indicator.js

diff --git a/assets/js/watched_indicator.js b/assets/js/watched_indicator.js
new file mode 100644
index 00000000..e971cd80
--- /dev/null
+++ b/assets/js/watched_indicator.js
@@ -0,0 +1,24 @@
+'use strict';
+var save_player_pos_key = 'save_player_pos';
+
+function get_all_video_times() {
+    return helpers.storage.get(save_player_pos_key) || {};
+}
+
+document.querySelectorAll('.watched-indicator').forEach(function (indicator) {
+    var watched_part = get_all_video_times()[indicator.dataset.id];
+    var total = parseInt(indicator.dataset.length, 10);
+    if (watched_part === undefined) {
+        watched_part = total;
+    }
+    var percentage = Math.round((watched_part / total) * 100);
+
+    if (percentage < 5) {
+        percentage = 5;
+    }
+    if (percentage > 90) {
+        percentage = 100;
+    }
+
+    indicator.style.width = percentage + '%';
+});
diff --git a/assets/js/watched_widget.js b/assets/js/watched_widget.js
index 02537111..f1ac9cb4 100644
--- a/assets/js/watched_widget.js
+++ b/assets/js/watched_widget.js
@@ -32,27 +32,3 @@ function mark_unwatched(target) {
         }
     });
 }
-
-var save_player_pos_key = 'save_player_pos';
-
-function get_all_video_times() {
-    return helpers.storage.get(save_player_pos_key) || {};
-}
-
-document.querySelectorAll('.watched-indicator').forEach(function (indicator) {
-    var watched_part = get_all_video_times()[indicator.dataset.id];
-    var total = parseInt(indicator.dataset.length, 10);
-    if (watched_part === undefined) {
-        watched_part = total;
-    }
-    var percentage = Math.round((watched_part / total) * 100);
-
-    if (percentage < 5) {
-        percentage = 5;
-    }
-    if (percentage > 90) {
-        percentage = 100;
-    }
-
-    indicator.style.width = percentage + '%';
-});
diff --git a/src/invidious/views/add_playlist_items.ecr b/src/invidious/views/add_playlist_items.ecr
index 70575de3..bcba74cf 100644
--- a/src/invidious/views/add_playlist_items.ecr
+++ b/src/invidious/views/add_playlist_items.ecr
@@ -39,7 +39,7 @@
     <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <% if query %>
     <%- query_encoded = URI.encode_www_form(query.text, space_to_plus: true) -%>
diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
index 931dd407..6e62a471 100644
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -49,7 +49,7 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-md-4-5"></div>
diff --git a/src/invidious/views/edit_playlist.ecr b/src/invidious/views/edit_playlist.ecr
index 100764c7..548104c8 100644
--- a/src/invidious/views/edit_playlist.ecr
+++ b/src/invidious/views/edit_playlist.ecr
@@ -62,7 +62,7 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-lg-1-5">
diff --git a/src/invidious/views/feeds/playlists.ecr b/src/invidious/views/feeds/playlists.ecr
index f9064762..e52a7707 100644
--- a/src/invidious/views/feeds/playlists.ecr
+++ b/src/invidious/views/feeds/playlists.ecr
@@ -33,4 +33,4 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
diff --git a/src/invidious/views/feeds/popular.ecr b/src/invidious/views/feeds/popular.ecr
index 919002cd..5fbe539c 100644
--- a/src/invidious/views/feeds/popular.ecr
+++ b/src/invidious/views/feeds/popular.ecr
@@ -17,4 +17,4 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
diff --git a/src/invidious/views/feeds/subscriptions.ecr b/src/invidious/views/feeds/subscriptions.ecr
index d4e93240..9c69c5b0 100644
--- a/src/invidious/views/feeds/subscriptions.ecr
+++ b/src/invidious/views/feeds/subscriptions.ecr
@@ -54,6 +54,7 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/watched_widget.js"></script>
 
 <div class="pure-g">
 <% videos.each do |item| %>
@@ -61,7 +62,7 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-lg-1-5">
diff --git a/src/invidious/views/feeds/trending.ecr b/src/invidious/views/feeds/trending.ecr
index 76218165..7dc416c6 100644
--- a/src/invidious/views/feeds/trending.ecr
+++ b/src/invidious/views/feeds/trending.ecr
@@ -46,4 +46,4 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
diff --git a/src/invidious/views/hashtag.ecr b/src/invidious/views/hashtag.ecr
index 6064af74..3351c21c 100644
--- a/src/invidious/views/hashtag.ecr
+++ b/src/invidious/views/hashtag.ecr
@@ -24,7 +24,7 @@
     <%- end -%>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-lg-1-5">
diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr
index 1df047ba..a04acf4c 100644
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -106,7 +106,7 @@
 <% end %>
 </div>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-lg-1-5">
diff --git a/src/invidious/views/search.ecr b/src/invidious/views/search.ecr
index c4960d08..a7469e36 100644
--- a/src/invidious/views/search.ecr
+++ b/src/invidious/views/search.ecr
@@ -37,7 +37,7 @@
 </div>
 <%- end -%>
 
-<script src="/js/watched_widget.js"></script>
+<script src="/js/watched_indicator.js"></script>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-lg-1-5">