Skip to content

C
converse.js
Commit 66adf035 authored by JC Brand's avatar JC Brand
Browse files
Options

Bugfix. Order of operations.

parent e189acc8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dist/converse.js
View file @ 66adf035
...@@ -66782,7 +66782,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc ...@@ -66782,7 +66782,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
throw new Error("Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."); throw new Error("Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired.");
} }
const nick = _converse.nickname || _converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined; const nick = _converse.nickname || (_converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined);
if (nick) { if (nick) {
return nick; return nick;
src/headless/converse-muc.js
View file @ 66adf035
...@@ -147,7 +147,7 @@ converse.plugins.add('converse-muc', { ...@@ -147,7 +147,7 @@ converse.plugins.add('converse-muc', {
throw new Error( throw new Error(
"Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."); "Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired.");
} }
const nick = _converse.nickname || _converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined; const nick = _converse.nickname || (_converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined);
if (nick) { if (nick) {
return nick; return nick;
} else if (_converse.muc_nickname_from_jid) { } else if (_converse.muc_nickname_from_jid) {
......
src/headless/dist/converse-headless.js
View file @ 66adf035
...@@ -45176,7 +45176,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc ...@@ -45176,7 +45176,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
throw new Error("Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."); throw new Error("Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired.");
} }
const nick = _converse.nickname || _converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined; const nick = _converse.nickname || (_converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined);
if (nick) { if (nick) {
return nick; return nick;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7