From 156d4035522df90f53b61d6dce31f3f37c9d083d Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Thu, 30 Nov 2023 19:20:30 +0100 Subject: [PATCH 1/4] UI - Fix - Edit Watch 'Show advanced options' should fire at page load to show you whats possible --- changedetectionio/static/js/vis.js | 21 ++++++++++++------- changedetectionio/static/js/watch-settings.js | 14 ------------- changedetectionio/templates/edit.html | 12 +++++------ 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/changedetectionio/static/js/vis.js b/changedetectionio/static/js/vis.js index 6a11904f..edcacfb6 100644 --- a/changedetectionio/static/js/vis.js +++ b/changedetectionio/static/js/vis.js @@ -2,21 +2,28 @@ $(document).ready(function () { // Lazy Hide/Show elements mechanism $('[data-visible-for]').hide(); - $(':radio').on('keyup keypress blur change click', function (e) { - $('[data-visible-for]').hide(); - $('.advanced-options').hide(); - var n = $(this).attr('name') + "=" + $(this).val(); + function show_related_elem(e) { + var n = $(e).attr('name') + "=" + $(e).val(); if (n === 'fetch_backend=system') { n = "fetch_backend=" + default_system_fetch_backend; } $(`[data-visible-for~="${n}"]`).show(); - + } + $(':radio').on('keyup keypress blur change click', function (e) { + $(`[data-visible-for]`).hide(); + $('.advanced-options').hide(); + show_related_elem(this); }); - $(':radio:checked').change(); + + $(':radio:checked').each(function (e) { + show_related_elem(this); + }) // Show advanced $('.show-advanced').click(function (e) { - $(this).closest('.tab-pane-inner').find('.advanced-options').toggle(); + $(this).closest('.tab-pane-inner').find('.advanced-options').each(function (e) { + $(this).toggle(); + }) }); }); \ No newline at end of file diff --git a/changedetectionio/static/js/watch-settings.js b/changedetectionio/static/js/watch-settings.js index 25b3f2d2..22bf48ed 100644 --- a/changedetectionio/static/js/watch-settings.js +++ b/changedetectionio/static/js/watch-settings.js @@ -1,18 +1,4 @@ $(document).ready(function () { - - // Lazy Hide/Show elements mechanism - $('[data-visible-for]').hide(); - $(':radio').on('keyup keypress blur change click', function (e){ - $('[data-visible-for]').hide(); - var n = $(this).attr('name') + "=" + $(this).val(); - if (n === 'fetch_backend=system') { - n = "fetch_backend=" + default_system_fetch_backend; - } - $(`[data-visible-for~="${n}"]`).show(); - - }); - $(':radio:checked').change(); - $('#notification-setting-reset-to-default').click(function (e) { $('#notification_title').val(''); $('#notification_body').val(''); diff --git a/changedetectionio/templates/edit.html b/changedetectionio/templates/edit.html index ff3769ab..103f57af 100644 --- a/changedetectionio/templates/edit.html +++ b/changedetectionio/templates/edit.html @@ -127,7 +127,7 @@ {% endif %} -
+
{{ render_field(form.webdriver_delay) }}
@@ -153,15 +153,15 @@
-
+