From 6ad71fd3fc38ed0acf1a36e5e8c8146de9addc82 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 19 Jul 2019 17:27:03 +0200 Subject: [PATCH] - improved "lazy delete" signatures toggle button. Now becomes "inactive" after each `ctrl`+`v` update action, closed #724 --- js/app/ui/module/system_signature.js | 10 +++++++--- public/js/v1.5.2/app/ui/module/system_signature.js | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/js/app/ui/module/system_signature.js b/js/app/ui/module/system_signature.js index 11960dcf..3db47abd 100644 --- a/js/app/ui/module/system_signature.js +++ b/js/app/ui/module/system_signature.js @@ -2355,8 +2355,7 @@ define([ // "lazy update" toggle --------------------------------------------------------------------------------------- moduleElement.find('.' + config.moduleHeadlineIconLazyClass).on('click', function(e){ - let button = $(this); - button.toggleClass('active'); + $(this).toggleClass('active'); }); // set multi row select --------------------------------------------------------------------------------------- @@ -2387,9 +2386,14 @@ define([ // event listener for global "paste" signatures into the page ------------------------------------------------- moduleElement.on('pf:updateSystemSignatureModuleByClipboard', {tableApi: primaryTableApi}, function(e, clipboard){ + let lazyUpdateToggle = moduleElement.find('.' + config.moduleHeadlineIconLazyClass); let signatureOptions = { - deleteOld: moduleElement.find('.' + config.moduleHeadlineIconLazyClass).hasClass('active') ? 1 : 0 + deleteOld: lazyUpdateToggle.hasClass('active') ? 1 : 0 }; + + // "disable" lazy update icon -> prevents accidental removal for next paste #724 + lazyUpdateToggle.toggleClass('active', false); + updateSignatureTableByClipboard(e.data.tableApi, systemData, clipboard, signatureOptions); }); diff --git a/public/js/v1.5.2/app/ui/module/system_signature.js b/public/js/v1.5.2/app/ui/module/system_signature.js index 11960dcf..3db47abd 100644 --- a/public/js/v1.5.2/app/ui/module/system_signature.js +++ b/public/js/v1.5.2/app/ui/module/system_signature.js @@ -2355,8 +2355,7 @@ define([ // "lazy update" toggle --------------------------------------------------------------------------------------- moduleElement.find('.' + config.moduleHeadlineIconLazyClass).on('click', function(e){ - let button = $(this); - button.toggleClass('active'); + $(this).toggleClass('active'); }); // set multi row select --------------------------------------------------------------------------------------- @@ -2387,9 +2386,14 @@ define([ // event listener for global "paste" signatures into the page ------------------------------------------------- moduleElement.on('pf:updateSystemSignatureModuleByClipboard', {tableApi: primaryTableApi}, function(e, clipboard){ + let lazyUpdateToggle = moduleElement.find('.' + config.moduleHeadlineIconLazyClass); let signatureOptions = { - deleteOld: moduleElement.find('.' + config.moduleHeadlineIconLazyClass).hasClass('active') ? 1 : 0 + deleteOld: lazyUpdateToggle.hasClass('active') ? 1 : 0 }; + + // "disable" lazy update icon -> prevents accidental removal for next paste #724 + lazyUpdateToggle.toggleClass('active', false); + updateSignatureTableByClipboard(e.data.tableApi, systemData, clipboard, signatureOptions); });