From 5bce20ee7e0e916474af1b005b019ebe48e2ec00 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 14 Feb 2020 20:02:07 -0300
Subject: [PATCH] send file on enter

---
 app/ui-utils/client/lib/modal.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/ui-utils/client/lib/modal.js b/app/ui-utils/client/lib/modal.js
index 36bc03702d6..2e43898bbdb 100644
--- a/app/ui-utils/client/lib/modal.js
+++ b/app/ui-utils/client/lib/modal.js
@@ -160,26 +160,28 @@ export const modal = {
 		if (!modalStack.length) {
 			return;
 		}
-
 		const instance = modalStack[modalStack.length - 1];
-
-		if (instance && instance.config && instance.config.confirmOnEnter && event.key === 'Enter') {
+		if (event.key === 'Escape') {
 			event.preventDefault();
 			event.stopPropagation();
 
-			if (instance.config.input) {
-				return instance.confirm($('.js-modal-input').val());
-			}
+			instance.close();
+		}
 
-			instance.confirm(true);
+		if (!document.querySelector('.rc-modal__content').contains(event.target)) {
 			return;
 		}
 
-		if (event.key === 'Escape') {
+
+		if (instance && instance && instance.confirmOnEnter && event.key === 'Enter') {
 			event.preventDefault();
 			event.stopPropagation();
 
-			instance.close();
+			if (instance.input) {
+				return instance.confirm($('.js-modal-input').val());
+			}
+
+			instance.confirm(true);
 		}
 	},
 };
@@ -211,18 +213,20 @@ Template.rc_modal.helpers({
 });
 
 Template.rc_modal.onRendered(function() {
+	this.oldFocus = document.activeElement;
 	if (this.data.onRendered) {
 		this.data.onRendered();
 	}
 
 	if (this.data.input) {
-		$('.js-modal-input').focus();
+		$('.js-modal-input', this.firstNode).focus();
 	}
 
 	this.data.closeOnEscape && document.addEventListener('keydown', modal.onKeyDown);
 });
 
 Template.rc_modal.onDestroyed(function() {
+	this.oldFocus && this.oldFocus.focus();
 	document.removeEventListener('keydown', modal.onKeyDown);
 });
 
@@ -233,6 +237,7 @@ Template.rc_modal.events({
 		this.close();
 	},
 	'click .js-close'(e) {
+		e.preventDefault();
 		e.stopPropagation();
 		this.cancel();
 	},