stryan/matrix.to
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

also include preference homeservers in server dialog

Browse Source
This commit is contained in:
Bruno Windels 2020-12-07 18:24:10 +01:00
parent cc643257a9
commit 7782a9d197
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/open/OpenLinkViewModel.js
View File

@ -20,6 +20,7 @@ import {ClientViewModel} from "./ClientViewModel.js";
import {PreviewViewModel} from "../preview/PreviewViewModel.js"; import {PreviewViewModel} from "../preview/PreviewViewModel.js";
import {ServerConsentViewModel} from "./ServerConsentViewModel.js"; import {ServerConsentViewModel} from "./ServerConsentViewModel.js";
import {getLabelForLinkKind} from "../Link.js"; import {getLabelForLinkKind} from "../Link.js";
import {orderedUnique} from "../utils/unique.js";
export class OpenLinkViewModel extends ViewModel { export class OpenLinkViewModel extends ViewModel {
constructor(options) { constructor(options) {
@ -39,8 +40,14 @@ export class OpenLinkViewModel extends ViewModel {
} }
_showServerConsent() { _showServerConsent() {
let servers = [];
if (this.preferences.homeservers) {
servers.push(...this.preferences.homeservers);
}
servers.push(...this._link.servers);
servers = orderedUnique(servers);
this.serverConsentViewModel = new ServerConsentViewModel(this.childOptions({ this.serverConsentViewModel = new ServerConsentViewModel(this.childOptions({
servers: this._link.servers, servers,
done: () => { done: () => {
this.serverConsentViewModel = null; this.serverConsentViewModel = null;
this._showLink(); this._showLink();