Skip to content
Snippets Groups Projects
Commit 9f9d5834 authored by stuebinm's avatar stuebinm
Browse files

openTab's semantics are the same as openWebsite's

(it's not a modifier for openWebsite, as I had previously though)
parent dcdbec32
Branches
No related tags found
No related merge requests found
Pipeline #11194 passed
...@@ -401,12 +401,6 @@ checkTileLayerProperty p@(Property name _value) = case name of ...@@ -401,12 +401,6 @@ checkTileLayerProperty p@(Property name _value) = case name of
"audioVolume" -> do "audioVolume" -> do
isOrdInRange unwrapFloat 0 1 p isOrdInRange unwrapFloat 0 1 p
requireProperty "playAudio" requireProperty "playAudio"
"openWebsite" -> do
uselessEmptyLayer
suggestProperty $ Property "openWebsiteTrigger" (StrProp "onaction")
unwrapURI (Proxy @"website") p
(dependsOn . Link)
(const $ forbid "using openWebsite to access local html files is disallowed.")
"openWebsiteTrigger" -> do "openWebsiteTrigger" -> do
isString p isString p
requireProperty "openWebsite" requireProperty "openWebsite"
...@@ -416,9 +410,6 @@ checkTileLayerProperty p@(Property name _value) = case name of ...@@ -416,9 +410,6 @@ checkTileLayerProperty p@(Property name _value) = case name of
"openWebsiteTriggerMessage" -> do "openWebsiteTriggerMessage" -> do
isString p isString p
requireProperty "openWebsiteTrigger" requireProperty "openWebsiteTrigger"
"openTab" -> do
isString p
requireProperty "openWebsite"
"url" -> complain "the property \"url\" defining embedded iframes must be \ "url" -> complain "the property \"url\" defining embedded iframes must be \
\set on an object in an objectgroup layer." \set on an object in an objectgroup layer."
"exitUrl" -> do "exitUrl" -> do
...@@ -480,6 +471,12 @@ checkTileLayerProperty p@(Property name _value) = case name of ...@@ -480,6 +471,12 @@ checkTileLayerProperty p@(Property name _value) = case name of
, "openwebsitepolicy", "openwebsiteallowapi" , "openwebsitepolicy", "openwebsiteallowapi"
, "allowapi" ] , "allowapi" ]
-> forbidProperty name -> forbidProperty name
| name `elem` [ "openWebsite", "openTab" ] -> do
uselessEmptyLayer
suggestProperty $ Property "openWebsiteTrigger" (StrProp "onaction")
unwrapURI (Proxy @"website") p
(dependsOn . Link)
(const $ forbid "accessing local html files is disallowed.")
| otherwise -> | otherwise ->
warnUnknown p knownTileLayerProperites warnUnknown p knownTileLayerProperites
where where
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment