Skip to content

Fix the bug that the emoji does not disappear #11489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 20, 2020
Merged

Fix the bug that the emoji does not disappear #11489

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a785686
Fix the bug that the emoticon does not disappear
L0veSunshine May 18, 2020
9e61053
Merge branch 'master' into L0veSunshine-js-patch-2
L0veSunshine May 18, 2020
5f2a9f7
Update web_src/js/index.js
L0veSunshine May 19, 2020
c5b6288
Update web_src/js/index.js
L0veSunshine May 19, 2020
f6ec460
Merge branch 'master' into L0veSunshine-js-patch-2
techknowlogick May 19, 2020
5f719ea
Merge branch 'master' into L0veSunshine-js-patch-2
lafriks May 20, 2020
8cf5268
Merge branch 'master' into L0veSunshine-js-patch-2
zeripath May 20, 2020
6a9c7e0
Merge branch 'master' into L0veSunshine-js-patch-2
techknowlogick May 20, 2020
b8eae70
Merge branch 'master' into L0veSunshine-js-patch-2
zeripath May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function initReactionSelector(parent) {
if (resp && (resp.html || resp.empty)) {
const content = $(vm).closest('.content');
let react = content.find('.segment.reactions');
if (!resp.empty && react.length > 0) {
if ((!resp.empty || resp.html === '') && react.length > 0) {
react.remove();
}
if (!resp.empty) {
Expand Down