Fixes merge mistake.
This commit is contained in:
parent
d8ebea0d8b
commit
afaa96b737
1
app.js
1
app.js
|
@ -849,7 +849,6 @@ $(document).bind('presence.muc', function (event, jid, info, pres) {
|
||||||
if (displayName && displayName.length > 0)
|
if (displayName && displayName.length > 0)
|
||||||
$(document).trigger('displaynamechanged',
|
$(document).trigger('displaynamechanged',
|
||||||
[jid, displayName]);
|
[jid, displayName]);
|
||||||
[jid, info.displayName]);
|
|
||||||
if (Strophe.getResourceFromJid(jid).indexOf('focus') != -1)
|
if (Strophe.getResourceFromJid(jid).indexOf('focus') != -1)
|
||||||
{
|
{
|
||||||
console.info("Ignore focus");
|
console.info("Ignore focus");
|
||||||
|
|
Loading…
Reference in New Issue