Merge pull request #9136 from RocketChat/hotfix/9132

Fix: Confirmation modals showing `Send` button
RocketChat · Dec 14, 2017 · c151915 · c151915
2 parents 69ecba0 + 23501b7
commit c151915
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/packages/rocketchat-theme/client/imports/components/modal.css b/packages/rocketchat-theme/client/imports/components/modal.css
@@ -116,6 +116,11 @@
 		& > .rc-button {
 			margin: 0;
 		}
+
+		&--empty {
+			padding: 0;
+			background: transparent;
+		}
 	}
 }
 

diff --git a/packages/rocketchat-ui/client/views/app/modal.html b/packages/rocketchat-ui/client/views/app/modal.html
@@ -38,9 +38,9 @@ <h1 class="rc-modal__title">{{title}}</h1>
 						<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>

diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js
@@ -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;