From 29cbbef687dd524aea0b033fe3f5b97623d5c0dc Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Mon, 16 Apr 2018 11:44:07 -0300
Subject: [PATCH] Removes click listener and remove pointer events to null on
icons (#10423)
[FIX] Remove a user from the user's list when creating a new channel removes the wrong user
---
.../client/views/mailMessagesInstructions.js | 8 --------
packages/rocketchat-theme/client/imports/forms/tags.css | 1 +
packages/rocketchat-ui/client/views/app/createChannel.js | 4 ----
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
index d81a56fda52..caf41ecdd32 100644
--- a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
+++ b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
@@ -161,18 +161,10 @@ Template.mailMessagesInstructions.events({
const {username} = Blaze.getData(target);
t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
},
- 'click .rc-input--usernames .rc-tags__tag-icon'(e, t) {
- const {username} = Blaze.getData(t.find('.rc-tags__tag-text'));
- t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
- },
'click .rc-input--emails .rc-tags__tag'({target}, t) {
const {text} = Blaze.getData(target);
t.selectedEmails.set(t.selectedEmails.get().filter(email => email.text !== text));
},
- 'click .rc-input--emails .rc-tags__tag-icon'(e, t) {
- const {text} = Blaze.getData(t.find('.rc-tags__tag-text'));
- t.selectedEmails.set(t.selectedEmails.get().filter(email => email.text !== text));
- },
'click .rc-popup-list__item'(e, t) {
t.ac.onItemClick(this, e);
},
diff --git a/packages/rocketchat-theme/client/imports/forms/tags.css b/packages/rocketchat-theme/client/imports/forms/tags.css
index d535a8bcb28..46d0b82e907 100644
--- a/packages/rocketchat-theme/client/imports/forms/tags.css
+++ b/packages/rocketchat-theme/client/imports/forms/tags.css
@@ -41,6 +41,7 @@
width: 10px;
height: 10px;
stroke: #9d9fa3;
+ pointer-events: none;
}
}
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index 45930c9f862..aede83016b5 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -146,10 +146,6 @@ Template.createChannel.events({
const {username} = Blaze.getData(target);
t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
},
- 'click .rc-tags__tag-icon'(e, t) {
- const {username} = Blaze.getData(t.find('.rc-tags__tag-text'));
- t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
- },
'change [name=setTokensRequired]'(e, t) {
t.tokensRequired.set(e.currentTarget.checked);
t.change();
--
GitLab