diff --git a/bigbluebutton-html5/app/client/globals.js b/bigbluebutton-html5/app/client/globals.js index 7fbb37c967..38d6dab2dc 100755 --- a/bigbluebutton-html5/app/client/globals.js +++ b/bigbluebutton-html5/app/client/globals.js @@ -292,6 +292,17 @@ Handlebars.registerHelper("getPollQuestions", () => { } }); +Template.registerHelper('emojiIcons', function () { + return [ + { name: 'sad', icon: 'sad-face', title: '' }, + { name: 'happy', icon: 'happy-face', title: ''}, + { name: 'confused', icon: 'confused-face', title: ''}, + { name: 'neutral', icon: 'neutral-face', title: ''}, + { name: 'away', icon: 'clock', title: ''}, + { name: 'raiseHand', icon: 'hand', title: 'Lower your Hand'} + ]; +}); + this.getSortedUserList = function(users) { if((users != null ? users.length : void 0) > 1) { users.sort((a, b) => { diff --git a/bigbluebutton-html5/app/client/main.html b/bigbluebutton-html5/app/client/main.html index 1711e8ac9b..85969fc6ed 100755 --- a/bigbluebutton-html5/app/client/main.html +++ b/bigbluebutton-html5/app/client/main.html @@ -106,44 +106,52 @@ + + + + + + + + + + + + diff --git a/bigbluebutton-html5/app/client/views/users/user_item.html b/bigbluebutton-html5/app/client/views/users/user_item.html index dce45ccfc8..d56c403c3a 100755 --- a/bigbluebutton-html5/app/client/views/users/user_item.html +++ b/bigbluebutton-html5/app/client/views/users/user_item.html @@ -73,43 +73,24 @@ {{/unless}} {{/if}} - {{#if equals user.emoji_status "happy"}} - {{> icon name="happy-face" size="25"}} + {{#if user.presenter}} + + + {{else}} - {{#if equals user.emoji_status "neutral"}} - {{> icon name="neutral-face" size="25"}} + {{#if equals user.role "MODERATOR"}} + + + {{else}} - {{#if equals user.emoji_status "confused"}} - {{> icon name="confused-face" size="25"}} - {{else}} - {{#if equals user.emoji_status "sad"}} - {{> icon name="sad-face" size="25"}} - {{else}} - {{#if equals user.emoji_status "away"}} - {{> icon name="clock" size="25"}} - {{else}} - {{#if equals user.emoji_status "raiseHand"}} - - - - {{else}} - {{#if user.presenter}} - - - - {{else}} - {{#if equals user.role "MODERATOR"}} - - - - {{/if}} - {{/if}} - {{/if}} - {{/if}} + {{#each emojiIcons}} + {{#if equals name ../user.emoji_status}} + {{> icon name=icon size="25" title=title}} {{/if}} - {{/if}} + {{/each}} {{/if}} {{/if}} + {{#if isCurrentUser userId}} diff --git a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html index 1df46a7ba7..ed24e638f5 100755 --- a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html +++ b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html @@ -15,24 +15,11 @@ - - - - - - + {{#each emojiIcons}} + + {{/each}} {{#if isMobile}} {{> makeButton btn_class="soaringButton fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}} diff --git a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.js b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.js index 3b3f33a244..5ad86b46cd 100755 --- a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.js +++ b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.js @@ -53,79 +53,14 @@ Template.whiteboard.events({ return document.webkitExitFullscreen(); } }, - 'click .sadEmojiButton.inactiveEmojiButton'(event) { - if($('.sadEmojiButton').css('opacity') === '1') { + 'click .inactiveEmojiButton'(event) { + if($(event.target).css('opacity') === '1') { BBB.setEmojiStatus( BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), - "sad" - ); - $('.FABTriggerButton').blur(); - return toggleEmojisFAB(); - } - }, - 'click .happyEmojiButton.inactiveEmojiButton'(event) { - if($('.happyEmojiButton').css('opacity') === '1') { - BBB.setEmojiStatus( - BBB.getMeetingId(), - getInSession('userId'), - getInSession('userId'), - getInSession('authToken'), - "happy" - ); - $('.FABTriggerButton').blur(); - return toggleEmojisFAB(); - } - }, - 'click .confusedEmojiButton.inactiveEmojiButton'(event) { - if($('.confusedEmojiButton').css('opacity') === '1') { - BBB.setEmojiStatus( - BBB.getMeetingId(), - getInSession('userId'), - getInSession('userId'), - getInSession('authToken'), - "confused" - ); - $('.FABTriggerButton').blur(); - return toggleEmojisFAB(); - } - }, - 'click .neutralEmojiButton.inactiveEmojiButton'(event) { - if($('.neutralEmojiButton').css('opacity') === '1') { - BBB.setEmojiStatus( - BBB.getMeetingId(), - getInSession('userId'), - getInSession('userId'), - getInSession('authToken'), - "neutral" - ); - $('.FABTriggerButton').blur(); - return toggleEmojisFAB(); - } - }, - 'click .awayEmojiButton.inactiveEmojiButton'(event) { - if($('.awayEmojiButton').css('opacity') === '1') { - BBB.setEmojiStatus( - BBB.getMeetingId(), - getInSession('userId'), - getInSession('userId'), - getInSession('authToken'), - "away" - ); - $('.FABTriggerButton').blur(); - return toggleEmojisFAB(); - } - }, - 'click .raiseHandEmojiButton.inactiveEmojiButton'(event) { - if($('.raiseHandEmojiButton').css('opacity') === '1') { - BBB.setEmojiStatus( - BBB.getMeetingId(), - getInSession('userId'), - getInSession('userId'), - getInSession('authToken'), - "raiseHand" + event.target.value ); $('.FABTriggerButton').blur(); return toggleEmojisFAB();