Browse Source

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

j8
hristoterezov 10 years ago
parent
commit
efcfe99707
5 changed files with 9 additions and 8 deletions
  1. 1
    1
      index.html
  2. 2
    1
      lang/main.json
  3. 3
    3
      libs/app.bundle.js
  4. 1
    1
      modules/UI/UI.js
  5. 2
    2
      modules/UI/util/MessageHandler.js

+ 1
- 1
index.html View File

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

+ 2
- 1
lang/main.json View File

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

+ 3
- 3
libs/app.bundle.js View File

@@ -1524,7 +1524,7 @@ function notifyForInitialMute()
1524 1524
 {
1525 1525
     if(config.startAudioMuted || config.startVideoMuted)
1526 1526
     {
1527
-        messageHandler.notify(null, "notify.me", "connected", "notify.muted");
1527
+        messageHandler.notify(null, "notify.mutedTitle", "connected", "notify.muted", null, {timeOut: 120000});
1528 1528
     }
1529 1529
 }
1530 1530
 
@@ -6249,7 +6249,7 @@ var messageHandler = (function(my) {
6249 6249
     };
6250 6250
 
6251 6251
     my.notify = function(displayName, displayNameKey,
6252
-                         cls, messageKey, messageArguments) {
6252
+                         cls, messageKey, messageArguments, options) {
6253 6253
         var displayNameSpan = '<span class="nickname" ';
6254 6254
         if(displayName)
6255 6255
         {
@@ -6269,7 +6269,7 @@ var messageHandler = (function(my) {
6269 6269
                     : "") + ">" +
6270 6270
             APP.translation.translateString(messageKey,
6271 6271
                 messageArguments) +
6272
-            '</span>');
6272
+            '</span>', null, options);
6273 6273
     };
6274 6274
 
6275 6275
     return my;

+ 1
- 1
modules/UI/UI.js View File

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

+ 2
- 2
modules/UI/util/MessageHandler.js View File

@@ -175,7 +175,7 @@ var messageHandler = (function(my) {
175 175
     };
176 176
 
177 177
     my.notify = function(displayName, displayNameKey,
178
-                         cls, messageKey, messageArguments) {
178
+                         cls, messageKey, messageArguments, options) {
179 179
         var displayNameSpan = '<span class="nickname" ';
180 180
         if(displayName)
181 181
         {
@@ -195,7 +195,7 @@ var messageHandler = (function(my) {
195 195
                     : "") + ">" +
196 196
             APP.translation.translateString(messageKey,
197 197
                 messageArguments) +
198
-            '</span>');
198
+            '</span>', null, options);
199 199
     };
200 200
 
201 201
     return my;

Loading…
Cancel
Save