BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the ability to clear emoji status.

Browse Source
This commit is contained in:
Maxim Khlobystov 2015-10-02 18:07:28 -07:00
parent 65a7ac4b70
commit e9f204b681
6 changed files with 118 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bigbluebutton-html5/app/client/globals.coffee
View File

@ -83,6 +83,9 @@ Handlebars.registerHelper "getUsersInMeeting", ->
Handlebars.registerHelper "getWhiteboardTitle", ->
(BBB.currentPresentationName() or "Loading presentation...")
Handlebars.registerHelper "getCurrentUserEmojiStatus", ->
BBB.getCurrentUser()?.user?.emoji_status
Handlebars.registerHelper "isCurrentUser", (userId) ->
userId is null or userId is BBB.getCurrentUser()?.userId
@ -98,6 +101,9 @@ Handlebars.registerHelper "privateChatName", ->
Handlebars.registerHelper "isCurrentUserRaisingHand", ->
BBB.isCurrentUserRaisingHand()
Handlebars.registerHelper "isCurrentUserEmojiStatusSet", ->
BBB.isCurrentUserEmojiStatusSet()
Handlebars.registerHelper "isCurrentUserSharingVideo", ->
BBB.amISharingVideo()
@ -214,7 +220,7 @@ Handlebars.registerHelper "getPollQuestions", ->
bTime = b.user.raise_hand.getTime()
if aTime < bTime
return -1
else
else
return 1
else if a.user.raise_hand
return -1
@ -227,8 +233,8 @@ Handlebars.registerHelper "getPollQuestions", ->
else if not b.user.phone_user
return 1
#Check name (case-insensitive) in the event of a tie up above. If the name
#is the same then use userID which should be unique making the order the same
#Check name (case-insensitive) in the event of a tie up above. If the name
#is the same then use userID which should be unique making the order the same
#across all clients.
if a.user._sort_name < b.user._sort_name

6
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
View File

@ -157,6 +157,12 @@ https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/
BBB.isCurrentUserRaisingHand = ->
BBB.isUserRaisingHand(BBB.getCurrentUser()?.userId)
BBB.isUserEmojiStatusSet = (userId) ->
BBB.getUser(userId)?.user?.emoji_status isnt "none" and BBB.getUser(userId)?.user?.emoji_status isnt undefined
BBB.isCurrentUserEmojiStatusSet = ->
BBB.isUserEmojiStatusSet(BBB.getCurrentUser()?.userId)
BBB.isMeetingRecording = ->
MEteor.Meetings.findOne()?.recorded

5
bigbluebutton-html5/app/client/stylesheets/users.less
View File

@ -183,7 +183,10 @@
width: 15px;
min-width: 15px;
height: 27px;
margin-right: 10px;
margin-right: 15px;
font-size: 18px;
color: #FFFFFF;
span {
padding-left: 5px;
}
}

4
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
View File

@ -323,3 +323,7 @@
font-size: 500%;
}
}
.clearEmojiButton {
background-color: #34495E;
}

5
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
View File

@ -57,7 +57,10 @@ Template.whiteboard.events
'click .raiseHandEmojiButton': (event) ->
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "raiseHand")
'click .sl-fab-trigger': (event) ->
'click .clearEmojiButton': (event) ->
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "none")
'click .sl-fab-trigger, click .sl-fab-btn': (event) ->
$('.sl-fab-trigger').blur()
toggleFAB()

114
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
View File

@ -6,29 +6,97 @@
<div id="whiteboard-container" class="{{whiteboardSize}}">
<div id="whiteboard-paper">
</div>
<div class="sl-fab-container sl-left-hr-dbl-fab">
<button type="submit" class="sl-fab-trigger">
<i class="ion-plus-round"></i>
</button>
<button type="submit" class="sl-fab-btn sadEmojiButton">
{{> slIcon name="sad-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn happyEmojiButton">
{{> slIcon name="happy-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn confusedEmojiButton">
{{> slIcon name="confused-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn neutralEmojiButton">
{{> slIcon name="neutral-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn awayEmojiButton">
{{> slIcon name="clock" size="50"}}
</button>
<button type="submit" class="sl-fab-btn raiseHandEmojiButton">
<i class="ion-android-hand"></i>
</button>
</div>
{{#if isCurrentUserEmojiStatusSet}}
<div class="sl-fab-container sl-left-hr-dbl-fab">
<button type="submit" class="sl-fab-trigger">
<i class="ion-plus-round"></i>
</button>
{{#if equals getCurrentUserEmojiStatus "sad"}}
<button type="submit" class="sl-fab-btn clearEmojiButton">
{{> slIcon name="sad-face" size="50"}}
</button>
{{else}}
<button type="submit" class="sl-fab-btn sadEmojiButton">
{{> slIcon name="sad-face" size="50"}}
</button>
{{/if}}
{{#if equals getCurrentUserEmojiStatus "happy"}}
<button type="submit" class="sl-fab-btn clearEmojiButton">
{{> slIcon name="happy-face" size="50"}}
</button>
{{else}}
<button type="submit" class="sl-fab-btn happyEmojiButton">
{{> slIcon name="happy-face" size="50"}}
</button>
{{/if}}
{{#if equals getCurrentUserEmojiStatus "confused"}}
<button type="submit" class="sl-fab-btn clearEmojiButton">
{{> slIcon name="confused-face" size="50"}}
</button>
{{else}}
<button type="submit" class="sl-fab-btn confusedEmojiButton">
{{> slIcon name="confused-face" size="50"}}
</button>
{{/if}}
{{#if equals getCurrentUserEmojiStatus "neutral"}}
<button type="submit" class="sl-fab-btn clearEmojiButton">
{{> slIcon name="neutral-face" size="50"}}
</button>
{{else}}
<button type="submit" class="sl-fab-btn neutralEmojiButton">
{{> slIcon name="neutral-face" size="50"}}
</button>
{{/if}}
{{#if equals getCurrentUserEmojiStatus "away"}}
<button type="submit" class="sl-fab-btn clearEmojiButton">
{{> slIcon name="clock" size="50"}}
</button>
{{else}}
<button type="submit" class="sl-fab-btn awayEmojiButton">
{{> slIcon name="clock" size="50"}}
</button>
{{/if}}
{{#if equals getCurrentUserEmojiStatus "raiseHand"}}
<button type="submit" class="sl-fab-btn clearEmojiButton">
<i class="ion-android-hand"></i>
</button>
{{else}}
<button type="submit" class="sl-fab-btn raiseHandEmojiButton">
<i class="ion-android-hand"></i>
</button>
{{/if}}
</div>
{{else}}
<div class="sl-fab-container sl-left-hr-dbl-fab">
<button type="submit" class="sl-fab-trigger">
<i class="ion-plus-round"></i>
</button>
<button type="submit" class="sl-fab-btn sadEmojiButton">
{{> slIcon name="sad-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn happyEmojiButton">
{{> slIcon name="happy-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn confusedEmojiButton">
{{> slIcon name="confused-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn neutralEmojiButton">
{{> slIcon name="neutral-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn awayEmojiButton">
{{> slIcon name="clock" size="50"}}
</button>
<button type="submit" class="sl-fab-btn raiseHandEmojiButton">
<i class="ion-android-hand"></i>
</button>
</div>
{{/if}}
{{#if isMobile}}
{{> makeButton btn_class="soaringButton fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}}
{{/if}}