Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2020-09-21 12:11:01 +02:00
commit 77079c88b6
2 changed files with 8 additions and 1 deletions

View file

@ -444,7 +444,8 @@
"operator=" "operator="
] ]
}, },
"then": "Beheer door de gemeente" "then": "Beheer door de gemeente",
"hideInAnswer": true
}, },
{ {
"if": { "if": {

View file

@ -18,6 +18,12 @@ if (location.href.startsWith("http://buurtnatuur.be")) {
window.location.replace("https://buurtnatuur.be"); window.location.replace("https://buurtnatuur.be");
} }
let defaultLayout = "bookcases"
if (location.href.indexOf("buurtnatuur.be") >= 0) {
// Reload the https version. This is important for the 'locate me' button
defaultLayout = "buurtnatuur"
}
if (location.href.indexOf("buurtnatuur.be") >= 0) { if (location.href.indexOf("buurtnatuur.be") >= 0) {
defaultLayout = "buurtnatuur" defaultLayout = "buurtnatuur"