|
@@ -685,9 +685,12 @@ $(document).bind('joined.muc', function (event, jid, info) {
|
685
|
685
|
// Once we've joined the muc show the toolbar
|
686
|
686
|
ToolbarToggler.showToolbar();
|
687
|
687
|
|
688
|
|
- if (info.displayName)
|
|
688
|
+ var displayName = !config.displayJids
|
|
689
|
+ ? info.displayName : Strophe.getResourceFromJid(jid);
|
|
690
|
+
|
|
691
|
+ if (displayName)
|
689
|
692
|
$(document).trigger('displaynamechanged',
|
690
|
|
- ['localVideoContainer', info.displayName + ' (me)']);
|
|
693
|
+ ['localVideoContainer', displayName + ' (me)']);
|
691
|
694
|
});
|
692
|
695
|
|
693
|
696
|
$(document).bind('entered.muc', function (event, jid, info, pres) {
|
|
@@ -830,9 +833,12 @@ $(document).bind('presence.muc', function (event, jid, info, pres) {
|
830
|
833
|
}
|
831
|
834
|
});
|
832
|
835
|
|
833
|
|
- if (info.displayName && info.displayName.length > 0)
|
|
836
|
+ var displayName = !config.displayJids
|
|
837
|
+ ? info.displayName : Strophe.getResourceFromJid(jid);
|
|
838
|
+
|
|
839
|
+ if (displayName && displayName.length > 0)
|
834
|
840
|
$(document).trigger('displaynamechanged',
|
835
|
|
- [jid, info.displayName]);
|
|
841
|
+ [jid, displayName]);
|
836
|
842
|
|
837
|
843
|
if (focus !== null && info.displayName !== null) {
|
838
|
844
|
focus.setEndpointDisplayName(jid, info.displayName);
|