mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 19:45:05 +01:00
Code Issues Projects Releases Wiki Activity

Revert commits

Browse Source 
This reverts commit 5f1346568d.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
RMidhunSuresh 2021-06-30 23:27:46 +05:30
parent b42f7e1a36
commit bcaf84e545
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/platform/web/ui/avatar.js
View File

@ -44,11 +44,6 @@ export class AvatarView extends BaseUpdateView {
return false; return false;
} }
_setAvatarError() {
this._avatarError = true;
this.update(this.value);
}
_avatarTitleChanged() { _avatarTitleChanged() {
if (this.value.avatarTitle !== this._avatarTitle) { if (this.value.avatarTitle !== this._avatarTitle) {
this._avatarTitle = this.value.avatarTitle; this._avatarTitle = this.value.avatarTitle;
@ -57,17 +52,6 @@ export class AvatarView extends BaseUpdateView {
return false; return false;
} }
_addListenersToAvatar(image) {
const imageEventHandler = (e) => {
if(e.type === "error") { this._setAvatarError(); }
const image = e.target;
image.removeEventListener("error", imageEventHandler);
image.removeEventListener("load", imageEventHandler);
};
image?.addEventListener("error", imageEventHandler);
image?.addEventListener("load", imageEventHandler);
}
_avatarLetterChanged() { _avatarLetterChanged() {
if (this.value.avatarLetter !== this._avatarLetter) { if (this.value.avatarLetter !== this._avatarLetter) {
this._avatarLetter = this.value.avatarLetter; this._avatarLetter = this.value.avatarLetter;
@ -81,8 +65,6 @@ export class AvatarView extends BaseUpdateView {
this._avatarLetterChanged(); this._avatarLetterChanged();
this._avatarTitleChanged(); this._avatarTitleChanged();
this._root = renderStaticAvatar(this.value, this._size); this._root = renderStaticAvatar(this.value, this._size);
const image = this._root.firstChild;
this._addListenersToAvatar(image);
// takes care of update being called when needed // takes care of update being called when needed
super.mount(options); super.mount(options);
return this._root; return this._root;
@ -94,10 +76,10 @@ export class AvatarView extends BaseUpdateView {
update(vm) { update(vm) {
// important to always call _...changed for every prop // important to always call _...changed for every prop
if (this._avatarUrlChanged() || this._avatarError) { if (this._avatarUrlChanged()) {
// avatarColorNumber won't change, it's based on room/user id // avatarColorNumber won't change, it's based on room/user id
const bgColorClass = `usercolor${vm.avatarColorNumber}`; const bgColorClass = `usercolor${vm.avatarColorNumber}`;
if (vm.avatarUrl(this._size) && !this._avatarError) { if (vm.avatarUrl(this._size)) {
this._root.replaceChild(renderImg(vm, this._size), this._root.firstChild); this._root.replaceChild(renderImg(vm, this._size), this._root.firstChild);
this._root.classList.remove(bgColorClass); this._root.classList.remove(bgColorClass);
} else { } else {
@ -105,7 +87,7 @@ export class AvatarView extends BaseUpdateView {
this._root.classList.add(bgColorClass); this._root.classList.add(bgColorClass);
} }
} }
const hasAvatar = !!(vm.avatarUrl(this._size) && !vm._avatarError); const hasAvatar = !!vm.avatarUrl(this._size);
if (this._avatarTitleChanged() && hasAvatar) { if (this._avatarTitleChanged() && hasAvatar) {
const img = this._root.firstChild; const img = this._root.firstChild;
img.setAttribute("title", vm.avatarTitle); img.setAttribute("title", vm.avatarTitle);
@ -113,7 +95,6 @@ export class AvatarView extends BaseUpdateView {
if (this._avatarLetterChanged() && !hasAvatar) { if (this._avatarLetterChanged() && !hasAvatar) {
this._root.firstChild.textContent = vm.avatarLetter; this._root.firstChild.textContent = vm.avatarLetter;
} }
if (this._avatarError) { this._avatarError = false;}
} }
} }
@ -123,7 +104,7 @@ export class AvatarView extends BaseUpdateView {
* @return {Element} * @return {Element}
*/ */
export function renderStaticAvatar(vm, size, extraClasses = undefined) { export function renderStaticAvatar(vm, size, extraClasses = undefined) {
const hasAvatar = !!(vm.avatarUrl(size) && !vm.avatarError); const hasAvatar = !!vm.avatarUrl(size);
let avatarClasses = classNames({ let avatarClasses = classNames({
avatar: true, avatar: true,
[`size-${size}`]: true, [`size-${size}`]: true,