mirror of
https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git
synced 2025-12-30 03:12:29 +00:00
feat(etherpad) merge query string parameters in etherpad_base with app values
Allows overriding or augmenting the default values set by the Jitsi Meet web app using the config parameter.
This commit is contained in:
committed by
GitHub
parent
1b3b949218
commit
72779e5ba5
@@ -29,7 +29,18 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
|
||||
const etherpadBaseUrl = sanitizeUrl(etherpadBase);
|
||||
|
||||
if (etherpadBaseUrl) {
|
||||
url = new URL(value, etherpadBaseUrl.toString()).toString();
|
||||
const urlObj = new URL(value, etherpadBaseUrl.toString());
|
||||
|
||||
// Merge query string parameters on top of internal ones
|
||||
if (etherpadBaseUrl.search) {
|
||||
const searchParams = new URLSearchParams(urlObj.search);
|
||||
|
||||
for (const [ key, val ] of new URLSearchParams(etherpadBaseUrl.search)) {
|
||||
searchParams.set(key, val);
|
||||
}
|
||||
urlObj.search = searchParams.toString();
|
||||
}
|
||||
url = urlObj.toString();
|
||||
}
|
||||
|
||||
dispatch(setDocumentUrl(url));
|
||||
|
||||
Reference in New Issue
Block a user