From 0777bc7cb62838417812934e12971b3edfb62000 Mon Sep 17 00:00:00 2001
From: gcampes <gabrieldecampes@gmail.com>
Date: Tue, 5 Apr 2016 14:36:01 -0300
Subject: [PATCH] Fix an issue with the emoji status resulted from the last
merge
---
.../client/views/whiteboard/whiteboard.js | 26 ++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/bigbluebutton-html5/client/views/whiteboard/whiteboard.js b/bigbluebutton-html5/client/views/whiteboard/whiteboard.js
index e981e7ddcb..04a3b59b78 100755
--- a/bigbluebutton-html5/client/views/whiteboard/whiteboard.js
+++ b/bigbluebutton-html5/client/views/whiteboard/whiteboard.js
@@ -60,7 +60,7 @@ Template.whiteboard.events({
}
},
- 'click .sadEmojiButton'(event) {
+ 'click .sadEmojiButton.inactiveEmojiButton'(event) {
if ($('.sadEmojiButton').css('opacity') === '1') {
BBB.setEmojiStatus(
BBB.getMeetingId(),
@@ -74,7 +74,7 @@ Template.whiteboard.events({
}
},
- 'click .happyEmojiButton'(event) {
+ 'click .happyEmojiButton.inactiveEmojiButton'(event) {
if ($('.happyEmojiButton').css('opacity') === '1') {
BBB.setEmojiStatus(
BBB.getMeetingId(),
@@ -88,7 +88,7 @@ Template.whiteboard.events({
}
},
- 'click .confusedEmojiButton'(event) {
+ 'click .confusedEmojiButton.inactiveEmojiButton'(event) {
if ($('.confusedEmojiButton').css('opacity') === '1') {
BBB.setEmojiStatus(
BBB.getMeetingId(),
@@ -102,7 +102,7 @@ Template.whiteboard.events({
}
},
- 'click .neutralEmojiButton'(event) {
+ 'click .neutralEmojiButton.inactiveEmojiButton'(event) {
if ($('.neutralEmojiButton').css('opacity') === '1') {
BBB.setEmojiStatus(
BBB.getMeetingId(),
@@ -116,7 +116,7 @@ Template.whiteboard.events({
}
},
- 'click .awayEmojiButton'(event) {
+ 'click .awayEmojiButton.inactiveEmojiButton'(event) {
if ($('.awayEmojiButton').css('opacity') === '1') {
BBB.setEmojiStatus(
BBB.getMeetingId(),
@@ -130,7 +130,7 @@ Template.whiteboard.events({
}
},
- 'click .raiseHandEmojiButton'(event) {
+ 'click .raiseHandEmojiButton.inactiveEmojiButton'(event) {
if ($('.raiseHandEmojiButton').css('opacity') === '1') {
BBB.setEmojiStatus(
BBB.getMeetingId(),
@@ -144,6 +144,20 @@ Template.whiteboard.events({
}
},
+ 'click .activeEmojiButton'(event) {
+ if ($('.activeEmojiButton').css('opacity') === '1') {
+ BBB.setEmojiStatus(
+ BBB.getMeetingId(),
+ getInSession('userId'),
+ getInSession('userId'),
+ getInSession('authToken'),
+ 'none'
+ );
+ $('.FABTriggerButton').blur();
+ return toggleEmojisFAB();
+ }
+ },
+
'click .FABTriggerButton'(event) {
$('.FABTriggerButton').blur();
return toggleEmojisFAB();
--
GitLab