From 8a76e4f00193e345910645a1f7e0edd0f427410d Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Sun, 10 Nov 2024 01:48:18 -0800
Subject: [PATCH] Remove videojs-share
Extension is abandoned and doesn't work well on videojs 8
---
assets/css/player.css | 12 +---------
assets/js/player.js | 24 +------------------
.../views/components/player_sources.ecr | 2 --
src/invidious/views/licenses.ecr | 14 -----------
videojs-dependencies.yml | 4 ----
5 files changed, 2 insertions(+), 54 deletions(-)
diff --git a/assets/css/player.css b/assets/css/player.css
index 9cb400ad..6659db73 100644
--- a/assets/css/player.css
+++ b/assets/css/player.css
@@ -115,12 +115,8 @@ ul.vjs-menu-content::-webkit-scrollbar {
order: 5;
}
-.vjs-share-control {
- order: 6;
-}
-
.vjs-fullscreen-control {
- order: 7;
+ order: 6;
}
.vjs-playback-rate > .vjs-menu {
@@ -252,12 +248,6 @@ video.video-js {
top: 1.5em;
}
-@media screen and (max-width: 700px) {
- .video-js .vjs-share {
- justify-content: unset;
- }
-}
-
@media screen and (max-width: 650px) {
.vjs-modal-dialog-content {
overflow-x: hidden;
diff --git a/assets/js/player.js b/assets/js/player.js
index 353a5296..608415eb 100644
--- a/assets/js/player.js
+++ b/assets/js/player.js
@@ -157,22 +157,6 @@ player.on('timeupdate', function () {
});
-var shareOptions = {
- socials: ['fbFeed', 'tw', 'reddit', 'email'],
-
- get url() {
- return addCurrentTimeToURL(short_url);
- },
- title: player_data.title,
- description: player_data.description,
- image: player_data.thumbnail,
- get embedCode() {
- // Single quotes inside here required. HTML inserted as is into value attribute of input
- return "<iframe id='ivplayer' width='640' height='360' src='" +
- addCurrentTimeToURL(embed_url) + "' style='border:none;'></iframe>";
- }
-};
-
if (location.pathname.startsWith('/embed/')) {
var overlay_content = '<h1><a rel="noopener" target="_blank" href="' + location.origin + '/watch?v=' + video_data.id + '">' + player_data.title + '</a></h1>';
player.overlay({
@@ -219,11 +203,8 @@ if (isMobile()) {
var playback_element = document.getElementsByClassName('vjs-playback-rate')[0];
operations_bar_element.append(playback_element);
- // The share and http source selector element can't be fetched till the players ready.
+ // The http source selector element can't be fetched till the players ready.
player.one('playing', function () {
- var share_element = document.getElementsByClassName('vjs-share-control')[0];
- operations_bar_element.append(share_element);
-
if (!video_data.params.listen && video_data.params.quality === 'dash') {
var http_source_selector = document.getElementsByClassName('vjs-http-source-selector vjs-menu-button')[0];
operations_bar_element.append(http_source_selector);
@@ -725,9 +706,6 @@ addEventListener('keydown', function (e) {
player.on('DOMMouseScroll', mouseScroll);
}());
-// Since videojs-share can sometimes be blocked, we defer it until last
-if (player.share) player.share(shareOptions);
-
// show the preferred caption by default
if (player_data.preferred_caption_found) {
player.ready(function () {
diff --git a/src/invidious/views/components/player_sources.ecr b/src/invidious/views/components/player_sources.ecr
index 9af3899c..9b38eaac 100644
--- a/src/invidious/views/components/player_sources.ecr
+++ b/src/invidious/views/components/player_sources.ecr
@@ -1,7 +1,6 @@
<link rel="stylesheet" href="/videojs/video.js/video-js.css?v=<%= ASSET_COMMIT %>">
<link rel="stylesheet" href="/videojs/videojs-http-source-selector/videojs-http-source-selector.css?v=<%= ASSET_COMMIT %>">
<link rel="stylesheet" href="/videojs/videojs-markers/videojs.markers.css?v=<%= ASSET_COMMIT %>">
-<link rel="stylesheet" href="/videojs/videojs-share/videojs-share.css?v=<%= ASSET_COMMIT %>">
<link rel="stylesheet" href="/videojs/videojs-vtt-thumbnails/videojs-vtt-thumbnails.css?v=<%= ASSET_COMMIT %>">
<link rel="stylesheet" href="/videojs/videojs-mobile-ui/videojs-mobile-ui.css?v=<%= ASSET_COMMIT %>">
<link rel="stylesheet" href="/css/player.css?v=<%= ASSET_COMMIT %>">
@@ -11,7 +10,6 @@
<script src="/videojs/videojs-contrib-quality-levels/videojs-contrib-quality-levels.js?v=<%= ASSET_COMMIT %>"></script>
<script src="/videojs/videojs-http-source-selector/videojs-http-source-selector.js?v=<%= ASSET_COMMIT %>"></script>
<script src="/videojs/videojs-markers/videojs-markers.js?v=<%= ASSET_COMMIT %>"></script>
-<script src="/videojs/videojs-share/videojs-share.js?v=<%= ASSET_COMMIT %>"></script>
<script src="/videojs/videojs-vtt-thumbnails/videojs-vtt-thumbnails.js?v=<%= ASSET_COMMIT %>"></script>
diff --git a/src/invidious/views/licenses.ecr b/src/invidious/views/licenses.ecr
index 667cfa37..b7352dfa 100644
--- a/src/invidious/views/licenses.ecr
+++ b/src/invidious/views/licenses.ecr
@@ -219,20 +219,6 @@
</td>
</tr>
- <tr>
- <td>
- <a href="/videojs/videojs-share/videojs-share.js?v=<%= ASSET_COMMIT %>">videojs-share.js</a>
- </td>
-
- <td>
- <a href="http://www.jclark.com/xml/copying.txt">Expat</a>
- </td>
-
- <td>
- <a href="https://github.com/mkhazov/videojs-share"><%= translate(locale, "source") %></a>
- </td>
- </tr>
-
<tr>
<td>
<a href="/videojs/videojs-vtt-thumbnails/videojs-vtt-thumbnails.js?v=<%= ASSET_COMMIT %>">videojs-vtt-thumbnails.js</a>
diff --git a/videojs-dependencies.yml b/videojs-dependencies.yml
index e9ccc9dd..8bd3404c 100644
--- a/videojs-dependencies.yml
+++ b/videojs-dependencies.yml
@@ -23,10 +23,6 @@ videojs-overlay:
version: 2.1.4
shasum: 5a103b25374dbb753eb87960d8360c2e8f39cc05
-videojs-share:
- version: 3.2.1
- shasum: 0a3024b981387b9d21c058c829760a72c14b8ceb
-
videojs-vr:
version: 1.8.0
shasum: 7f2f07f760d8a329c615acd316e49da6ee8edd34