Merge branch 'develop' of github.com:thecodingmachine/workadventure
This commit is contained in:
@@ -66,6 +66,7 @@ services:
|
|||||||
API_URL: back:50051
|
API_URL: back:50051
|
||||||
JITSI_URL: $JITSI_URL
|
JITSI_URL: $JITSI_URL
|
||||||
JITSI_ISS: $JITSI_ISS
|
JITSI_ISS: $JITSI_ISS
|
||||||
|
FRONT_URL: https://play.${DOMAIN}
|
||||||
labels:
|
labels:
|
||||||
- "traefik.http.routers.pusher.rule=Host(`pusher.${DOMAIN}`)"
|
- "traefik.http.routers.pusher.rule=Host(`pusher.${DOMAIN}`)"
|
||||||
- "traefik.http.routers.pusher.entryPoints=web,traefik"
|
- "traefik.http.routers.pusher.entryPoints=web,traefik"
|
||||||
|
|||||||
+4
-1
@@ -101,7 +101,10 @@
|
|||||||
"host": {
|
"host": {
|
||||||
"url": "maps-"+url
|
"url": "maps-"+url
|
||||||
},
|
},
|
||||||
"ports": [80]
|
"ports": [80],
|
||||||
|
"env": {
|
||||||
|
"FRONT_URL": "https://play-"+url
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"redis": {
|
"redis": {
|
||||||
"image": "redis:6",
|
"image": "redis:6",
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ services:
|
|||||||
NODE_ENV: development
|
NODE_ENV: development
|
||||||
PUSHER_URL: /pusher
|
PUSHER_URL: /pusher
|
||||||
UPLOADER_URL: /uploader
|
UPLOADER_URL: /uploader
|
||||||
ADMIN_URL: /admin
|
#ADMIN_URL: /admin
|
||||||
MAPS_URL: /maps
|
MAPS_URL: /maps
|
||||||
ICON_URL: /icon
|
ICON_URL: /icon
|
||||||
STARTUP_COMMAND_1: ./templater.sh
|
STARTUP_COMMAND_1: ./templater.sh
|
||||||
@@ -92,11 +92,12 @@ services:
|
|||||||
- "traefik.http.routers.pusher-ssl.service=pusher"
|
- "traefik.http.routers.pusher-ssl.service=pusher"
|
||||||
|
|
||||||
maps:
|
maps:
|
||||||
image: thecodingmachine/nodejs:12-apache
|
image: thecodingmachine/php:8.1-v4-apache-node12
|
||||||
environment:
|
environment:
|
||||||
DEBUG_MODE: "$DEBUG_MODE"
|
DEBUG_MODE: "$DEBUG_MODE"
|
||||||
HOST: "0.0.0.0"
|
HOST: "0.0.0.0"
|
||||||
NODE_ENV: development
|
NODE_ENV: development
|
||||||
|
FRONT_URL: http://play.workadventure.localhost
|
||||||
#APACHE_DOCUMENT_ROOT: dist/
|
#APACHE_DOCUMENT_ROOT: dist/
|
||||||
#APACHE_EXTENSIONS: headers
|
#APACHE_EXTENSIONS: headers
|
||||||
#APACHE_EXTENSION_HEADERS: 1
|
#APACHE_EXTENSION_HEADERS: 1
|
||||||
|
|||||||
+3
-2
@@ -34,7 +34,7 @@ services:
|
|||||||
NODE_ENV: development
|
NODE_ENV: development
|
||||||
PUSHER_URL: //pusher.workadventure.localhost
|
PUSHER_URL: //pusher.workadventure.localhost
|
||||||
UPLOADER_URL: //uploader.workadventure.localhost
|
UPLOADER_URL: //uploader.workadventure.localhost
|
||||||
ADMIN_URL: //workadventure.localhost
|
#ADMIN_URL: //workadventure.localhost
|
||||||
ICON_URL: //icon.workadventure.localhost
|
ICON_URL: //icon.workadventure.localhost
|
||||||
STARTUP_COMMAND_1: ./templater.sh
|
STARTUP_COMMAND_1: ./templater.sh
|
||||||
STARTUP_COMMAND_2: yarn install
|
STARTUP_COMMAND_2: yarn install
|
||||||
@@ -96,11 +96,12 @@ services:
|
|||||||
- "traefik.http.routers.pusher-ssl.service=pusher"
|
- "traefik.http.routers.pusher-ssl.service=pusher"
|
||||||
|
|
||||||
maps:
|
maps:
|
||||||
image: thecodingmachine/nodejs:12-apache
|
image: thecodingmachine/php:8.1-v4-apache-node12
|
||||||
environment:
|
environment:
|
||||||
DEBUG_MODE: "$DEBUG_MODE"
|
DEBUG_MODE: "$DEBUG_MODE"
|
||||||
HOST: "0.0.0.0"
|
HOST: "0.0.0.0"
|
||||||
NODE_ENV: development
|
NODE_ENV: development
|
||||||
|
FRONT_URL: http://play.workadventure.localhost
|
||||||
#APACHE_DOCUMENT_ROOT: dist/
|
#APACHE_DOCUMENT_ROOT: dist/
|
||||||
#APACHE_EXTENSIONS: headers
|
#APACHE_EXTENSIONS: headers
|
||||||
#APACHE_EXTENSION_HEADERS: 1
|
#APACHE_EXTENSION_HEADERS: 1
|
||||||
|
|||||||
@@ -164,12 +164,13 @@ class ConnectionManager {
|
|||||||
console.error(err);
|
console.error(err);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
const query = urlParams.toString();
|
||||||
roomPath =
|
roomPath =
|
||||||
window.location.protocol +
|
window.location.protocol +
|
||||||
"//" +
|
"//" +
|
||||||
window.location.host +
|
window.location.host +
|
||||||
window.location.pathname +
|
window.location.pathname +
|
||||||
urlParams.toString() + //use urlParams because the token param must be deleted
|
(query ? "?" + query : "") + //use urlParams because the token param must be deleted
|
||||||
window.location.hash;
|
window.location.hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const cowebsiteContainerDomId = "cowebsite-container"; // the id of the whole co
|
|||||||
const cowebsiteMainDomId = "cowebsite-slot-0"; // the id of the parent div of the iframe.
|
const cowebsiteMainDomId = "cowebsite-slot-0"; // the id of the parent div of the iframe.
|
||||||
const cowebsiteBufferDomId = "cowebsite-buffer"; // the id of the container who contains cowebsite iframes.
|
const cowebsiteBufferDomId = "cowebsite-buffer"; // the id of the container who contains cowebsite iframes.
|
||||||
const cowebsiteAsideDomId = "cowebsite-aside"; // the id of the parent div of the iframe.
|
const cowebsiteAsideDomId = "cowebsite-aside"; // the id of the parent div of the iframe.
|
||||||
|
const cowebsiteAsideHolderDomId = "cowebsite-aside-holder";
|
||||||
const cowebsiteSubIconsDomId = "cowebsite-sub-icons";
|
const cowebsiteSubIconsDomId = "cowebsite-sub-icons";
|
||||||
export const cowebsiteCloseButtonId = "cowebsite-close";
|
export const cowebsiteCloseButtonId = "cowebsite-close";
|
||||||
const cowebsiteFullScreenButtonId = "cowebsite-fullscreen";
|
const cowebsiteFullScreenButtonId = "cowebsite-fullscreen";
|
||||||
@@ -60,6 +61,7 @@ class CoWebsiteManager {
|
|||||||
private cowebsiteMainDom: HTMLDivElement;
|
private cowebsiteMainDom: HTMLDivElement;
|
||||||
private cowebsiteBufferDom: HTMLDivElement;
|
private cowebsiteBufferDom: HTMLDivElement;
|
||||||
private cowebsiteAsideDom: HTMLDivElement;
|
private cowebsiteAsideDom: HTMLDivElement;
|
||||||
|
private cowebsiteAsideHolderDom: HTMLDivElement;
|
||||||
private cowebsiteSubIconsDom: HTMLDivElement;
|
private cowebsiteSubIconsDom: HTMLDivElement;
|
||||||
private previousTouchMoveCoordinates: TouchMoveCoordinates | null = null; //only use on touchscreens to track touch movement
|
private previousTouchMoveCoordinates: TouchMoveCoordinates | null = null; //only use on touchscreens to track touch movement
|
||||||
|
|
||||||
@@ -105,6 +107,7 @@ class CoWebsiteManager {
|
|||||||
this.cowebsiteMainDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteMainDomId);
|
this.cowebsiteMainDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteMainDomId);
|
||||||
this.cowebsiteBufferDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteBufferDomId);
|
this.cowebsiteBufferDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteBufferDomId);
|
||||||
this.cowebsiteAsideDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteAsideDomId);
|
this.cowebsiteAsideDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteAsideDomId);
|
||||||
|
this.cowebsiteAsideHolderDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteAsideHolderDomId);
|
||||||
this.cowebsiteSubIconsDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteSubIconsDomId);
|
this.cowebsiteSubIconsDom = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(cowebsiteSubIconsDomId);
|
||||||
this.initResizeListeners();
|
this.initResizeListeners();
|
||||||
|
|
||||||
@@ -194,21 +197,23 @@ class CoWebsiteManager {
|
|||||||
this.fire();
|
this.fire();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.cowebsiteAsideDom.addEventListener("mousedown", (event) => {
|
this.cowebsiteAsideHolderDom.addEventListener("mousedown", (event) => {
|
||||||
|
if (this.isFullScreen) return;
|
||||||
this.cowebsiteMainDom.style.display = "none";
|
this.cowebsiteMainDom.style.display = "none";
|
||||||
this.resizing = true;
|
this.resizing = true;
|
||||||
document.addEventListener("mousemove", movecallback);
|
document.addEventListener("mousemove", movecallback);
|
||||||
});
|
});
|
||||||
|
|
||||||
document.addEventListener("mouseup", (event) => {
|
document.addEventListener("mouseup", (event) => {
|
||||||
if (!this.resizing) return;
|
if (!this.resizing || this.isFullScreen) return;
|
||||||
document.removeEventListener("mousemove", movecallback);
|
document.removeEventListener("mousemove", movecallback);
|
||||||
this.cowebsiteMainDom.style.display = "block";
|
this.cowebsiteMainDom.style.display = "block";
|
||||||
this.resizing = false;
|
this.resizing = false;
|
||||||
this.cowebsiteMainDom.style.display = "flex";
|
this.cowebsiteMainDom.style.display = "flex";
|
||||||
});
|
});
|
||||||
|
|
||||||
this.cowebsiteAsideDom.addEventListener("touchstart", (event) => {
|
this.cowebsiteAsideHolderDom.addEventListener("touchstart", (event) => {
|
||||||
|
if (this.isFullScreen) return;
|
||||||
this.cowebsiteMainDom.style.display = "none";
|
this.cowebsiteMainDom.style.display = "none";
|
||||||
this.resizing = true;
|
this.resizing = true;
|
||||||
const touchEvent = event.touches[0];
|
const touchEvent = event.touches[0];
|
||||||
@@ -217,7 +222,7 @@ class CoWebsiteManager {
|
|||||||
});
|
});
|
||||||
|
|
||||||
document.addEventListener("touchend", (event) => {
|
document.addEventListener("touchend", (event) => {
|
||||||
if (!this.resizing) return;
|
if (!this.resizing || this.isFullScreen) return;
|
||||||
this.previousTouchMoveCoordinates = null;
|
this.previousTouchMoveCoordinates = null;
|
||||||
document.removeEventListener("touchmove", movecallback);
|
document.removeEventListener("touchmove", movecallback);
|
||||||
this.cowebsiteMainDom.style.display = "block";
|
this.cowebsiteMainDom.style.display = "block";
|
||||||
@@ -642,17 +647,22 @@ class CoWebsiteManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fullscreen(): void {
|
private fullscreen(): void {
|
||||||
|
const openFullscreenImage = HtmlUtils.getElementByIdOrFail(cowebsiteOpenFullScreenImageId);
|
||||||
|
const closeFullScreenImage = HtmlUtils.getElementByIdOrFail(cowebsiteCloseFullScreenImageId);
|
||||||
|
|
||||||
if (this.isFullScreen) {
|
if (this.isFullScreen) {
|
||||||
this.resetStyleMain();
|
this.resetStyleMain();
|
||||||
this.fire();
|
this.fire();
|
||||||
//we don't trigger a resize of the phaser game since it won't be visible anyway.
|
//we don't trigger a resize of the phaser game since it won't be visible anyway.
|
||||||
HtmlUtils.getElementByIdOrFail(cowebsiteOpenFullScreenImageId).style.display = "inline";
|
this.cowebsiteAsideHolderDom.style.visibility = "visible";
|
||||||
HtmlUtils.getElementByIdOrFail(cowebsiteCloseFullScreenImageId).style.display = "none";
|
openFullscreenImage.style.display = "inline";
|
||||||
|
closeFullScreenImage.style.display = "none";
|
||||||
} else {
|
} else {
|
||||||
this.verticalMode ? (this.height = window.innerHeight) : (this.width = window.innerWidth);
|
this.verticalMode ? (this.height = window.innerHeight) : (this.width = window.innerWidth);
|
||||||
//we don't trigger a resize of the phaser game since it won't be visible anyway.
|
//we don't trigger a resize of the phaser game since it won't be visible anyway.
|
||||||
HtmlUtils.getElementByIdOrFail(cowebsiteOpenFullScreenImageId).style.display = "none";
|
this.cowebsiteAsideHolderDom.style.visibility = "hidden";
|
||||||
HtmlUtils.getElementByIdOrFail(cowebsiteCloseFullScreenImageId).style.display = "inline";
|
openFullscreenImage.style.display = "none";
|
||||||
|
closeFullScreenImage.style.display = "inline";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
#cowebsite-aside-holder {
|
#cowebsite-aside-holder {
|
||||||
pointer-events: none;
|
background: gray;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -38,6 +38,7 @@
|
|||||||
|
|
||||||
img {
|
img {
|
||||||
width: 80%;
|
width: 80%;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,12 +207,14 @@
|
|||||||
|
|
||||||
aside {
|
aside {
|
||||||
width: 30px;
|
width: 30px;
|
||||||
cursor: ew-resize;
|
|
||||||
|
|
||||||
img {
|
img {
|
||||||
cursor: ew-resize;
|
|
||||||
transform: rotate(90deg);
|
transform: rotate(90deg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&-aside-holder {
|
||||||
|
cursor: ew-resize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ module.exports = {
|
|||||||
DISABLE_NOTIFICATIONS: false,
|
DISABLE_NOTIFICATIONS: false,
|
||||||
PUSHER_URL: undefined,
|
PUSHER_URL: undefined,
|
||||||
UPLOADER_URL: null,
|
UPLOADER_URL: null,
|
||||||
ADMIN_URL: undefined,
|
ADMIN_URL: null,
|
||||||
CONTACT_URL: null,
|
CONTACT_URL: null,
|
||||||
PROFILE_URL: null,
|
PROFILE_URL: null,
|
||||||
ICON_URL: null,
|
ICON_URL: null,
|
||||||
|
|||||||
+3
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM thecodingmachine/nodejs:12-apache
|
FROM thecodingmachine/php:8.1-v4-apache-node12
|
||||||
|
|
||||||
COPY --chown=docker:docker . .
|
COPY --chown=docker:docker . .
|
||||||
#RUN yarn install
|
#RUN yarn install
|
||||||
@@ -6,4 +6,5 @@ COPY --chown=docker:docker . .
|
|||||||
#ENV NODE_ENV=production
|
#ENV NODE_ENV=production
|
||||||
#ENV STARTUP_COMMAND_1="yarn run build"
|
#ENV STARTUP_COMMAND_1="yarn run build"
|
||||||
#ENV APACHE_DOCUMENT_ROOT=dist/
|
#ENV APACHE_DOCUMENT_ROOT=dist/
|
||||||
RUN sudo a2enmod headers
|
#RUN sudo a2enmod headers
|
||||||
|
ENV APACHE_EXTENSION_HEADERS=1
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"website_in_map_script.html"
|
"value":"website_in_map_script.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
"width":30,
|
"width":30,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":30,
|
"height":30,
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
"width":30,
|
"width":30,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"draworder":"topdown",
|
"draworder":"topdown",
|
||||||
"id":3,
|
"id":3,
|
||||||
@@ -90,4 +90,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":1.5,
|
"version":1.5,
|
||||||
"width":30
|
"width":30
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-5
@@ -1,12 +1,8 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
window.addEventListener('load', () => {
|
||||||
console.log('On load');
|
console.log('On load');
|
||||||
WA.onInit().then(() => {
|
WA.onInit().then(() => {
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<script>
|
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
|
||||||
WA.chat.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>Website opened by script.</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1 +1 @@
|
|||||||
WA.nav.openCoWebSite("cowebsiteAllowApi.html", true, "");
|
WA.nav.openCoWebSite("cowebsiteAllowApi.php", true, "");
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
|
<script>
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
WA.chat.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p>Website opened by script.</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>API in iframe menu</title>
|
|
||||||
<script>
|
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
|
||||||
WA.chat.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body style="text-align: center">
|
|
||||||
<p style="color: whitesmoke">This is an iframe in a custom menu.</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>API in iframe menu</title>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
|
<script>
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
WA.chat.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body style="text-align: center">
|
||||||
|
<p style="color: whitesmoke">This is an iframe in a custom menu.</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<script>
|
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
|
||||||
WA.ui.registerMenuCommand('test', 'customIframeMenu.html', {autoClose: true});
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>Add a custom menu</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -7,9 +7,9 @@ WA.ui.registerMenuCommand('custom callback menu', () => {
|
|||||||
WA.ui.registerMenuCommand('custom iframe menu', {iframe: 'customIframeMenu.html'});
|
WA.ui.registerMenuCommand('custom iframe menu', {iframe: 'customIframeMenu.html'});
|
||||||
|
|
||||||
WA.room.onEnterZone('iframeMenu', () => {
|
WA.room.onEnterZone('iframeMenu', () => {
|
||||||
menuIframeApi = WA.ui.registerMenuCommand('IFRAME USE API', {iframe: 'customIframeMenuApi.html', allowApi: true});
|
menuIframeApi = WA.ui.registerMenuCommand('IFRAME USE API', {iframe: 'customIframeMenuApi.php', allowApi: true});
|
||||||
})
|
})
|
||||||
|
|
||||||
WA.room.onLeaveZone('iframeMenu', () => {
|
WA.room.onLeaveZone('iframeMenu', () => {
|
||||||
menuIframeApi.remove();
|
menuIframeApi.remove();
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"customMenu.html"
|
"value":"customMenu.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
@@ -97,4 +97,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":"1.6",
|
"version":"1.6",
|
||||||
"width":10
|
"width":10
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
|
<script>
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
WA.ui.registerMenuCommand('test', 'customIframeMenu.html', {autoClose: true});
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p>Add a custom menu</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<script>
|
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
|
||||||
WA.player.onPlayerMove(console.log);
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>Log in the console the movement of the current player in the zone of the iframe</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
|
"data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -36,8 +36,8 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"playerMove.html"
|
"value":"playerMove.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"draworder":"topdown",
|
"draworder":"topdown",
|
||||||
"id":5,
|
"id":5,
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":1,
|
"id":1,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":2,
|
"id":2,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":3,
|
"id":3,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -132,7 +132,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":4,
|
"id":4,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -141,7 +141,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":8,
|
"id":8,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -150,7 +150,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":9,
|
"id":9,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -159,7 +159,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":10,
|
"id":10,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":11,
|
"id":11,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -177,7 +177,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":12,
|
"id":12,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -186,7 +186,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":16,
|
"id":16,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -195,7 +195,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":17,
|
"id":17,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -204,7 +204,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":18,
|
"id":18,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -213,7 +213,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":19,
|
"id":19,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -222,7 +222,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":20,
|
"id":20,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -233,7 +233,7 @@
|
|||||||
}]
|
}]
|
||||||
}],
|
}],
|
||||||
"tilewidth":32
|
"tilewidth":32
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"columns":8,
|
"columns":8,
|
||||||
"firstgid":65,
|
"firstgid":65,
|
||||||
@@ -251,4 +251,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":1.4,
|
"version":1.4,
|
||||||
"width":10
|
"width":10
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
|
<script>
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
WA.player.onPlayerMove(console.log);
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p>Log in the console the movement of the current player in the zone of the iframe</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
|
"data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -36,8 +36,8 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"setProperty.html"
|
"value":"setProperty.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 101, 101, 101, 101, 0, 0, 0, 0, 0, 101, 101, 101, 101, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 101, 101, 101, 101, 0, 0, 0, 0, 0, 101, 101, 101, 101, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"draworder":"topdown",
|
"draworder":"topdown",
|
||||||
"id":5,
|
"id":5,
|
||||||
@@ -117,7 +117,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":1,
|
"id":1,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":2,
|
"id":2,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":3,
|
"id":3,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -144,7 +144,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":4,
|
"id":4,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":8,
|
"id":8,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -162,7 +162,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":9,
|
"id":9,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -171,7 +171,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":10,
|
"id":10,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -180,7 +180,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":11,
|
"id":11,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -189,7 +189,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":12,
|
"id":12,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -198,7 +198,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":16,
|
"id":16,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -207,7 +207,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":17,
|
"id":17,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -216,7 +216,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":18,
|
"id":18,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -225,7 +225,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":19,
|
"id":19,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -234,7 +234,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":20,
|
"id":20,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -245,7 +245,7 @@
|
|||||||
}]
|
}]
|
||||||
}],
|
}],
|
||||||
"tilewidth":32
|
"tilewidth":32
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"columns":8,
|
"columns":8,
|
||||||
"firstgid":65,
|
"firstgid":65,
|
||||||
@@ -263,4 +263,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":1.4,
|
"version":1.4,
|
||||||
"width":10
|
"width":10
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
window.addEventListener('load', () => {
|
||||||
WA.room.setProperty('iframeTest', 'openWebsite', 'https://www.wikipedia.org/');
|
WA.room.setProperty('iframeTest', 'openWebsite', 'https://www.wikipedia.org/');
|
||||||
WA.room.setProperty('metadata', 'openWebsite', 'https://www.wikipedia.org/');
|
WA.room.setProperty('metadata', 'openWebsite', 'https://www.wikipedia.org/');
|
||||||
@@ -16,4 +12,4 @@
|
|||||||
<body>
|
<body>
|
||||||
<p>Change the url of this iframe and add the 'openWebsite' property to the red tile layer</p>
|
<p>Change the url of this iframe and add the 'openWebsite' property to the red tile layer</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
|
|
||||||
window.addEventListener('load', () => {
|
window.addEventListener('load', () => {
|
||||||
WA.room.setTiles([
|
WA.room.setTiles([
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"setTiles.html"
|
"value":"setTiles.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
window.addEventListener('load', () => {
|
||||||
document.getElementById('show/hideLayer').onclick = () => {
|
document.getElementById('show/hideLayer').onclick = () => {
|
||||||
if (document.getElementById('show/hideLayer').checked) {
|
if (document.getElementById('show/hideLayer').checked) {
|
||||||
@@ -24,4 +20,4 @@
|
|||||||
<label for="show/hideLayer">Crysal Layer : </label><input type="checkbox" id="show/hideLayer" name="visible" value="show" checked>
|
<label for="show/hideLayer">Crysal Layer : </label><input type="checkbox" id="show/hideLayer" name="visible" value="show" checked>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
|
"data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[22, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 22, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[22, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 22, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -48,8 +48,8 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"showHideLayer.html"
|
"value":"showHideLayer.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"draworder":"topdown",
|
"draworder":"topdown",
|
||||||
"id":5,
|
"id":5,
|
||||||
@@ -117,7 +117,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":1,
|
"id":1,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":2,
|
"id":2,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":3,
|
"id":3,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -144,7 +144,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":4,
|
"id":4,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":8,
|
"id":8,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -162,7 +162,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":9,
|
"id":9,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -171,7 +171,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":10,
|
"id":10,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -180,7 +180,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":11,
|
"id":11,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -189,7 +189,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":12,
|
"id":12,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -198,7 +198,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":16,
|
"id":16,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -207,7 +207,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":17,
|
"id":17,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -216,7 +216,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":18,
|
"id":18,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -225,7 +225,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":19,
|
"id":19,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -234,7 +234,7 @@
|
|||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id":20,
|
"id":20,
|
||||||
"properties":[
|
"properties":[
|
||||||
@@ -245,7 +245,7 @@
|
|||||||
}]
|
}]
|
||||||
}],
|
}],
|
||||||
"tilewidth":32
|
"tilewidth":32
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"columns":8,
|
"columns":8,
|
||||||
"firstgid":65,
|
"firstgid":65,
|
||||||
@@ -263,4 +263,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":1.4,
|
"version":1.4,
|
||||||
"width":10
|
"width":10
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"shared_variables.html"
|
"value":"shared_variables.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"draworder":"topdown",
|
"draworder":"topdown",
|
||||||
"id":3,
|
"id":3,
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
"width":252.4375,
|
"width":252.4375,
|
||||||
"x":2.78125,
|
"x":2.78125,
|
||||||
"y":2.5
|
"y":2.5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"height":0,
|
"height":0,
|
||||||
"id":5,
|
"id":5,
|
||||||
@@ -70,22 +70,22 @@
|
|||||||
"name":"default",
|
"name":"default",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"default value"
|
"value":"default value"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"jsonSchema",
|
"name":"jsonSchema",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"{}"
|
"value":"{}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"persist",
|
"name":"persist",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
"value":true
|
"value":true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"readableBy",
|
"name":"readableBy",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":""
|
"value":""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"writableBy",
|
"name":"writableBy",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
@@ -128,4 +128,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":1.5,
|
"version":1.5,
|
||||||
"width":10
|
"width":10
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-5
@@ -1,12 +1,8 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
window.addEventListener('load', () => {
|
window.addEventListener('load', () => {
|
||||||
console.log('On load');
|
console.log('On load');
|
||||||
WA.onInit().then(() => {
|
WA.onInit().then(() => {
|
||||||
@@ -1,13 +1,7 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<script>
|
<script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
|
||||||
var script = document.createElement('script');
|
|
||||||
// Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
|
|
||||||
// We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
|
|
||||||
script.setAttribute('src', document.referrer + 'iframe_api.js');
|
|
||||||
document.head.appendChild(script);
|
|
||||||
</script>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<button id="sendchat">Send chat message</button>
|
<button id="sendchat">Send chat message</button>
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -43,8 +43,8 @@
|
|||||||
{
|
{
|
||||||
"name":"openWebsite",
|
"name":"openWebsite",
|
||||||
"type":"string",
|
"type":"string",
|
||||||
"value":"iframe.html"
|
"value":"iframe.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name":"openWebsiteAllowApi",
|
"name":"openWebsiteAllowApi",
|
||||||
"type":"bool",
|
"type":"bool",
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"data":[0, 0, 93, 0, 104, 0, 0, 0, 0, 0, 0, 0, 104, 0, 115, 0, 0, 0, 93, 0, 0, 0, 115, 0, 0, 0, 93, 0, 104, 0, 0, 0, 0, 0, 0, 0, 104, 0, 115, 93, 0, 0, 0, 0, 0, 0, 115, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
"data":[0, 0, 93, 0, 104, 0, 0, 0, 0, 0, 0, 0, 104, 0, 115, 0, 0, 0, 93, 0, 0, 0, 115, 0, 0, 0, 93, 0, 104, 0, 0, 0, 0, 0, 0, 0, 104, 0, 115, 93, 0, 0, 0, 0, 0, 0, 115, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
"height":10,
|
"height":10,
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
"width":10,
|
"width":10,
|
||||||
"x":0,
|
"x":0,
|
||||||
"y":0
|
"y":0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"draworder":"topdown",
|
"draworder":"topdown",
|
||||||
"id":3,
|
"id":3,
|
||||||
@@ -121,4 +121,4 @@
|
|||||||
"type":"map",
|
"type":"map",
|
||||||
"version":1.4,
|
"version":1.4,
|
||||||
"width":10
|
"width":10
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -4,8 +4,9 @@ const fs = require('fs')
|
|||||||
import { Selector } from 'testcafe';
|
import { Selector } from 'testcafe';
|
||||||
import {userAlice} from "./utils/roles";
|
import {userAlice} from "./utils/roles";
|
||||||
|
|
||||||
|
// Note: we are also testing that we can connect if the URL contains a random query string
|
||||||
fixture `Variables`
|
fixture `Variables`
|
||||||
.page `http://play.workadventure.localhost/_/global/maps.workadventure.localhost/tests/Variables/Cache/variables_tmp.json`;
|
.page `http://play.workadventure.localhost/_/global/maps.workadventure.localhost/tests/Variables/Cache/variables_tmp.json?somerandomparam=1`;
|
||||||
|
|
||||||
test("Test that variables cache in the back don't prevent setting a variable in case the map changes", async (t: TestController) => {
|
test("Test that variables cache in the back don't prevent setting a variable in case the map changes", async (t: TestController) => {
|
||||||
// Let's start by visiting a map that DOES not have the variable.
|
// Let's start by visiting a map that DOES not have the variable.
|
||||||
|
|||||||
Reference in New Issue
Block a user