Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
This commit is contained in:
@@ -13,6 +13,8 @@ In order to create Jitsi meet zones:
|
|||||||
* In layer properties, you MUST add a "`jitsiRoom`" property (of type "`string`"). The value of the property is the name of the room in Jitsi. Note: the name of the room will be "slugified" and prepended with the name of the instance of the map (so that different instances of the map have different rooms)
|
* In layer properties, you MUST add a "`jitsiRoom`" property (of type "`string`"). The value of the property is the name of the room in Jitsi. Note: the name of the room will be "slugified" and prepended with the name of the instance of the map (so that different instances of the map have different rooms)
|
||||||
* You may also use "jitsiWidth" property (of type "number" between 0 and 100) to control the width of the iframe containing the meeting room.
|
* You may also use "jitsiWidth" property (of type "number" between 0 and 100) to control the width of the iframe containing the meeting room.
|
||||||
|
|
||||||
|
You can have this layer (i.e. your meeting area) to be selectable as the precise location for your meeting using the [Google Calendar integration for Work Adventure](/integrations/google-calendar). To do so, you must set the `meetingRoomLabel` property. You can provide any name that you would like your meeting room to have (as a string).
|
||||||
|
|
||||||
## Triggering of the "Jitsi meet" action
|
## Triggering of the "Jitsi meet" action
|
||||||
|
|
||||||
By default, Jitsi meet will open when a user enters the zone defined on the map.
|
By default, Jitsi meet will open when a user enters the zone defined on the map.
|
||||||
|
|||||||
@@ -1644,6 +1644,8 @@ export class GameScene extends DirtyScene {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((reason) => console.warn(reason));
|
.catch((reason) => console.warn(reason));
|
||||||
|
|
||||||
|
urlManager.clearHashParameter();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn(`Cannot proceed with moveTo command:\n\t-> ${err}`);
|
console.warn(`Cannot proceed with moveTo command:\n\t-> ${err}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,10 @@ class UrlManager {
|
|||||||
return this.getHashParameters()[name];
|
return this.getHashParameters()[name];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public clearHashParameter(): void {
|
||||||
|
window.location.hash = "";
|
||||||
|
}
|
||||||
|
|
||||||
private getHashParameters(): Record<string, string> {
|
private getHashParameters(): Record<string, string> {
|
||||||
return window.location.hash
|
return window.location.hash
|
||||||
.substring(1)
|
.substring(1)
|
||||||
|
|||||||
+1
-6
@@ -475,12 +475,7 @@ ansi-escapes@^4.3.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
type-fest "^0.21.3"
|
type-fest "^0.21.3"
|
||||||
|
|
||||||
ansi-regex@^5.0.0:
|
ansi-regex@^5.0.0, ansi-regex@^5.0.1:
|
||||||
version "5.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
|
|
||||||
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
|
|
||||||
|
|
||||||
ansi-regex@^5.0.1:
|
|
||||||
version "5.0.1"
|
version "5.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
|
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
|
||||||
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
|
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
|
||||||
|
|||||||
Reference in New Issue
Block a user