gdorn/FreshRSS-Extensions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

JS stuff, fix nocookie setting

Browse source
This commit is contained in:
Inverle 2025-06-30 19:03:39 +02:00
parent 28ed49bf79
commit eac08e4ffb
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xExtension-YouTube/configure.phtml
View file

@ -32,7 +32,7 @@ declare(strict_types=1);
<div class="group-controls">
<label class="checkbox" for="yt_nocookie">
<input type="checkbox" id="yt_nocookie" name="yt_nocookie" value="1" data-leave-validation="<?= intval($this->isUseNoCookieDomain()) ?>" <?= $this->isUseNoCookieDomain() ? 'checked="checked"' : '' ?> />
<input type="checkbox" id="yt_nocookie" name="yt_nocookie" data-leave-validation="<?= intval($this->isUseNoCookieDomain()) ?>" <?= $this->isUseNoCookieDomain() ? 'checked="checked"' : '' ?> />
<?= _t('ext.yt_videos.use_nocookie') ?>
</label>
</div>

2
xExtension-YouTube/extension.php
View file

@ -517,7 +517,7 @@ final class YouTubeExtension extends Minz_Extension
FreshRSS_Context::userConf()->_attribute('yt_player_width', Minz_Request::paramInt('yt_width'));
FreshRSS_Context::userConf()->_attribute('yt_show_content', Minz_Request::paramBoolean('yt_show_content'));
FreshRSS_Context::userConf()->_attribute('yt_download_channel_icons', Minz_Request::paramBoolean('yt_download_channel_icons'));
FreshRSS_Context::userConf()->_attribute('yt_nocookie', Minz_Request::paramInt('yt_nocookie'));
FreshRSS_Context::userConf()->_attribute('yt_nocookie', Minz_Request::paramBoolean('yt_nocookie'));
FreshRSS_Context::userConf()->save();
}

30
xExtension-YouTube/static/fetchIcons.js
View file

@ -1,15 +1,15 @@
'use strict';
/* globals context */
/* globals context, slider */
function initFetchBtn() {
const i18n = context.extensions.yt_i18n;
const fetchIcons = document.querySelector('button[value="iconFetchFinish"]');
if (!fetchIcons) {
return;
}
const i18n = context.extensions.yt_i18n;
document.querySelectorAll('#yt_action_btn').forEach(el => el.style.marginBottom = '1rem');
fetchIcons.removeAttribute('disabled');
@ -18,9 +18,15 @@ function initFetchBtn() {
fetchIcons.onclick = function(e) {
e.preventDefault();
const closeSlider = document.querySelector('#close-slider');
if (closeSlider) {
closeSlider.onclick = (e) => e.preventDefault();
closeSlider.style.cursor = 'not-allowed';
}
fetchIcons.form.onsubmit = window.onbeforeunload = (e) => e.preventDefault();
fetchIcons.onclick = null;
fetchIcons.disabled = true;
fetchIcons.form.onsubmit = (e) => e.preventDefault();
fetchIcons.parentElement.insertAdjacentHTML('afterend', `
<hr><br>
<center>
@ -34,7 +40,7 @@ function initFetchBtn() {
const configureUrl = fetchIcons.form.action;
function ajaxBody(action, args) {
return new URLSearchParams({
return JSON.stringify({
'_csrf': context.csrf,
'yt_action_btn': 'ajax' + action,
...args
@ -42,10 +48,10 @@ function initFetchBtn() {
}
fetch(configureUrl, {
method: "POST",
method: 'POST',
body: ajaxBody('GetYtFeeds'),
headers: {
"Content-Type": "application/x-www-form-urlencoded"
'Content-Type': 'application/json; charset=UTF-8'
}
}).then(resp => {
if (!resp.ok) {
@ -56,17 +62,17 @@ function initFetchBtn() {
let completed = 0;
json.forEach(async (feed) => {
await fetch(configureUrl, {
method: "POST",
method: 'POST',
body: ajaxBody('FetchIcon', {'id': feed.id}),
headers: {
"Content-Type": "application/x-www-form-urlencoded"
'Content-Type': 'application/json; charset=UTF-8'
}
}).then(async () => {
iconFetchChannel.innerText = feed.title;
iconFetchCount.innerText = `${++completed}/${json.length}`;
if (completed === json.length) {
fetchIcons.disabled = false;
fetchIcons.form.onsubmit = null;
fetchIcons.form.onsubmit = window.onbeforeunload = null;
fetchIcons.click();
}
});
@ -76,8 +82,8 @@ function initFetchBtn() {
}
window.addEventListener('load', function() {
if (document.querySelector('#slider')) {
document.querySelector('#slider').addEventListener('freshrss:slider-load', initFetchBtn);
if (typeof slider !== 'undefined') {
slider.addEventListener('freshrss:slider-load', initFetchBtn);
}
initFetchBtn();
});