Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

move mute state into the existing voice/video buttons for now. move zoom button to that set for now

Browse Source
This commit is contained in:
Matthew Hodgson 2015-10-20 11:30:54 +01:00
parent 34ad48a5d3
commit bb5895c157
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/skins/vector/views/molecules/RoomHeader.js
View File

@ -58,12 +58,14 @@ module.exports = React.createClass({
else { else {
var topic = this.props.room.currentState.getStateEvents('m.room.topic', ''); var topic = this.props.room.currentState.getStateEvents('m.room.topic', '');
var callButtons; var call_buttons;
var zoom_button;
if (this.state && this.state.call_state != 'ended') { if (this.state && this.state.call_state != 'ended') {
var muteVideoButton; var muteVideoButton;
var activeCall = ( var activeCall = (
CallHandler.getCallForRoom(this.props.room.roomId) CallHandler.getCallForRoom(this.props.room.roomId)
); );
/*
if (activeCall && activeCall.type === "video") { if (activeCall && activeCall.type === "video") {
muteVideoButton = ( muteVideoButton = (
<div className="mx_RoomHeader_textButton mx_RoomHeader_voipButton" <div className="mx_RoomHeader_textButton mx_RoomHeader_voipButton"
@ -75,13 +77,6 @@ module.exports = React.createClass({
</div> </div>
); );
} }
callButtons = (
<div className="mx_RoomHeader_voipButtons">
<div className="mx_RoomHeader_textButton mx_RoomHeader_voipButton"
onClick={this.onHangupClick}>
End call
</div>
{muteVideoButton} {muteVideoButton}
<div className="mx_RoomHeader_textButton mx_RoomHeader_voipButton" <div className="mx_RoomHeader_textButton mx_RoomHeader_voipButton"
onClick={this.onMuteAudioClick}> onClick={this.onMuteAudioClick}>
@ -90,9 +85,18 @@ module.exports = React.createClass({
"Unmute" : "Mute") + " audio" "Unmute" : "Mute") + " audio"
} }
</div> </div>
<div className="mx_RoomHeader_textButton" onClick={this.onFullscreenClick}> */
Fullscreen
call_buttons = (
<div className="mx_RoomHeader_textButton"
onClick={this.onHangupClick}>
End call
</div> </div>
);
zoom_button = (
<div className="mx_RoomHeader_button" onClick={this.onFullscreenClick}>
<img src="img/zoom.png" title="Fullscreen" alt="Fullscreen" width="32" height="32"/>
</div> </div>
); );
} }
@ -143,18 +147,19 @@ module.exports = React.createClass({
{ topic_el } { topic_el }
</div> </div>
</div> </div>
{callButtons} {call_buttons}
{cancel_button} {cancel_button}
{save_button} {save_button}
<div className="mx_RoomHeader_rightRow"> <div className="mx_RoomHeader_rightRow">
{ settings_button } { settings_button }
{ zoom_button }
<div className="mx_RoomHeader_button mx_RoomHeader_search"> <div className="mx_RoomHeader_button mx_RoomHeader_search">
<img src="img/search.png" title="Search" alt="Search" width="32" height="32"/> <img src="img/search.png" title="Search" alt="Search" width="32" height="32"/>
</div> </div>
<div className="mx_RoomHeader_button mx_RoomHeader_video" onClick={this.onVideoClick}> <div className="mx_RoomHeader_button mx_RoomHeader_video" onClick={activeCall && activeCall.type === "video" ? this.onMuteVideoClick : this.onVideoClick}>
<img src="img/video.png" title="Video call" alt="Video call" width="32" height="32"/> <img src="img/video.png" title="Video call" alt="Video call" width="32" height="32"/>
</div> </div>
<div className="mx_RoomHeader_button mx_RoomHeader_voice" onClick={this.onVoiceClick}> <div className="mx_RoomHeader_button mx_RoomHeader_voice" onClick={activeCall ? this.onMuteAudioClick : this.onVoiceClick}>
<img src="img/voip.png" title="VoIP call" alt="VoIP call" width="32" height="32"/> <img src="img/voip.png" title="VoIP call" alt="VoIP call" width="32" height="32"/>
</div> </div>
</div> </div>