Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

new builds

Browse Source
This commit is contained in:
JC Brand 2018-08-22 11:41:51 +02:00
parent 23a26cfdf5
commit 4141a22306
3 changed files with 1266 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/converse.css
View File

@ -7481,6 +7481,7 @@ body.reset {
#conversejs .chatbox .sendXMPPMessage .spoiler-hint { #conversejs .chatbox .sendXMPPMessage .spoiler-hint {
width: 100%; } width: 100%; }
#conversejs .chatbox .sendXMPPMessage .chat-textarea { #conversejs .chatbox .sendXMPPMessage .chat-textarea {
color: #666;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;

1604
dist/converse-no-dependencies.js vendored
View File

File diff suppressed because it is too large Load Diff

10
dist/converse.js vendored
View File

@ -69284,9 +69284,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
* that contains the message stanza, if it was * that contains the message stanza, if it was
* contained, otherwise it's the message stanza itself. * contained, otherwise it's the message stanza itself.
*/ */
const _converse = this.__super__._converse, const archive = sizzle(`result[xmlns="${Strophe.NS.MAM}"]`, original_stanza).pop(),
__ = _converse.__,
archive = sizzle(`result[xmlns="${Strophe.NS.MAM}"]`, original_stanza).pop(),
spoiler = sizzle(`spoiler[xmlns="${Strophe.NS.SPOILER}"]`, original_stanza).pop(), spoiler = sizzle(`spoiler[xmlns="${Strophe.NS.SPOILER}"]`, original_stanza).pop(),
delay = sizzle(`delay[xmlns="${Strophe.NS.DELAY}"]`, original_stanza).pop(), delay = sizzle(`delay[xmlns="${Strophe.NS.DELAY}"]`, original_stanza).pop(),
chat_state = stanza.getElementsByTagName(_converse.COMPOSING).length && _converse.COMPOSING || stanza.getElementsByTagName(_converse.PAUSED).length && _converse.PAUSED || stanza.getElementsByTagName(_converse.INACTIVE).length && _converse.INACTIVE || stanza.getElementsByTagName(_converse.ACTIVE).length && _converse.ACTIVE || stanza.getElementsByTagName(_converse.GONE).length && _converse.GONE; chat_state = stanza.getElementsByTagName(_converse.COMPOSING).length && _converse.COMPOSING || stanza.getElementsByTagName(_converse.PAUSED).length && _converse.PAUSED || stanza.getElementsByTagName(_converse.INACTIVE).length && _converse.INACTIVE || stanza.getElementsByTagName(_converse.ACTIVE).length && _converse.ACTIVE || stanza.getElementsByTagName(_converse.GONE).length && _converse.GONE;
@ -70082,7 +70080,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}, },
render() { render() {
this.el.innerHTML = tpl_chatbox_head(_.extend(this.model.toJSON(), this.model.vcard.toJSON(), { this.el.innerHTML = tpl_chatbox_head(_.extend(this.model.vcard.toJSON(), this.model.toJSON(), {
'_converse': _converse, '_converse': _converse,
'info_close': __('Close this chat box') 'info_close': __('Close this chat box')
})); }));
@ -82229,7 +82227,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}, },
getDisplayName() { getDisplayName() {
return this.vcard.get('fullname') || this.get('jid'); return this.get('nickname') || this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('jid');
}, },
getFullname() { getFullname() {
@ -85092,7 +85090,7 @@ __e(o.url) +
'" target="_blank" rel="noopener" class="user">\n '; '" target="_blank" rel="noopener" class="user">\n ';
} ; } ;
__p += '\n ' + __p += '\n ' +
__e( o.fullname || o.jid ) + __e( o.nickname || o.fullname || o.jid ) +
'\n '; '\n ';
if (o.url) { ; if (o.url) { ;
__p += '\n </a>\n '; __p += '\n </a>\n ';