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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2018-03-04 07:29:46 +01:00
commit 073c698752
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/converse-chatview.js
View File

@ -249,6 +249,7 @@
render () { render () {
this.el.innerHTML = tpl_chatbox_head( this.el.innerHTML = tpl_chatbox_head(
_.extend(this.model.toJSON(), { _.extend(this.model.toJSON(), {
'_converse': _converse,
'avatar_width': _converse.chatview_avatar_width, 'avatar_width': _converse.chatview_avatar_width,
'avatar_height': _converse.chatview_avatar_height, 'avatar_height': _converse.chatview_avatar_height,
'info_close': __('Close this chat box'), 'info_close': __('Close this chat box'),

7
src/converse-core.js
View File

@ -878,9 +878,10 @@
}, },
initialize (attributes) { initialize (attributes) {
const { jid } = attributes; const { jid } = attributes,
const bare_jid = Strophe.getBareJidFromJid(jid).toLowerCase(); bare_jid = Strophe.getBareJidFromJid(jid).toLowerCase(),
const resource = Strophe.getResourceFromJid(jid); resource = Strophe.getResourceFromJid(jid);
attributes.jid = bare_jid; attributes.jid = bare_jid;
this.set(_.assignIn({ this.set(_.assignIn({
'fullname': bare_jid, 'fullname': bare_jid,

2
src/templates/chatbox_head.html
View File

@ -4,7 +4,7 @@
<img alt="User Avatar" <img alt="User Avatar"
class="avatar" class="avatar"
height="{{{o.avatar_height}}}px" width="{{{o.avatar_width}}}px" height="{{{o.avatar_height}}}px" width="{{{o.avatar_width}}}px"
src="data:{{{o.image_type}}};base64,{{{o.image}}}"/> src="data:{{{o.image_type || o._converse.DEFAULT_IMAGE_TYPE}}};base64,{{{o.image || o._converse.DEFAULT_IMAGE}}}"/>
{[ } ]} {[ } ]}
<div class="chat-title"> <div class="chat-title">
{[ if (o.url) { ]} {[ if (o.url) { ]}