Skip to content

[FIX] Audio Message UI fixes #10303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodrigok merged 5 commits into from
Apr 4, 2018
Merged

[FIX] Audio Message UI fixes #10303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
691610b
[FIX] Check before rendering audio message template
kb0304 Apr 2, 2018
bdbe15a
[FIX] use component for icons
kb0304 Apr 2, 2018
cf877e6
[FIX] Single node for audioMessage template
kb0304 Apr 2, 2018
1698680
[FIX] Mic position order in mobile web
kb0304 Apr 2, 2018
8459101
Merge branch 'develop' into fix-audio-message-ui
ggazzo Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions packages/rocketchat-theme/client/imports/components/message-box.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,20 @@
transition: transform 0.1s linear;
}

&.check {
color: red;
display: none;
&.active {
display: flex;
}
}

&.cross {
color: red;
display: none;
&.active {
display: flex;
}
}

&.loading {
Expand Down Expand Up @@ -172,25 +184,16 @@
display: none;
}

&__audio-recording {
display: none;
position: relative;
z-index: -1;
&.active{
display: flex;
z-index: 2;
}
}

&__audio-message{
&.hidden{
z-index: -1;
}
display: flex;
}

&__timer-box{
display: flex;
display: none;
width: 50px;
&.active {
display: flex;
}
}

&__timer-dot{
Expand Down Expand Up @@ -266,11 +269,15 @@
order: 3;
}

&__audio-message {
order: 4;
}

&__send {
flex: 0;

font-size: 20px;
order: 4;
order: 5;
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions packages/rocketchat-ui-master/public/icons.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions packages/rocketchat-ui-message/client/messageBox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
{{> icon block="rc-input__icon-svg" icon="send"}}
</div>
{{else}}
{{> messageBox__audioMessage}}
{{#if isAudioMessageAllowed}}
{{> messageBox__audioMessage}}
{{/if}}
{{> messageBox__actions}}
{{/unless}}
{{# messageBox__actionsSmall}}
Expand Down Expand Up @@ -102,24 +104,22 @@
</div>
</template>
<template name="messageBox__audioMessage">
<div class="rc-message-box__audio-recording">
<div class="rc-message-box__audio-message">
<div class="rc-message-box__icon cross js-audio-message-cross">
<img src="/images/circle-cross.svg">
{{> icon block="rc-input__icon-svg" icon="circle-cross"}}
</div>
<div class="rc-message-box__timer-box">
<p class="rc-message-box__timer-dot">&#8226;&nbsp;</p>
<span class="rc-message-box__timer"> 00:00</span>
</div>
<div class="rc-message-box__icon check js-audio-message-check">
<img src="/images/circle-check.svg">
{{> icon block="rc-input__icon-svg" icon="circle-check"}}
</div>
</div>
<div class="rc-message-box__audio-message">
<div class="rc-message-box__icon mic active js-audio-message-record">
{{> icon block="rc-input__icon-svg" icon="mic"}}
</div>
<div class="rc-message-box__icon loading js-audio-message-loading">
<img class="rc-input__icon-svg" src="/images/loading.svg">
{{> icon block="rc-input__icon-svg" icon="loading"}}
</div>
</div>
</template>
Expand Down
33 changes: 17 additions & 16 deletions packages/rocketchat-ui-message/client/messageBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,12 @@ Template.messageBox.helpers({
return Template.instance().dataReply.get();
},
isAudioMessageAllowed() {
return RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList'));
return (navigator.getUserMedia || navigator.webkitGetUserMedia ||
navigator.mozGetUserMedia || navigator.msGetUserMedia) &&
RocketChat.settings.get('FileUpload_Enabled') &&
RocketChat.settings.get('Message_AudioRecorderEnabled') &&
(!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') ||
RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/mp3|audio\/\*/i));
}
});

Expand Down Expand Up @@ -484,9 +489,9 @@ Template.messageBox.events({
},
'click .js-audio-message-record'(event) {
event.preventDefault();
const icon = document.querySelector('.rc-message-box__audio-message');
const recording_icons = document.querySelectorAll('.rc-message-box__icon.check, .rc-message-box__icon.cross, .rc-message-box__timer-box');
const timer = document.querySelector('.rc-message-box__timer');
const timer_box = document.querySelector('.rc-message-box__audio-recording');
const mic = document.querySelector('.rc-message-box__icon.mic');

chatMessages[RocketChat.openedRoom].recording = true;
AudioRecorder.start(function() {
Expand All @@ -502,18 +507,18 @@ Template.messageBox.events({
timer.innerHTML = `${ minutes }:${ seconds }`;
}, 1000);

icon.classList.add('hidden');
timer_box.classList.add('active');
mic.classList.remove('active');
recording_icons.forEach((e)=>{ e.classList.add('active'); });
});
},
'click .js-audio-message-cross'(event) {
event.preventDefault();
const icon = document.querySelector('.rc-message-box__audio-message');
const timer = document.querySelector('.rc-message-box__timer');
const timer_box = document.querySelector('.rc-message-box__audio-recording');
const mic = document.querySelector('.rc-message-box__icon.mic');
const recording_icons = document.querySelectorAll('.rc-message-box__icon.check, .rc-message-box__icon.cross, .rc-message-box__timer-box');

timer_box.classList.remove('active');
icon.classList.remove('hidden');
recording_icons.forEach((e)=>{ e.classList.remove('active'); });
mic.classList.add('active');
timer.innerHTML = '00:00';
if (audioMessageIntervalId) {
clearInterval(audioMessageIntervalId);
Expand All @@ -524,17 +529,13 @@ Template.messageBox.events({
},
'click .js-audio-message-check'(event) {
event.preventDefault();
const icon = document.querySelector('.rc-message-box__audio-message');
const timer = document.querySelector('.rc-message-box__timer');
const timer_box = document.querySelector('.rc-message-box__audio-recording');
const mic = document.querySelector('.rc-message-box__icon.mic');
const loader = document.querySelector('.js-audio-message-loading');
const mic = document.querySelector('.js-audio-message-record');
const recording_icons = document.querySelectorAll('.rc-message-box__icon.check, .rc-message-box__icon.cross, .rc-message-box__timer-box');

icon.classList.remove('hidden');
timer_box.classList.remove('active');
mic.classList.remove('active');
recording_icons.forEach((e)=>{ e.classList.remove('active'); });
loader.classList.add('active');

timer.innerHTML = '00:00';
if (audioMessageIntervalId) {
clearInterval(audioMessageIntervalId);
Expand Down
1 change: 0 additions & 1 deletion public/images/circle-check.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion public/images/circle-cross.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion public/images/loading.svg
View file
Open in desktop

This file was deleted.