Skip to content
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

[FIX] Audio message icon #8648

Merged
merged 1 commit into from
Oct 28, 2017
Merged

[FIX] Audio message icon #8648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions packages/rocketchat-ui-message/startup/messageBoxActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* globals fileUpload chatMessages AudioRecorder device */
/* globals fileUpload chatMessages AudioRecorder device popover */

import mime from 'mime-type/with-db';
import {VRecDialog} from 'meteor/rocketchat:ui-vrecord';
Expand All @@ -18,23 +18,27 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/wav|audio\/\*/i)),
action({event, element}) {
event.preventDefault();
const icon = element;
const icon = element.querySelector('.rc-icon');

if (chatMessages[RocketChat.openedRoom].recording) {
return AudioRecorder.stop(function(blob) {
AudioRecorder.stop(function(blob) {
popover.close();
icon.style.color = '';
icon.classList.remove('pulse');
chatMessages[RocketChat.openedRoom].recording = false;
return fileUpload([
fileUpload([
{
file: blob,
type: 'audio',
name: `${ TAPi18n.__('Audio record') }.wav`
}
]);
});
return false;
}

chatMessages[RocketChat.openedRoom].recording = true;
return AudioRecorder.start(function() {
AudioRecorder.start(function() {
icon.classList.add('pulse');
icon.style.color = 'red';
});
Expand Down Expand Up @@ -71,7 +75,7 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
name: file.name
};
});
return fileUpload(filesToUpload);
fileUpload(filesToUpload);
}, {once: true});

input.remove();
Expand All @@ -87,7 +91,7 @@ RocketChat.messageBox.actions.add('Share', 'My_location', {
const latitude = position.coords.latitude;
const longitude = position.coords.longitude;
const text = `<div class="location-preview"><img style="height: 250px; width: 250px;" src="https://maps.googleapis.com/maps/api/staticmap?zoom=14&size=250x250&markers=color:gray%7Clabel:%7C${ latitude },${ longitude }&key=${ RocketChat.settings.get('MapView_GMapsAPIKey') }" /></div>`;
return swal({
swal({
title: t('Share_Location_Title'),
text,
showCancelButton: true,
Expand All @@ -98,7 +102,7 @@ RocketChat.messageBox.actions.add('Share', 'My_location', {
if (isConfirm !== true) {
return;
}
return Meteor.call('sendMessage', {
Meteor.call('sendMessage', {
_id: Random.id(),
rid,
msg: '',
Expand Down
11 changes: 9 additions & 2 deletions packages/rocketchat-ui/client/views/app/popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ this.popover = {
this.renderedPopover = Blaze.renderWithData(Template.popover, config, document.body);
},
close() {
if (!this.renderedPopover) {
return false;
}

Blaze.remove(this.renderedPopover);

const activeElement = this.renderedPopover.dataVar.curValue.activeElement;
Expand Down Expand Up @@ -81,10 +85,13 @@ Template.popover.onRendered(function() {

Template.popover.events({
'click [data-type="messagebox-action"]'(event, t) {
const action = RocketChat.messageBox.actions.getById(event.currentTarget.dataset.id);
const id = event.currentTarget.dataset.id;
const action = RocketChat.messageBox.actions.getById(id);
if ((action[0] != null ? action[0].action : undefined) != null) {
action[0].action({rid: t.data.data.rid, messageBox: document.querySelector('.rc-message-box'), element: event.currentTarget, event});
popover.close();
if (id !== 'audio-message') {
popover.close();
}
}
},
'click [data-type="message-action"]'(e, t) {
Expand Down