Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-implement set width of main cowebsite

Browse source
This commit is contained in:
Alexis Faizeau 2022-02-07 14:55:51 +01:00
parent 9571a52f1e
commit 60c17ecea2
8 changed files with 81 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
front/src/Phaser/Game/GameMapProperties.ts
View file

@ -20,6 +20,7 @@ export enum GameMapProperties {
OPEN_WEBSITE = "openWebsite",
OPEN_WEBSITE_ALLOW_API = "openWebsiteAllowApi",
OPEN_WEBSITE_POLICY = "openWebsitePolicy",
OPEN_WEBSITE_WIDTH = "openWebsiteWidth",
OPEN_WEBSITE_POSITION = "openWebsitePosition",
OPEN_WEBSITE_TRIGGER = "openWebsiteTrigger",
OPEN_WEBSITE_TRIGGER_MESSAGE = "openWebsiteTriggerMessage",

31
front/src/Phaser/Game/GameMapPropertiesListener.ts
View file

@ -9,7 +9,6 @@ import { get } from "svelte/store";
import { ON_ACTION_TRIGGER_BUTTON, ON_ICON_TRIGGER_BUTTON } from "../../WebRtc/LayoutManager";
import type { ITiledMapLayer } from "../Map/ITiledMap";
import { GameMapProperties } from "./GameMapProperties";
import { highlightedEmbedScreen } from "../../Stores/EmbedScreensStore";
enum OpenCoWebsiteState {
ASLEEP,
@ -66,6 +65,7 @@ export class GameMapPropertiesListener {
let openWebsiteProperty: string | undefined;
let allowApiProperty: boolean | undefined;
let websitePolicyProperty: string | undefined;
let websiteWidthProperty: number | undefined;
let websitePositionProperty: number | undefined;
let websiteTriggerProperty: string | undefined;
let websiteTriggerMessageProperty: string | undefined;
@ -81,6 +81,9 @@ export class GameMapPropertiesListener {
case GameMapProperties.OPEN_WEBSITE_POLICY:
websitePolicyProperty = property.value as string | undefined;
break;
case GameMapProperties.OPEN_WEBSITE_WIDTH:
websiteWidthProperty = property.value as number | undefined;
break;
case GameMapProperties.OPEN_WEBSITE_POSITION:
websitePositionProperty = property.value as number | undefined;
break;
@ -135,17 +138,13 @@ export class GameMapPropertiesListener {
layoutManagerActionStore.removeAction(actionId);
};
const openCoWebsiteFunction = (
url: string | undefined,
allowApi: boolean | undefined,
policy: string | undefined,
position: number | undefined
) => {
const openCoWebsiteFunction = () => {
const coWebsite = coWebsiteManager.addCoWebsite(
url ?? "",
openWebsiteProperty ?? "",
this.scene.MapUrlFile,
allowApiProperty,
websitePolicyProperty,
websiteWidthProperty,
websitePositionProperty,
false
);
@ -167,13 +166,7 @@ export class GameMapPropertiesListener {
uuid: actionId,
type: "message",
message: websiteTriggerMessageProperty,
callback: () =>
openCoWebsiteFunction(
openWebsiteProperty,
allowApiProperty,
websitePolicyProperty,
websitePositionProperty
),
callback: () => openCoWebsiteFunction(),
userInputManager: this.scene.userInputManager,
});
} else if (!websiteTriggerProperty || websiteTriggerProperty === ON_ICON_TRIGGER_BUTTON) {
@ -182,6 +175,7 @@ export class GameMapPropertiesListener {
this.scene.MapUrlFile,
allowApiProperty,
websitePolicyProperty,
websiteWidthProperty,
websitePositionProperty,
false
);
@ -194,12 +188,7 @@ export class GameMapPropertiesListener {
}
if (!websiteTriggerProperty) {
openCoWebsiteFunction(
openWebsiteProperty,
allowApiProperty,
websitePolicyProperty,
websitePositionProperty
);
openCoWebsiteFunction();
}
});
};

1
front/src/Phaser/Game/GameScene.ts
View file

@ -1265,6 +1265,7 @@ ${escapedMessage}
iframeListener.getBaseUrlFromSource(source),
openCoWebsite.allowApi,
openCoWebsite.allowPolicy,
openCoWebsite.widthPercent,
openCoWebsite.position,
openCoWebsite.closable ?? true
);