Bladeren bron

hide chat if local display name is empty

master
isymchych 9 jaren geleden
bovenliggende
commit
ebf57923ae
5 gewijzigde bestanden met toevoegingen van 27 en 9 verwijderingen
  1. 7
    1
      conference.js
  2. 15
    0
      css/chat.css
  3. 1
    1
      modules/UI/UI.js
  4. 3
    4
      modules/UI/side_pannels/chat/Chat.js
  5. 1
    3
      modules/UI/side_pannels/settings/SettingsMenu.js

+ 7
- 1
conference.js Bestand weergeven

@@ -860,7 +860,13 @@ export default {
860 860
             APP.UI.setUserAvatar(data.attributes.id, data.value);
861 861
         });
862 862
 
863
-        APP.UI.addListener(UIEvents.NICKNAME_CHANGED, (nickname) => {
863
+        APP.UI.addListener(UIEvents.NICKNAME_CHANGED, (nickname = '') => {
864
+            nickname = nickname.trim();
865
+
866
+            if (nickname === APP.settings.getDisplayName()) {
867
+                return;
868
+            }
869
+
864 870
             APP.settings.setDisplayName(nickname);
865 871
             room.setDisplayName(nickname);
866 872
             APP.UI.changeDisplayName(APP.conference.localId, nickname);

+ 15
- 0
css/chat.css Bestand weergeven

@@ -22,6 +22,9 @@
22 22
     overflow-x: hidden;
23 23
     word-wrap: break-word;
24 24
 }
25
+#chatspace.is-conversation-mode #chatconversation {
26
+    visibility: visible;
27
+}
25 28
 
26 29
 .localuser {
27 30
     color: #087dba;
@@ -61,6 +64,10 @@
61 64
     box-shadow: none;
62 65
 }
63 66
 
67
+#chatspace.is-conversation-mode #usermsg {
68
+    visibility: visible;
69
+}
70
+
64 71
 #nickname {
65 72
     position: absolute;
66 73
     text-align: center;
@@ -72,6 +79,10 @@
72 79
     width: 95%;
73 80
 }
74 81
 
82
+#chatspace.is-conversation-mode #nickname {
83
+    visibility: hidden;
84
+}
85
+
75 86
 #nickinput {
76 87
     margin-top: 20px;
77 88
     font-size: 14px;
@@ -168,6 +179,10 @@
168 179
     visibility: hidden;
169 180
 }
170 181
 
182
+#chatspace.is-conversation-mode #smileysarea {
183
+    visibility: visible;
184
+}
185
+
171 186
 #smileysContainer {
172 187
     display: none;
173 188
     position: absolute;

+ 1
- 1
modules/UI/UI.js Bestand weergeven

@@ -560,7 +560,7 @@ UI.updateUserRole = function (user) {
560 560
         messageHandler.notify(
561 561
             displayName, 'notify.somebody',
562 562
             'connected', 'notify.grantedTo', {
563
-                to: displayName
563
+                to: UIUtil.escapeHtml(displayName)
564 564
             }
565 565
         );
566 566
     } else {

+ 3
- 4
modules/UI/side_pannels/chat/Chat.js Bestand weergeven

@@ -292,13 +292,12 @@ var Chat = {
292 292
 
293 293
     /**
294 294
      * Sets the chat conversation mode.
295
+     * @param {boolean} isConversationMode if chat should be in
296
+     * conversation mode or not.
295 297
      */
296 298
     setChatConversationMode (isConversationMode) {
299
+        $('#chatspace').toggleClass('is-conversation-mode', isConversationMode);
297 300
         if (isConversationMode) {
298
-            $('#nickname').css({visibility: 'hidden'});
299
-            $('#chatconversation').css({visibility: 'visible'});
300
-            $('#usermsg').css({visibility: 'visible'});
301
-            $('#smileysarea').css({visibility: 'visible'});
302 301
             $('#usermsg').focus();
303 302
         }
304 303
     },

+ 1
- 3
modules/UI/side_pannels/settings/SettingsMenu.js Bestand weergeven

@@ -42,9 +42,7 @@ export default {
42 42
         function update() {
43 43
             let displayName = $('#setDisplayName').val();
44 44
 
45
-            if (displayName && Settings.getDisplayName() !== displayName) {
46
-                emitter.emit(UIEvents.NICKNAME_CHANGED, displayName);
47
-            }
45
+            emitter.emit(UIEvents.NICKNAME_CHANGED, displayName);
48 46
 
49 47
             let language = $("#languages_selectbox").val();
50 48
             if (language !== Settings.getLanguage()) {

Laden…
Annuleren
Opslaan