mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 01:32:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

pass ev to handleConfetti in order to check content before dispatch

Browse source
This commit is contained in:
nurjinn jafar 2020-08-25 11:09:57 +02:00
parent eef654e0e3
commit d41ffb1b4b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/RoomView.js
View file

@ -57,7 +57,7 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
import { shieldStatusForRoom } from '../../utils/ShieldUtils'; import { shieldStatusForRoom } from '../../utils/ShieldUtils';
import {Action} from "../../dispatcher/actions"; import {Action} from "../../dispatcher/actions";
import {SettingLevel} from "../../settings/SettingLevel"; import {SettingLevel} from "../../settings/SettingLevel";
import {animateConfetti, forceStopConfetti} from "../views/elements/Confetti"; import {animateConfetti, forceStopConfetti, isConfettiEmoji} from "../views/elements/Confetti";
const DEBUG = false; const DEBUG = false;
let debuglog = function() {}; let debuglog = function() {};
@ -758,11 +758,13 @@ export default createReactClass({
}, },
onEventDecrypted(ev) { onEventDecrypted(ev) {
if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return; if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
this.handleConfetti(); this.handleConfetti(ev);
}, },
handleConfetti() { handleConfetti(ev) {
if (this.context.isInitialSyncComplete()) { if (this.context.isInitialSyncComplete()) {
dis.dispatch({action: 'confetti'}); if (isConfettiEmoji(ev.getContent())) {
dis.dispatch({action: 'confetti'});
}
} }
}, },