Fixes having user info way below tab pane

pull/1017/head
Marcelo Schmidt 11 years ago
parent 6780185e5e
commit a902e78c95
  1. 7
      client/views/app/tabBar/membersList.coffee
  2. 2
      client/views/app/tabBar/membersList.html

@ -65,6 +65,13 @@ Template.membersList.helpers
flexUserInfo: ->
username = Session.get('showUserInfo')
return Meteor.users.findOne({ username: String(username) }) or { username: String(username) }
showUserInfo: ->
webrtc = WebRTC.getInstanceByRoomId(Session.get('openedRoom'))
overlay = @overlay?
if overlay isnt webrtc.overlayEnabled.get()
return false
videoActive = webrtc.localUrl.get()? or webrtc.remoteItems.get()?.length > 0
return Session.get('showUserInfo') and not videoActive
Template.membersList.events

@ -35,7 +35,7 @@
{{/with}}
</div>
{{/if}}
<div class="user-view {{#unless $.Session.get 'showUserInfo'}} -hidden{{/unless}}">
<div class="user-view animated{{#unless showUserInfo}} -hidden{{/unless}}">
{{> userInfo user=flexUserInfo showAll=isGroupChat video=isDirectChat}}
</div>
</div>

Loading…
Cancel
Save