OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5323 from matrix-org/travis/jitsi-popout-fix 

Don't supply popout widgets with widget parameters
pull/21833/head
Travis Ralston 2020-10-14 16:37:06 -06:00 committed by GitHub
parent ef90562824 3a88b263c8
commit edcdd950f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/stores/widgets/StopGapWidget.ts
View File

@ -161,17 +161,20 @@ export class StopGapWidget extends EventEmitter {
userHttpAvatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(), userHttpAvatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(),
}, opts?.asPopout); }, opts?.asPopout);
// Add in some legacy support sprinkles const parsed = new URL(templated);
// Add in some legacy support sprinkles (for non-popout widgets)
// TODO: Replace these with proper widget params // TODO: Replace these with proper widget params
// See https://github.com/matrix-org/matrix-doc/pull/1958/files#r405714833 // See https://github.com/matrix-org/matrix-doc/pull/1958/files#r405714833
const parsed = new URL(templated); if (!opts?.asPopout) {
parsed.searchParams.set('widgetId', this.mockWidget.id); parsed.searchParams.set('widgetId', this.mockWidget.id);
parsed.searchParams.set('parentUrl', window.location.href.split('#', 2)[0]); parsed.searchParams.set('parentUrl', window.location.href.split('#', 2)[0]);
// Give the widget a scalar token if we're supposed to (more legacy) // Give the widget a scalar token if we're supposed to (more legacy)
// TODO: Stop doing this // TODO: Stop doing this
if (this.scalarToken) { if (this.scalarToken) {
parsed.searchParams.set('scalar_token', this.scalarToken); parsed.searchParams.set('scalar_token', this.scalarToken);
}
} }
// Replace the encoded dollar signs back to dollar signs. They have no special meaning // Replace the encoded dollar signs back to dollar signs. They have no special meaning