Skip to content

Fix des maps avec un rangement erroné et nouveau regexp qui fonctionn… #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Michineyru wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix des maps avec un rangement erroné et nouveau regexp qui fonctionn… #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
232 changes: 126 additions & 106 deletions maps/DECLAMEFLE.tmj
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions maps/Mukwegue.tmj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@
{
"name":"exitPromptMessage",
"type":"string",
"value":"Aller à salle 4 ?"
"value":"Aller \u00e0 salle 4 ?"
},
{
"name":"exitPromptUrl",
Expand Down Expand Up @@ -1542,7 +1542,7 @@
{
"name":"exitPromptMessage",
"type":"string",
"value":"Aller à salle 3 ?"
"value":"Aller \u00e0 salle 3 ?"
},
{
"name":"exitPromptUrl",
Expand Down Expand Up @@ -1744,7 +1744,7 @@
{
"name":"exitPromptMessage",
"type":"string",
"value":"Aller à salle 2 ?"
"value":"Aller \u00e0 salle 2 ?"
},
{
"name":"exitPromptUrl",
Expand Down Expand Up @@ -1946,7 +1946,7 @@
{
"name":"exitPromptMessage",
"type":"string",
"value":""
"value":"Aller \u00e0 salle 1 ?"
},
{
"name":"exitPromptUrl",
Expand Down Expand Up @@ -2148,7 +2148,7 @@
{
"name":"exitPromptMessage",
"type":"string",
"value":"Aller à panzi ?"
"value":"Aller \u00e0 panzi ?"
},
{
"name":"exitPromptUrl",
Expand Down
466 changes: 243 additions & 223 deletions maps/SalleM1.tmj
View file
Open in desktop

Large diffs are not rendered by default.

466 changes: 243 additions & 223 deletions maps/SalleM2.tmj
View file
Open in desktop

Large diffs are not rendered by default.

466 changes: 243 additions & 223 deletions maps/SalleM3.tmj
View file
Open in desktop

Large diffs are not rendered by default.

466 changes: 243 additions & 223 deletions maps/SalleM4.tmj
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions src/main_new.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WA.onInit().then(() => {

let currentMapName = WA.room.mapURL;
const mapUrl = WA.room.mapURL;
const re = new RegExp(/^http(s)?:\/\/\w+(\.\w+)*(:[0-9]+)?/);
const re = new RegExp(/^http(s)?:\/\/\w+((\.)?(\-)?\w+)*(:[0-9]+)?/);
const root2 = mapUrl.match(re);
const root = root2 != undefined ? root2[0] : undefined;

Expand All @@ -21,7 +21,6 @@ WA.onInit().then(() => {

WA.ui.actionBar.addButton({
id: 'home',
//imageSrc: "https://raw.githubusercontent.com/workadventure/uni-rennes/8b0b48d41120ac59cb57ae90f78cd48813980a40/public/arrows-to-center.svg",
imageSrc: root + "/arrows-to-center.svg",
toolTip: "M'envoyer à l'accueil de Villejean",
callback: () => {
Expand All @@ -39,7 +38,6 @@ WA.onInit().then(() => {

WA.ui.actionBar.addButton({
id: 'menu-btn',
//imageSrc: 'https://hugoaverty.github.io/map-overview/img/map.svg',
imageSrc: root + "/brochure.png",
toolTip: 'Interactive Menu',
callback: () => {
Expand Down