PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Make new device toasts appear above review toasts

Browse source 
...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.

Fixes https://github.com/vector-im/riot-web/issues/13442
This commit is contained in:
David Baker 2020-04-29 14:49:30 +01:00
parent eceb8edfbc
commit 1291a63b98
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/DeviceListener.js
View file

@ -267,6 +267,7 @@ export default class DeviceListener {
key: OTHER_DEVICES_TOAST_KEY, key: OTHER_DEVICES_TOAST_KEY,
title: _t("Review where you’re logged in"), title: _t("Review where you’re logged in"),
icon: "verification_warning", icon: "verification_warning",
priority: ToastStore.PRIORITY_LOW,
props: { props: {
deviceIds: oldUnverifiedDeviceIds, deviceIds: oldUnverifiedDeviceIds,
}, },

14
src/stores/ToastStore.js
View file

@ -20,8 +20,9 @@ import EventEmitter from 'events';
* Holds the active toasts * Holds the active toasts
*/ */
export default class ToastStore extends EventEmitter { export default class ToastStore extends EventEmitter {
static PRIORITY_REALTIME = 1; static PRIORITY_REALTIME = 0;
static PRIORITY_DEFAULT = 0; static PRIORITY_DEFAULT = 1;
static PRIORITY_LOW = 2;
static sharedInstance() { static sharedInstance() {
if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore(); if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
@ -43,12 +44,9 @@ export default class ToastStore extends EventEmitter {
const oldIndex = this._toasts.findIndex(t => t.key === newToast.key); const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
if (oldIndex === -1) { if (oldIndex === -1) {
// we only have two priorities so just push realtime ones onto the front let newIndex = this._toasts.length;
if (newToast.priority) { while (newIndex > 0 && this._toasts[newIndex - 1].priority > newToast.priority) --newIndex;
this._toasts.unshift(newToast); this._toasts.splice(newIndex, 0, newToast);
} else {
this._toasts.push(newToast);
}
} else { } else {
this._toasts[oldIndex] = newToast; this._toasts[oldIndex] = newToast;
} }