From a05c2b51d76f2c99ad5b2d66f92ba40aa401b6fa Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Mon, 1 Feb 2016 15:48:46 -0200 Subject: [PATCH] Allow voice recording when media types whitelist is empty; --- i18n/en.i18n.json | 2 +- packages/rocketchat-ui-message/message/messageBox.coffee | 2 +- packages/rocketchat-ui/views/app/room.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 0074f4dbb23..dcdd7f1b5f9 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -182,7 +182,7 @@ "FileUpload_MaxFileSize" : "Maximum File Upload Size (in bytes)", "FileUpload_MediaType_NotAccepted" : "Media Types Not Accepted", "FileUpload_MediaTypeWhiteList" : "Accepted Media Types", - "FileUpload_MediaTypeWhiteListDescription" : "Comma-separated list of media types", + "FileUpload_MediaTypeWhiteListDescription" : "Comma-separated list of media types. Leave it blank for accepting all media types.", "FileUpload_ProtectFiles" : "Protect uploaded files", "FileUpload_ProtectFilesDescription" : "Only authenticated users will have access", "Follow_social_profiles" : "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.", diff --git a/packages/rocketchat-ui-message/message/messageBox.coffee b/packages/rocketchat-ui-message/message/messageBox.coffee index 00f3cad3a06..0d11010c62a 100644 --- a/packages/rocketchat-ui-message/message/messageBox.coffee +++ b/packages/rocketchat-ui-message/message/messageBox.coffee @@ -26,7 +26,7 @@ Template.messageBox.helpers } canRecordAudio: -> wavRegex = /audio\/wav|audio\/\*/i - wavEnabled = RocketChat.settings.get("FileUpload_MediaTypeWhiteList").match(wavRegex) + wavEnabled = !RocketChat.settings.get("FileUpload_MediaTypeWhiteList") || RocketChat.settings.get("FileUpload_MediaTypeWhiteList").match(wavRegex) return RocketChat.settings.get('Message_AudioRecorderEnabled') and (navigator.getUserMedia? or navigator.webkitGetUserMedia?) and wavEnabled and RocketChat.settings.get('FileUpload_Enabled') usersTyping: -> users = MsgTyping.get @_id diff --git a/packages/rocketchat-ui/views/app/room.coffee b/packages/rocketchat-ui/views/app/room.coffee index a50f595194f..e564998150f 100644 --- a/packages/rocketchat-ui/views/app/room.coffee +++ b/packages/rocketchat-ui/views/app/room.coffee @@ -167,7 +167,7 @@ Template.room.helpers canRecordAudio: -> wavRegex = /audio\/wav|audio\/\*/i - wavEnabled = RocketChat.settings.get("FileUpload_MediaTypeWhiteList").match(wavRegex) + wavEnabled = !RocketChat.settings.get("FileUpload_MediaTypeWhiteList") || RocketChat.settings.get("FileUpload_MediaTypeWhiteList").match(wavRegex) return RocketChat.settings.get('Message_AudioRecorderEnabled') and (navigator.getUserMedia? or navigator.webkitGetUserMedia?) and wavEnabled and RocketChat.settings.get('FileUpload_Enabled') unreadSince: ->