From 59c1d46e88fcdc22962576b3b6389d1d609579fe Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 14 Mar 2015 18:10:20 +0200 Subject: [PATCH] config panel: maximizing a section will automatically turn the section switch on --- static/js/main.js | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/static/js/main.js b/static/js/main.js index 18d2e75..a3015ed 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -545,12 +545,15 @@ function initUI() { makeStrippedInput($('tr[strip=true] input[type=text]')); makeStrippedInput($('tr[strip=true] input[type=password]')); - function unMinimizeSection() { + function checkMinimizeSection() { var $switch = $(this); var $minimizeSpan = $switch.parent().find('span.minimize'); if ($switch.is(':checked') && !$minimizeSpan.hasClass('open')) { $minimizeSpan.addClass('open'); } + else if (!$switch.is(':checked') && $minimizeSpan.hasClass('open')) { + $minimizeSpan.removeClass('open'); + } } /* ui elements that enable/disable other ui elements */ @@ -562,19 +565,19 @@ function initUI() { $('#rightTextSelect').change(updateConfigUi); $('#captureModeSelect').change(updateConfigUi); $('#autoNoiseDetectSwitch').change(updateConfigUi); - $('#videoDeviceSwitch').change(unMinimizeSection).change(updateConfigUi); - $('#textOverlaySwitch').change(unMinimizeSection).change(updateConfigUi); - $('#videoStreamingSwitch').change(unMinimizeSection).change(updateConfigUi); + $('#videoDeviceSwitch').change(checkMinimizeSection).change(updateConfigUi); + $('#textOverlaySwitch').change(checkMinimizeSection).change(updateConfigUi); + $('#videoStreamingSwitch').change(checkMinimizeSection).change(updateConfigUi); $('#streamingServerResizeSwitch').change(updateConfigUi); - $('#stillImagesSwitch').change(unMinimizeSection).change(updateConfigUi); + $('#stillImagesSwitch').change(checkMinimizeSection).change(updateConfigUi); $('#preservePicturesSelect').change(updateConfigUi); - $('#motionDetectionSwitch').change(unMinimizeSection).change(updateConfigUi); - $('#motionMoviesSwitch').change(unMinimizeSection).change(updateConfigUi); + $('#motionDetectionSwitch').change(checkMinimizeSection).change(updateConfigUi); + $('#motionMoviesSwitch').change(checkMinimizeSection).change(updateConfigUi); $('#preserveMoviesSelect').change(updateConfigUi); $('#emailNotificationsSwitch').change(updateConfigUi); $('#webHookNotificationsSwitch').change(updateConfigUi); $('#commandNotificationsSwitch').change(updateConfigUi); - $('#workingScheduleSwitch').change(unMinimizeSection).change(updateConfigUi); + $('#workingScheduleSwitch').change(checkMinimizeSection).change(updateConfigUi); $('#mondayEnabledSwitch').change(updateConfigUi); $('#tuesdayEnabledSwitch').change(updateConfigUi); @@ -587,6 +590,16 @@ function initUI() { /* minimizable sections */ $('span.minimize').click(function () { $(this).toggleClass('open'); + + /* enable the section switch when unminimizing */ + if ($(this).hasClass('open')) { + var sectionSwitch = $(this).parent().find('input[type=checkbox]'); + if (sectionSwitch.length && !sectionSwitch.is(':checked')) { + sectionSwitch[0].checked = true; + sectionSwitch.change(); + } + } + updateConfigUi(); }); -- 2.39.5