From 1b54d757161b241537021d13d7eec97033523907 Mon Sep 17 00:00:00 2001 From: friedPotat0 <5374007+friedPotat0@users.noreply.github.com> Date: Sat, 27 Jul 2019 18:56:51 +0200 Subject: [PATCH] Prevent event propagation for remaining tables --- data/web/js/site/mailbox.js | 12 ++++++++---- data/web/js/site/quarantine.js | 2 +- data/web/js/site/user.js | 5 +++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 03086d49..588c5570 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -52,12 +52,12 @@ $(document).ready(function() { auto_fill_quota = function(domain) { $.get("/api/v1/get/domain/" + domain, function(data){ var result = $.parseJSON(JSON.stringify(data)); - def_new_mailbox_quota = ( result.def_new_mailbox_quota / 1048576); + def_new_mailbox_quota = ( result.def_new_mailbox_quota / 1048576); max_new_mailbox_quota = ( result.max_new_mailbox_quota / 1048576); if (max_new_mailbox_quota != '0') { $("#quotaBadge").html('max. ' + max_new_mailbox_quota + ' MiB'); $('#addInputQuota').attr({"disabled": false, "value": "", "type": "number", "max": max_new_mailbox_quota}); - $('#addInputQuota').val(def_new_mailbox_quota); + $('#addInputQuota').val(def_new_mailbox_quota); } else { $("#quotaBadge").html('max. ' + max_new_mailbox_quota + ' MiB'); @@ -230,7 +230,7 @@ jQuery(function($){ return Number(res[0]); }, }, - {"name":"def_quota_for_mbox","title":lang.mailbox_defquota,"breakpoints":"xs sm md","style":{"width":"125px"}}, + {"name":"def_quota_for_mbox","title":lang.mailbox_defquota,"breakpoints":"xs sm md","style":{"width":"125px"}}, {"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm","style":{"width":"125px"}}, {"name":"rl","title":"RL","breakpoints":"xs sm md lg","style":{"maxWidth":"100px","width":"100px"}}, {"name":"backupmx","filterable": false,"style":{"maxWidth":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm md lg"}, @@ -256,7 +256,7 @@ jQuery(function($){ return e; }).join('/1'); } - item.def_quota_for_mbox = humanFileSize(item.def_quota_for_mbox); + item.def_quota_for_mbox = humanFileSize(item.def_quota_for_mbox); item.max_quota_for_mbox = humanFileSize(item.max_quota_for_mbox); item.chkbox = ''; item.action = '
'; @@ -1068,6 +1068,10 @@ jQuery(function($){ }); }; + $('body').on('click', 'span.footable-toggle', function () { + event.stopPropagation(); + }) + draw_domain_table(); draw_mailbox_table(); draw_resource_table(); diff --git a/data/web/js/site/quarantine.js b/data/web/js/site/quarantine.js index d0dfc5aa..cfc6d8b6 100644 --- a/data/web/js/site/quarantine.js +++ b/data/web/js/site/quarantine.js @@ -114,7 +114,7 @@ jQuery(function($){ }); }); - $('table tbody').on('click', 'span.footable-toggle', function () { + $('body').on('click', 'span.footable-toggle', function () { event.stopPropagation(); }) diff --git a/data/web/js/site/user.js b/data/web/js/site/user.js index 505da772..bb458daa 100644 --- a/data/web/js/site/user.js +++ b/data/web/js/site/user.js @@ -236,6 +236,11 @@ jQuery(function($){ } }); } + + $('body').on('click', 'span.footable-toggle', function () { + event.stopPropagation(); + }) + draw_sync_job_table(); draw_tla_table(); draw_wl_policy_mailbox_table();