aboutsummaryrefslogtreecommitdiff
path: root/p/scripts
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <aledeg@users.noreply.github.com> 2019-10-23 00:52:15 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-10-23 00:52:15 +0200
commitcc0db9af4f980829faa4bf0960617807b32fb4fa (patch)
tree8a418edeee15e878a12dbff02e241d2d76820be6 /p/scripts
parentd7f888392678d711478ed64f4a52f43021d143af (diff)
Feature/new archiving (#2335)
* Change archiving config page layout I've changed some wording and moved actions into a maintenance section. * Update purge action Now we have more control on the purge action. The configuration allows us to choose what to keep and what to discard in a more precise way. At the moment, the configuration applies for all feeds. * Add purge configuration on feed level Now the extend purge configuration is available on feed level. It is stored as attributes and will be used in the purge action. * Update purge action Now the purge action uses the feed configuration if it exists and defaults on user configuration if not. * Add empty option in period list * Fix configuration warnings * Add archiving configuration on categories See #2369 * Add user info back * Add explanations in UI * Fixes for SQLite + error + misc. * Fix invalid feed reference * Short array syntax Only for new code, so far * Fix prefix error * Query performance, default values Work in progress * Fix default values and confirm before leaving Form cancel and confirm changes before leaving were broken. And start taking advantage of the short echo syntax `<?= ?>` as we have moved to PHP 5.4+ * More work * Tuning SQL * Fix MariaDB + performance issue * SQL performance * Fix SQLite bug * Fix some attributes JSON encoding bugs Especially for SQLite export/import * More uniform, fix bugs More uniform between global, category, feed settings * Drop special cases for old articles during refresh Instead will use lastSeen date with the new archiving logic. This was generating problems anyway https://github.com/FreshRSS/FreshRSS/issues/2154 * Draft drop index keep_history Not needed anymore * MySQL typo Now properly tested with MySQL, PostgreSQL, SQLite * More work for legacy values Important to avoid overriding user's preference and risking deleting data erroneously * Fix PHP 7.3 / 7.4 warnings @aledeg "Trying to use values of type null, bool, int, float or resource as an array (such as $null["key"]) will now generate a notice. " https://php.net/migration74.incompatible * Reintroduce min articles and take care of legacy parameters * A few changes forgotten * Draft of migration + DROP of feed.keep_history * Fix several errors And give up using const for SQL to allow multiple database types (and we cannot redefine a const) * Add keep_min to categories + factorise archiving logic * Legacy fix * Fix bug yield from * Minor: Use JSON_UNESCAPED_SLASHE for attributes And make more uniform * Fix sign and missing variable * Fine tune the logic
Diffstat (limited to 'p/scripts')
-rw-r--r--p/scripts/category.js23
-rw-r--r--p/scripts/extra.js38
2 files changed, 48 insertions, 13 deletions
diff --git a/p/scripts/category.js b/p/scripts/category.js
index c01b1fdd7..c5d36e900 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -137,11 +137,34 @@ function init_draggable() {
};
}
+function archiving() {
+ const slider = document.getElementById('slider');
+ slider.addEventListener('change', function (e) {
+ if (e.target.id === 'use_default_purge_options') {
+ slider.querySelectorAll('.archiving').forEach(function (element) {
+ element.hidden = e.target.checked;
+ });
+ }
+ });
+ slider.addEventListener('click', function (e) {
+ if (e.target.closest('button[type=reset]')) {
+ const archiving = document.getElementById('use_default_purge_options');
+ if (archiving) {
+ slider.querySelectorAll('.archiving').forEach(function (element) {
+ element.hidden = archiving.getAttribute('data-leave-validation') == 1;
+ });
+ }
+ }
+ });
+}
+
if (document.readyState && document.readyState !== 'loading') {
init_draggable();
+ archiving();
} else if (document.addEventListener) {
document.addEventListener('DOMContentLoaded', function () {
init_draggable();
+ archiving();
}, false);
}
// @license-end
diff --git a/p/scripts/extra.js b/p/scripts/extra.js
index bba2e8e2b..1fd8a19de 100644
--- a/p/scripts/extra.js
+++ b/p/scripts/extra.js
@@ -184,12 +184,32 @@ function init_slider_observers() {
};
closer.onclick = function (ev) {
- closer.classList.remove('active');
- slider.classList.remove('active');
- return false;
+ if (data_leave_validation() || confirm(context.i18n.confirmation_default)) {
+ slider.querySelectorAll('form').forEach(function (f) { f.reset(); });
+ closer.classList.remove('active');
+ slider.classList.remove('active');
+ return true;
+ } else {
+ return false;
+ }
};
}
+function data_leave_validation() {
+ const ds = document.querySelectorAll('[data-leave-validation]');
+ for (let i = ds.length - 1; i >= 0; i--) {
+ const input = ds[i];
+ if (input.type === 'checkbox' || input.type === 'radio') {
+ if (input.checked != input.getAttribute('data-leave-validation')) {
+ return false;
+ }
+ } else if (input.value != input.getAttribute('data-leave-validation')) {
+ return false;
+ }
+ }
+ return true;
+}
+
function init_configuration_alert() {
window.onsubmit = function (e) {
window.hasSubmit = true;
@@ -198,16 +218,8 @@ function init_configuration_alert() {
if (window.hasSubmit) {
return;
}
- const ds = document.querySelectorAll('[data-leave-validation]');
- for (let i = ds.length - 1; i >= 0; i--) {
- const input = ds[i];
- if (input.type === 'checkbox' || input.type === 'radio') {
- if (input.checked != input.getAttribute('data-leave-validation')) {
- return false;
- }
- } else if (input.value != input.getAttribute('data-leave-validation')) {
- return false;
- }
+ if (!data_leave_validation()) {
+ return false;
}
};
}