Compare commits

...
4 Commits
3 changed files with 83 additions and 41 deletions
+56 -40
View File
@@ -288,7 +288,7 @@ try {
var liveWidget = headerRight.querySelector('#yaknet-header-account-widget'); var liveWidget = headerRight.querySelector('#yaknet-header-account-widget');
if (isAuth) { if (isAuth) {
// Logged In: Show YakNet Profile Menu, Hide default login link // 1. AUTHENTICATED: Hide native login link, Show YakNet Account Profile Menu
if (defaultLoginLink) { if (defaultLoginLink) {
defaultLoginLink.style.display = 'none'; defaultLoginLink.style.display = 'none';
defaultLoginLink.setAttribute('aria-hidden', 'true'); defaultLoginLink.setAttribute('aria-hidden', 'true');
@@ -333,6 +333,16 @@ try {
} else { } else {
var el = liveWidget.querySelector('yaknet-account'); var el = liveWidget.querySelector('yaknet-account');
if (el) { if (el) {
if (el.getAttribute('authenticated') !== 'true' || el.getAttribute('user-name') !== displayName) {
el.setAttribute('authenticated', 'true');
el.setAttribute('user-name', displayName);
el.setAttribute('user-email', emailStr);
if (typeof el.syncStateFromAttributes === 'function') {
el.syncStateFromAttributes();
el.render();
}
}
if (el.shadowRoot) { if (el.shadowRoot) {
var shadowLogoutBtn = var shadowLogoutBtn =
el.shadowRoot.getElementById('logoutBtn') || el.shadowRoot.getElementById('logoutBtn') ||
@@ -351,23 +361,16 @@ try {
); );
} }
} }
if (el.getAttribute('authenticated') !== 'true' || el.getAttribute('user-name') !== displayName) {
el.setAttribute('authenticated', 'true');
el.setAttribute('user-name', displayName);
el.setAttribute('user-email', emailStr);
if (typeof el.syncStateFromAttributes === 'function') {
el.syncStateFromAttributes();
el.render();
}
}
} }
} }
} else { } else {
// Not Logged In: Remove YakNet widget to eliminate duplicate button, keep PeerTube native login button clean // 2. GUEST / NOT LOGGED IN:
// A. Physically remove any <yaknet-account> widget from DOM to guarantee zero shadow DOM duplicate buttons
if (liveWidget) { if (liveWidget) {
liveWidget.remove(); liveWidget.remove();
} }
// B. Ensure PeerTube's native login link is the ONLY single accessible login element
if (defaultLoginLink) { if (defaultLoginLink) {
defaultLoginLink.style.display = ''; defaultLoginLink.style.display = '';
defaultLoginLink.removeAttribute('aria-hidden'); defaultLoginLink.removeAttribute('aria-hidden');
@@ -376,7 +379,7 @@ try {
defaultLoginLink.tagName.toLowerCase() === 'a' ? defaultLoginLink : defaultLoginLink.querySelector('a'); defaultLoginLink.tagName.toLowerCase() === 'a' ? defaultLoginLink : defaultLoginLink.querySelector('a');
if (loginAnchor) { if (loginAnchor) {
loginAnchor.setAttribute('aria-label', 'YakNet ile Giriş Yap'); loginAnchor.setAttribute('aria-label', 'YakNet ile Giriş Yap');
loginAnchor.setAttribute('title', 'YakNet Hesabınız ile Giriş Yapın'); loginAnchor.setAttribute('title', 'YakNet ile Giriş Yap');
var spanText = loginAnchor.querySelector('span'); var spanText = loginAnchor.querySelector('span');
if (spanText) { if (spanText) {
spanText.textContent = 'YakNet ile Giriş Yap'; spanText.textContent = 'YakNet ile Giriş Yap';
@@ -3019,8 +3022,8 @@ try {
(function initBackgroundPlaybackEngine() { (function initBackgroundPlaybackEngine() {
var videoState = { var videoState = {
hasPlayed: false, hasPlayed: false,
pausedByUser: false, explicitlyPausedByClick: false,
pausedAt: null lastPlayTime: 0
}; };
function attachVideoListeners(video) { function attachVideoListeners(video) {
@@ -3029,21 +3032,14 @@ try {
video.addEventListener('play', function () { video.addEventListener('play', function () {
videoState.hasPlayed = true; videoState.hasPlayed = true;
videoState.pausedByUser = false; videoState.explicitlyPausedByClick = false;
videoState.lastPlayTime = Date.now();
updateMediaSessionMetadata(video); updateMediaSessionMetadata(video);
}); });
video.addEventListener('pause', function () {
videoState.pausedAt = Date.now();
// If document is visible when paused, it was paused manually by the user
if (!document.hidden) {
videoState.pausedByUser = true;
}
});
video.addEventListener('ended', function () { video.addEventListener('ended', function () {
videoState.hasPlayed = false; videoState.hasPlayed = false;
videoState.pausedByUser = true; videoState.explicitlyPausedByClick = true;
}); });
video.addEventListener('timeupdate', function () { video.addEventListener('timeupdate', function () {
@@ -3051,30 +3047,50 @@ try {
}); });
} }
function handleVisibilityChange() { // Hook manual play/pause buttons
if (!document.hidden) return; // Screen is active document.addEventListener(
'click',
function (e) {
var target = e.target;
if (!target) return;
var btn = target.closest(
'.vjs-play-control, button[title*="Duraklat"], button[aria-label*="Duraklat"], #yaktube-bar-play-btn'
);
if (btn) {
var video = getVideoElement();
if (video && !video.paused) {
videoState.explicitlyPausedByClick = true;
}
}
},
true
);
function handleVisibilityChange() {
var video = getVideoElement(); var video = getVideoElement();
if (!video) return; if (!video) return;
// If user hasn't played or deliberately paused, do not auto-resume // When screen turns off / tab is hidden:
if (!videoState.hasPlayed || videoState.pausedByUser) return; if (document.hidden || document.webkitHidden) {
if (videoState.hasPlayed && !videoState.explicitlyPausedByClick) {
var now = Date.now(); // Unconditionally keep audio stream active
if (videoState.pausedAt && now - videoState.pausedAt > 1500 && videoState.pausedByUser) { setTimeout(function () {
return; if (video.paused && !videoState.explicitlyPausedByClick) {
} video.play().catch(function () {});
}
// Resume playback when screen locks or tab switches }, 100);
setTimeout(function () { setTimeout(function () {
if (video.paused && !videoState.pausedByUser) { if (video.paused && !videoState.explicitlyPausedByClick) {
video.play().catch(function () {}); video.play().catch(function () {});
}
}, 300);
} }
}, 50); }
} }
document.addEventListener('visibilitychange', handleVisibilityChange, false); document.addEventListener('visibilitychange', handleVisibilityChange, false);
document.addEventListener('webkitvisibilitychange', handleVisibilityChange, false); document.addEventListener('webkitvisibilitychange', handleVisibilityChange, false);
window.addEventListener('pagehide', handleVisibilityChange, false);
// MediaSession API Integration (Lock Screen, Bluetooth, Smart Watches) // MediaSession API Integration (Lock Screen, Bluetooth, Smart Watches)
function updateMediaSessionMetadata(video) { function updateMediaSessionMetadata(video) {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "peertube-plugin-yaktube-ondemand", "name": "peertube-plugin-yaktube-ondemand",
"version": "1.4.10", "version": "1.4.14",
"description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations and A11y Engine for PeerTube", "description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations and A11y Engine for PeerTube",
"main": "main.js", "main": "main.js",
"library": "./main.js", "library": "./main.js",
+26
View File
@@ -1,3 +1,29 @@
/* Permanent Aggressive Suppression of Generic JoinPeerTube / Framasoft Open-in-App Banners */
my-open-app,
my-open-in-app,
my-client-app-banner,
.open-app-container,
.app-banner,
[class*='open-app'],
[class*='open-in-app'],
.mobile-app-banner,
.app-promotion,
.client-app-banner,
a[href*='play.google.com/store/apps/details?id=app.joinpeertube'],
a[href*='f-droid.org'],
a[href*='joinpeertube'] {
display: none !important;
visibility: hidden !important;
height: 0 !important;
width: 0 !important;
margin: 0 !important;
padding: 0 !important;
pointer-events: none !important;
opacity: 0 !important;
position: absolute !important;
z-index: -99999 !important;
}
/* YakTube Accessibility & On-Demand CSS */ /* YakTube Accessibility & On-Demand CSS */
:focus-visible { :focus-visible {