Merge pull request #9136 from RocketChat/hotfix/9132

Fix: Confirmation modals showing `Send` button
pull/9258/head
Rodrigo Nascimento 8 years ago
parent 5653ee6cda
commit f01fd95f1b
No known key found for this signature in database
GPG Key ID: CFCE33B7B01AC335
  1. 5
      packages/rocketchat-theme/client/imports/components/modal.css
  2. 4
      packages/rocketchat-ui/client/views/app/modal.html
  3. 2
      packages/rocketchat-ui/client/views/app/modal.js

@ -116,6 +116,11 @@
& > .rc-button {
margin: 0;
}
&--empty {
padding: 0;
background: transparent;
}
}
}

@ -38,9 +38,9 @@
<div class="rc-modal__content-error"></div>
{{/if}}
</main>
<div class="rc-modal__footer">
<div class="rc-modal__footer {{#unless showFooter}}rc-modal__footer--empty{{/unless}}">
<input class="rc-button rc-button--nude js-close {{#unless showCancelButton}}rc-button--invisible{{/unless}}" type="submit" data-button="cancel" value="{{cancelButtonText}}">
<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm" type="submit" data-button="create" value="{{confirmButtonText}}">
<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm {{#unless showConfirmButton}}rc-button--invisible{{/unless}}" type="submit" data-button="create" value="{{confirmButtonText}}">
</div>
{{/if}}
</div>

@ -5,6 +5,8 @@ this.modal = {
open(config = {}, fn) {
config.confirmButtonText = config.confirmButtonText || t('Send');
config.cancelButtonText = config.cancelButtonText || t('Cancel');
config.showConfirmButton = config.showConfirmButton == null ? true : config.showConfirmButton;
config.showFooter = config.showConfirmButton === true || config.showCancelButton === true;
if (config.type === 'input') {
config.input = true;

Loading…
Cancel
Save