Matrix-Mirrors/matrix-dimension
1
0
Fork 0
mirror of https://github.com/turt2live/matrix-dimension.git synced 2024-10-01 01:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

prefix etherpad name with roomID

Browse Source
This commit is contained in:
MTRNord 2017-11-18 22:23:43 +00:00
parent 43e16f047b
commit e9f6543d2e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app/configs/widget/etherpad/etherpad-config.component.ts
View File

@ -38,18 +38,18 @@ export class EtherpadWidgetConfigComponent extends WidgetComponent implements Mo
getPadURL(widget?: Widget): string { getPadURL(widget?: Widget): string {
if (widget) { if (widget) {
if (this.editUseCustomServer) { if (this.editUseCustomServer) {
const url = widget.data.newPadServer + widget.data.newPadName; const url = widget.data.newPadServer + this.roomId + "_" + widget.data.newPadName;
return url; return url;
} else { } else {
const url = "https://demo.riot.im/etherpad/p/" + widget.data.newPadName; const url = "https://demo.riot.im/etherpad/p/" + this.roomId + "_" + widget.data.newPadName;
return url; return url;
} }
} else { } else {
if (this.useCustomServer) { if (this.useCustomServer) {
const url = this.newEtherpadServerUrl + this.newWidgetUrl; const url = this.newEtherpadServerUrl + this.roomId + "_" + this.newWidgetUrl;
return url; return url;
} else { } else {
const url = "https://demo.riot.im/etherpad/p/" + this.newWidgetUrl; const url = "https://demo.riot.im/etherpad/p/" + this.roomId + "_" + this.newWidgetUrl;
return url; return url;
} }
} }
@ -83,7 +83,7 @@ export class EtherpadWidgetConfigComponent extends WidgetComponent implements Mo
return; return;
} }
const originalUrl = this.newWidgetUrl; const originalUrl = this.roomId + "_" + this.newWidgetUrl;
this.newWidgetUrl = url; this.newWidgetUrl = url;
if (this.useCustomServer) { if (this.useCustomServer) {
@ -105,6 +105,7 @@ export class EtherpadWidgetConfigComponent extends WidgetComponent implements Mo
widget.newUrl = url; widget.newUrl = url;
widget.data.padName = widget.data.newPadName; widget.data.padName = widget.data.newPadName;
widget.data.padSuffix = this.roomId + "_" + widget.data.newPadName;
if (this.editUseCustomServer) { if (this.editUseCustomServer) {
widget.data.padServer = widget.data.newPadServer; widget.data.padServer = widget.data.newPadServer;
} else { } else {