From 19fa2ebfc99da60ad3dfd3dc6fda76abb78ad15b Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 8 Oct 2018 11:05:29 -0300
Subject: [PATCH] Fix confirm modal events

---
 packages/rocketchat-ui/client/views/app/modal.js        | 6 +++---
 packages/rocketchat-webdav/startup/messageBoxActions.js | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js
index a8f03c819be7..22630fef4e3e 100644
--- a/packages/rocketchat-ui/client/views/app/modal.js
+++ b/packages/rocketchat-ui/client/views/app/modal.js
@@ -8,7 +8,7 @@ this.modal = {
 		config.closeOnConfirm = config.closeOnConfirm == null ? true : config.closeOnConfirm;
 		config.showConfirmButton = config.showConfirmButton == null ? true : config.showConfirmButton;
 		config.showFooter = config.showConfirmButton === true || config.showCancelButton === true;
-		config.confirmOnEnter = config.confirmOnEnter || true;
+		config.confirmOnEnter = config.confirmOnEnter == null ? true : config.confirmOnEnter;
 
 		if (config.type === 'input') {
 			config.input = true;
@@ -70,7 +70,7 @@ this.modal = {
 		errorEl.style.display = 'block';
 	},
 	onKeydown(e) {
-		if (this.config.confirmOnEnter && e.key === 'Enter') {
+		if (modal.config.confirmOnEnter && e.key === 'Enter') {
 			e.preventDefault();
 			e.stopPropagation();
 
@@ -106,7 +106,7 @@ Template.rc_modal.onRendered(function() {
 		$('.js-modal-input').focus();
 	}
 
-	document.addEventListener('keydown', modal.onKeydown.bind(this));
+	document.addEventListener('keydown', modal.onKeydown);
 });
 
 Template.rc_modal.onDestroyed(function() {
diff --git a/packages/rocketchat-webdav/startup/messageBoxActions.js b/packages/rocketchat-webdav/startup/messageBoxActions.js
index 8e03f97eabd5..d92167e28f5d 100644
--- a/packages/rocketchat-webdav/startup/messageBoxActions.js
+++ b/packages/rocketchat-webdav/startup/messageBoxActions.js
@@ -12,6 +12,7 @@ RocketChat.messageBox.actions.add('WebDAV', 'Add Server', {
 			showFooter: false,
 			closeOnCancel: true,
 			html: true,
+			confirmOnEnter: false,
 		});
 	},
 });