haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improves the notification that informs the user if started the conference audio/video muted.

This commit is contained in:
hristoterezov 2015-04-22 13:27:14 +03:00
parent cc1ad1bc13
commit efcfe99707
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=58"></script> <script src="libs/app.bundle.js?v=59"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/> <link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

3
lang/main.json
View File

@ -124,7 +124,8 @@
"focusFail": "__component__ not available - retry in __ms__ sec", "focusFail": "__component__ not available - retry in __ms__ sec",
"grantedTo": "Moderator rights granted to __to__!", "grantedTo": "Moderator rights granted to __to__!",
"grantedToUnknown": "Moderator rights granted to $t(somebody)!", "grantedToUnknown": "Moderator rights granted to $t(somebody)!",
"muted": "You have started the conversation muted." "muted": "You have started the conversation muted.",
"mutedTitle": "You're muted!"
}, },
"dialog": { "dialog": {
"kickMessage": "Ouch! You have been kicked out of the meet!", "kickMessage": "Ouch! You have been kicked out of the meet!",

6
libs/app.bundle.js
View File

@ -1524,7 +1524,7 @@ function notifyForInitialMute()
{ {
if(config.startAudioMuted || config.startVideoMuted) if(config.startAudioMuted || config.startVideoMuted)
{ {
messageHandler.notify(null, "notify.me", "connected", "notify.muted"); messageHandler.notify(null, "notify.mutedTitle", "connected", "notify.muted", null, {timeOut: 120000});
} }
} }
@ -6249,7 +6249,7 @@ var messageHandler = (function(my) {
}; };
my.notify = function(displayName, displayNameKey, my.notify = function(displayName, displayNameKey,
cls, messageKey, messageArguments) { cls, messageKey, messageArguments, options) {
var displayNameSpan = '<span class="nickname" '; var displayNameSpan = '<span class="nickname" ';
if(displayName) if(displayName)
{ {
@ -6269,7 +6269,7 @@ var messageHandler = (function(my) {
: "") + ">" + : "") + ">" +
APP.translation.translateString(messageKey, APP.translation.translateString(messageKey,
messageArguments) + messageArguments) +
'</span>'); '</span>', null, options);
}; };
return my; return my;

2
modules/UI/UI.js
View File

@ -36,7 +36,7 @@ function notifyForInitialMute()
{ {
if(config.startAudioMuted || config.startVideoMuted) if(config.startAudioMuted || config.startVideoMuted)
{ {
messageHandler.notify(null, "notify.me", "connected", "notify.muted"); messageHandler.notify(null, "notify.mutedTitle", "connected", "notify.muted", null, {timeOut: 120000});
} }
} }

4
modules/UI/util/MessageHandler.js
View File

@ -175,7 +175,7 @@ var messageHandler = (function(my) {
}; };
my.notify = function(displayName, displayNameKey, my.notify = function(displayName, displayNameKey,
cls, messageKey, messageArguments) { cls, messageKey, messageArguments, options) {
var displayNameSpan = '<span class="nickname" '; var displayNameSpan = '<span class="nickname" ';
if(displayName) if(displayName)
{ {
@ -195,7 +195,7 @@ var messageHandler = (function(my) {
: "") + ">" + : "") + ">" +
APP.translation.translateString(messageKey, APP.translation.translateString(messageKey,
messageArguments) + messageArguments) +
'</span>'); '</span>', null, options);
}; };
return my; return my;