Fix calling modal.open() on modal confirm callback

RocketChat · Apr 6, 2019 · 8fea4c9 · 8fea4c9
1 parent aa9a1a7
commit 8fea4c9
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/ui-utils/client/lib/modal.js b/app/ui-utils/client/lib/modal.js
@@ -60,13 +60,16 @@ export const modal = {
 		}
 	},
 	confirm(value) {
-		if (this.fn) {
-			this.fn(value);
-		} else {
-			this.close();
-		}
+		const { fn } = this;
 
 		this.config.closeOnConfirm && this.close();
+
+		if (fn) {
+			fn.call(this, value);
+			return;
+		}
+
+		this.close();
 	},
 	showInputError(text) {
 		const errorEl = document.querySelector('.rc-modal__content-error');