_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge develop

Browse Source
This commit is contained in:
_Bastler 2021-04-13 15:40:02 +02:00
commit df29fa4d96
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
front/dist/resources/style/cowebsite.scss vendored
View File

@ -88,21 +88,26 @@
} }
} }
@media (max-aspect-ratio: 1/1) { @media (max-aspect-ratio: 1/1) {
#main-container {
display: flex;
flex-direction: column-reverse;
}
#cowebsite { #cowebsite {
left: 0; left: 0;
bottom: 0; top: 0;
width: 100%; width: 100%;
height: 50%; height: 50%;
display: flex; display: flex;
flex-direction: column; flex-direction: column-reverse;
&.loading { &.loading {
transform: translateY(90%); transform: translateY(-90%);
} }
&.hidden { &.hidden {
transform: translateY(100%); transform: translateY(-100%);
} }
main { main {

2
front/src/Connexion/LocalUser.ts
View File

@ -14,7 +14,7 @@ export function isUserNameValid(value: string): boolean {
return regexp.test(value); return regexp.test(value);
} }
export function areCharacterLayersValid(value: string[]): boolean { export function areCharacterLayersValid(value: string[] | null): boolean {
if (!value || !value.length) return false; if (!value || !value.length) return false;
for (let i = 0; i < value.length; i++) { for (let i = 0; i < value.length; i++) {
if (/^\w+$/.exec(value[i]) === null) { if (/^\w+$/.exec(value[i]) === null) {

4
front/src/WebRtc/CoWebsiteManager.ts
View File

@ -32,7 +32,7 @@ class CoWebsiteManager {
private resizing: boolean = false; private resizing: boolean = false;
private cowebsiteMainDom: HTMLDivElement; private cowebsiteMainDom: HTMLDivElement;
private cowebsiteAsideDom: HTMLDivElement; private cowebsiteAsideDom: HTMLDivElement;
get width(): number { get width(): number {
return this.cowebsiteDiv.clientWidth; return this.cowebsiteDiv.clientWidth;
} }
@ -74,7 +74,7 @@ class CoWebsiteManager {
private initResizeListeners() { private initResizeListeners() {
const movecallback = (event:MouseEvent) => { const movecallback = (event:MouseEvent) => {
this.verticalMode ? this.height -= event.movementY / this.getDevicePixelRatio() : this.width -= event.movementX / this.getDevicePixelRatio(); this.verticalMode ? this.height += event.movementY / this.getDevicePixelRatio() : this.width -= event.movementX / this.getDevicePixelRatio();
this.fire(); this.fire();
} }