diff --git a/pom.xml b/pom.xml index 616b54a..901f25e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 1.0.6 + 1.0.7 Web4Rail jar Java Model Railway Control diff --git a/resources/js/plan.js b/resources/js/plan.js index 1caacfd..dcd9665 100644 --- a/resources/js/plan.js +++ b/resources/js/plan.js @@ -185,8 +185,12 @@ function runAction(ev){ console.log("runAction: ",{action: clicked.id, realm:realm}); if (clicked.id == 'qrcode'){ window.open("https://api.qrserver.com/v1/create-qr-code/?data="+window.location.href,'_blank'); - return false; - } else return request({action:ev.target.id,realm:realm}); // TODO: ask for name + } else if (clicked.id == 'fullscreen'){ + toggleFullscreen(); + } else { + return request({action:ev.target.id,realm:realm}); // TODO: ask for name + } + return false; } function selectDest(trainId){ @@ -235,6 +239,12 @@ function tileWindow(){ $('.swapbtn').text(vertical ? '⇩' : '⇨'); } +function toggleFullscreen(){ + if (document.fullscreenElement == null){ + document.documentElement.requestFullscreen(); + } else document.exitFullscreen(); +} + window.onload = function () { var isDragging = false; $('.menu > div').click(closeMenu); @@ -246,5 +256,4 @@ window.onload = function () { $(PLAN).click(planClick); $(document).keyup(keypress); (new EventSource("stream")).onmessage = stream; - $('#plan').click(function(){ document.documentElement.requestFullscreen(); }); } diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java index 0d05a7f..db0323b 100644 --- a/src/main/java/de/srsoftware/web4rail/Plan.java +++ b/src/main/java/de/srsoftware/web4rail/Plan.java @@ -117,6 +117,7 @@ public class Plan extends BaseClass{ private static final String X = "x"; private static final String Y = "y"; private static final HashMap clients = new HashMap(); + private static final String FULLSCREEN = "fullscreen"; public HashMap tiles = new HashMap(); // The list of tiles of this plan, i.e. the Track layout private HashSet blocks = new HashSet(); // the list of tiles, that are blocks @@ -564,6 +565,7 @@ public class Plan extends BaseClass{ new Div(ACTION_SAVE).clazz(REALM_PLAN).content(t("Save")).addTo(actions); new Div(ACTION_ANALYZE).clazz(REALM_PLAN).content(t("Analyze")).addTo(actions); new Div(ACTION_QR).clazz(REALM_PLAN).content(t("QR-Code")).addTo(actions); + new Div(FULLSCREEN).clazz(REALM_PLAN).content(t("Fullscreen")).addTo(actions); return actions.addTo(actionMenu); }