diff --git a/Site5/Controls/v5/Base/ModalDialog.ascx b/Site5/Controls/v5/Base/ModalDialog.ascx index c542896a..910a1ecb 100644 --- a/Site5/Controls/v5/Base/ModalDialog.ascx +++ b/Site5/Controls/v5/Base/ModalDialog.ascx @@ -7,8 +7,10 @@ <%=this.ClientID%>_close(); }); - $('#<%=this.ClientID %>_divModalCover').click(function () { // click outside dialog - <%=this.ClientID%>_close(); + $('#<%=this.ClientID %>_divModalCover').click (function (e) { // click on cover + if (e.target === this) { // but not inside dialog: trigger only on this element + <%=this.ClientID%>_close(); + } }); }); diff --git a/Site5/Pages/v5/Ledgers/AccountPlan.aspx b/Site5/Pages/v5/Ledgers/AccountPlan.aspx index 06ff563b..30c56240 100644 --- a/Site5/Pages/v5/Ledgers/AccountPlan.aspx +++ b/Site5/Pages/v5/Ledgers/AccountPlan.aspx @@ -3,6 +3,7 @@ <%@ Register TagPrefix="Swarmops5" TagName="ComboBudgets" Src="~/Controls/v5/Financial/ComboBudgets.ascx" %> <%@ Register TagPrefix="Swarmops5" TagName="ComboPeople" Src="~/Controls/v5/Swarm/ComboPeople.ascx" %> <%@ Register TagPrefix="Swarmops5" TagName="TextCurrency" Src="~/Controls/v5/Financial/CurrencyTextBox.ascx" %> +<%@ Register TagPrefix="Swarmops5" TagName="ModalDialog" Src="~/Controls/v5/Base/ModalDialog.ascx" %> @@ -75,16 +76,7 @@ $('div.datagrid').css('opacity', 0.4); - $("#IconCloseEdit").click(function() { - $('#divModalCover').fadeOut(); - - if (accountDirty) { - $('#tableAccountPlan').treegrid('reload'); - accountDirty = false; - } - }); - - $('#TextAccountName').blur(function() { + $('#TextAccountName').blur(function() { var newAccountName = $('#TextAccountName').val().trim(); if (modalAccountName == newAccountName) { @@ -223,6 +215,14 @@ }); + function onDialogClose() { + if (accountDirty) { + $('#tableAccountPlan').treegrid('reload'); + accountDirty = false; + } + } + + function addAccount() { $.ajax({ type: "POST", @@ -296,7 +296,7 @@ window.scrollTo(0, 0); $('body').css('overflow-y', 'hidden'); - $('#divModalCover').fadeIn(); + $('#<%=this.DialogAccount.ClientID %>_divModalCover').fadeIn(); setTimeout(function() { $('#divModalBox').animate({ "height": ($('#DivModalFields').outerHeight() + $('#HeaderModal').outerHeight()) + 40 + "px" }, 50); @@ -443,7 +443,7 @@ } function modalShow() { - $('#divModalCover').fadeIn(); + $('#<%=this.DialogAccount.ClientID %>_divModalCover').fadeIn(); } function onOwnerChange(personId) { @@ -551,7 +551,7 @@ var parentAccountName = ''; -