Remove messageBox input reference from popover

RocketChat · Mar 29, 2019 · 3c94b52 · 3c94b52
1 parent 05c83cd
commit 3c94b52
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/app/ui-message/client/messageBox.html b/app/ui-message/client/messageBox.html
@@ -27,7 +27,7 @@
 					{{else}}
 						{{#if subscribed}}
 							{{> messageBoxAudioMessage rid=_id}}
-							<span class="rc-message-box__action-menu" data-desktop>
+							<span class="rc-message-box__action-menu js-action-menu" data-desktop>
 								{{#if actions}}
 									<span class="rc-message-box__icon">
 										{{> icon block="rc-input__icon-svg" icon="plus"}}
@@ -41,9 +41,9 @@
 						{{/if}}
 					{{/unless}}
 					<span class="rc-message-box__action-label js-message-actions" data-small>
-						{{#each actions}}
-							<span class="js-message-action">
-								{{> icon block="rc-message-box__action" icon=icon }}
+						{{#each action in actions}}
+							<span class="js-message-action" data-id="{{action.id}}">
+								{{> icon block="rc-message-box__action" icon=action.icon }}
 							</span>
 						{{/each}}
 					</span>

diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
@@ -381,7 +381,7 @@ Template.messageBox.events({
 			input.focus();
 		});
 	},
-	'click .rc-message-box__action-menu'(event) {
+	'click .js-action-menu'(event, instance) {
 		const groups = messageBox.actions.get();
 		const config = {
 			popoverClass: 'message-box',
@@ -409,19 +409,25 @@ Template.messageBox.events({
 			currentTarget: event.currentTarget.firstElementChild.firstElementChild,
 			data: {
 				rid: this._id,
+				messageBox: instance.firstNode,
 			},
 			activeElement: event.currentTarget,
 		};
 
 		popover.open(config);
 	},
 	'click .js-message-actions .js-message-action'(event, instance) {
-		this.action.apply(this, [{
-			rid: Template.parentData()._id,
-			messageBox: instance.find('.rc-message-box'),
-			element: event.currentTarget,
-			event,
-		}]);
+		const { id } = event.currentTarget.dataset;
+		const actions = messageBox.actions.getById(id);
+		actions
+			.filter(({ action }) => !!action)
+			.forEach(({ action }) => {
+				action.call(null, {
+					rid: this._id,
+					messageBox: instance.firstNode,
+					event,
+				});
+			});
 	},
 	'click .js-format'(e, t) {
 		applyFormatting.apply(this, [e, t]);

diff --git a/app/ui-utils/client/lib/popover.js b/app/ui-utils/client/lib/popover.js
@@ -160,13 +160,16 @@ Template.popover.events({
 	},
 	'click [data-type="messagebox-action"]'(event, t) {
 		const { id } = event.currentTarget.dataset;
-		const action = messageBox.actions.getById(id);
-		if ((action[0] != null ? action[0].action : undefined) != null) {
-			action[0].action({ rid: t.data.data.rid, ...t.data.data, messageBox: document.querySelector('.rc-message-box'), element: event.currentTarget, event });
-			if (id !== 'audio-message') {
-				popover.close();
-			}
-		}
+		const actions = messageBox.actions.getById(id);
+		actions
+			.filter(({ action }) => !!action)
+			.forEach(({ action }) => {
+				action.call(null, {
+					...t.data.data,
+					event,
+				});
+			});
+		popover.close();
 	},
 	'click [data-type="message-action"]'(e, t) {
 		const button = MessageAction.getButtonById(e.currentTarget.dataset.id);