glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make pending work

Browse source
This commit is contained in:
Connor Turland 2016-12-21 03:36:09 -05:00
parent 87e84128ab
commit 7cd70438bc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/junto.css.erb
View file

@ -223,8 +223,8 @@
float: right; float: right;
background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center; background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center;
} }
.chat-box .participants .participant.pending .chat-participant-invite-call, .chat-box .participants .participant .chat-participant-invite-call.pending,
.chat-box .participants .participant.pending .chat-participant-invite-join { .chat-box .participants .participant .chat-participant-invite-join.pending {
background: #dab539 url(<%= asset_path 'ellipsis.gif' %>) no-repeat center center; background: #dab539 url(<%= asset_path 'ellipsis.gif' %>) no-repeat center center;
} }
.chat-box .participants .participant .chat-participant-participating { .chat-box .participants .participant .chat-participant-participating {

8
frontend/src/components/MapChat/Participant.js
View file

@ -12,12 +12,12 @@ class Participant extends Component {
{username} {self ? '(me)' : ''} {username} {self ? '(me)' : ''}
</div> </div>
{!self && !conversationLive && <button {!self && !conversationLive && <button
className='button chat-participant-invite-call' className={`button chat-participant-invite-call ${isPending ? 'pending' : ''}`}
onClick={() => this.props.inviteACall(id)} // Realtime.inviteACall(id) onClick={() => !isPending && this.props.inviteACall(id)} // Realtime.inviteACall(id)
/>} />}
{!self && mapperIsLive && !isParticipating && <button {!self && mapperIsLive && !isParticipating && <button
className="button chat-participant-invite-join" className={`button chat-participant-invite-join ${isPending ? 'pending' : ''}`}
onClick={() => this.props.inviteToJoin(id)} // Realtime.inviteToJoin(id) onClick={() => !isPending && this.props.inviteToJoin(id)} // Realtime.inviteToJoin(id)
/>} />}
{isParticipating && <span className="chat-participant-participating"> {isParticipating && <span className="chat-participant-participating">
<div className="green-dot"></div> <div className="green-dot"></div>