diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index deaa243c8b..a484ee7735 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -2459,7 +2459,7 @@ else{element.disabled=false;element.value=offset+limit;}};check();for(let i=0;i< list.sort(function(a,b){return a.pathname.length-b.pathname.length;});for(let i=0;i{button.innerText=buttonText;button.className=buttonClass;button.type='button';if(buttonIcon){let iconElement=document.createElement('i');iconElement.className=buttonIcon;button.insertBefore(iconElement,button.firstChild);}});} +if(!buttonAlias&&(buttonText||buttonIcon)){buttonElements.forEach((button)=>{button.innerText=buttonText;button.className=buttonClass;button.type='button';if(buttonIcon){let iconElement=document.createElement('i');iconElement.className=buttonIcon;button.insertBefore(iconElement,button.firstChild);}});} if(buttonEvent){buttonElements.forEach((button)=>{button.addEventListener('click',function(){document.dispatchEvent(new CustomEvent(buttonEvent,{bubbles:false,cancelable:true}));});});} element.classList.add('modal');if(!buttonAlias){buttonElements.forEach((button)=>{element.parentNode.insertBefore(button,element);});} let open=function(){document.documentElement.classList.add('modal-open');document.dispatchEvent(new CustomEvent('modal-open',{bubbles:false,cancelable:true}));element.classList.add('open');element.classList.remove('close');};let close=function(){document.documentElement.classList.remove('modal-open');element.classList.add('close');element.classList.remove('open');};if(name){document.querySelectorAll("[data-ui-modal-ref='"+name+"']").forEach(function(elem){elem.addEventListener('click',open);});} diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js index 7fce619f7c..c31eebc39e 100644 --- a/public/dist/scripts/app.js +++ b/public/dist/scripts/app.js @@ -374,7 +374,7 @@ else{element.disabled=false;element.value=offset+limit;}};check();for(let i=0;i< list.sort(function(a,b){return a.pathname.length-b.pathname.length;});for(let i=0;i{button.innerText=buttonText;button.className=buttonClass;button.type='button';if(buttonIcon){let iconElement=document.createElement('i');iconElement.className=buttonIcon;button.insertBefore(iconElement,button.firstChild);}});} +if(!buttonAlias&&(buttonText||buttonIcon)){buttonElements.forEach((button)=>{button.innerText=buttonText;button.className=buttonClass;button.type='button';if(buttonIcon){let iconElement=document.createElement('i');iconElement.className=buttonIcon;button.insertBefore(iconElement,button.firstChild);}});} if(buttonEvent){buttonElements.forEach((button)=>{button.addEventListener('click',function(){document.dispatchEvent(new CustomEvent(buttonEvent,{bubbles:false,cancelable:true}));});});} element.classList.add('modal');if(!buttonAlias){buttonElements.forEach((button)=>{element.parentNode.insertBefore(button,element);});} let open=function(){document.documentElement.classList.add('modal-open');document.dispatchEvent(new CustomEvent('modal-open',{bubbles:false,cancelable:true}));element.classList.add('open');element.classList.remove('close');};let close=function(){document.documentElement.classList.remove('modal-open');element.classList.add('close');element.classList.remove('open');};if(name){document.querySelectorAll("[data-ui-modal-ref='"+name+"']").forEach(function(elem){elem.addEventListener('click',open);});} diff --git a/public/scripts/views/ui/modal.js b/public/scripts/views/ui/modal.js index 1c6f039eb5..71337ffc00 100644 --- a/public/scripts/views/ui/modal.js +++ b/public/scripts/views/ui/modal.js @@ -28,7 +28,7 @@ }); } - if(!buttonAlias) { + if(!buttonAlias && (buttonText || buttonIcon)) { buttonElements.forEach((button) => { button.innerText = buttonText;