Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
83bc851f
Commit
83bc851f
authored
Jun 26, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1455. Updates #1619
Avatar didn't update a second time due to `canvas` element being expected
parent
b69440f8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
CHANGES.md
CHANGES.md
+1
-0
src/converse-chatboxviews.js
src/converse-chatboxviews.js
+6
-6
No files found.
CHANGES.md
View file @
83bc851f
...
...
@@ -35,6 +35,7 @@
-
#1296:
`embedded`
view mode shows
`chatbox-navback`
arrow in header
-
#1330: Missing room name in MUC invitation popup
-
#1445: Participants list uses big font in embedded mode
-
#1455: Avatar in controlbox status-view not updated
-
#1465: When highlighting a roster contact, they're incorrectly shown as online
-
#1495: Mentions should always include a URI attribute
-
#1502: Fatal error when using prebind
...
...
src/converse-chatboxviews.js
View file @
83bc851f
...
...
@@ -19,20 +19,20 @@ const AvatarMixin = {
renderAvatar
(
el
)
{
el
=
el
||
this
.
el
;
const
canvas_el
=
el
.
querySelector
(
'
canvas
'
);
if
(
_
.
isNull
(
canvas
_el
))
{
const
avatar_el
=
el
.
querySelector
(
'
canvas.avatar, svg.avatar
'
);
if
(
_
.
isNull
(
avatar
_el
))
{
return
;
}
if
(
this
.
model
.
vcard
)
{
const
data
=
{
'
classes
'
:
canvas
_el
.
getAttribute
(
'
class
'
),
'
width
'
:
canvas_el
.
width
,
'
height
'
:
canvas_el
.
height
,
'
classes
'
:
avatar
_el
.
getAttribute
(
'
class
'
),
'
width
'
:
avatar_el
.
getAttribute
(
'
width
'
)
,
'
height
'
:
avatar_el
.
getAttribute
(
'
height
'
)
,
}
const
image_type
=
this
.
model
.
vcard
.
get
(
'
image_type
'
),
image
=
this
.
model
.
vcard
.
get
(
'
image
'
);
data
[
'
image
'
]
=
"
data:
"
+
image_type
+
"
;base64,
"
+
image
;
canvas
_el
.
outerHTML
=
tpl_avatar
(
data
);
avatar
_el
.
outerHTML
=
tpl_avatar
(
data
);
}
},
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment