Browse Source

overhauled message display

master
Stephan Richter 3 years ago
parent
commit
abefc10afb
  1. 2
      pom.xml
  2. 28
      resources/js/plan.js

2
pom.xml

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId>
<version>1.5.33</version>
<version>1.5.34</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

28
resources/js/plan.js

@ -41,10 +41,11 @@ function addClass(data){ @@ -41,10 +41,11 @@ function addClass(data){
}
function addMessage(txt){
messages.unshift(txt);
if (messages.length>5) messages.pop();
updateMessages();
setTimeout(fadeMessage,60000);
let mid = 'm'+Date.now();
$('#messages').append($('<div/>').attr('id',mid).html(txt));
setTimeout(function(){
$('#'+mid).remove();
},10000);
}
function addTile(x,y){
@ -189,24 +190,6 @@ function enableMove(ev){ @@ -189,24 +190,6 @@ function enableMove(ev){
return false; // otherwise body.click would also be triggered
}
function fadeMessage(){
if (messages.length > 1) {
messages.pop();
updateMessages();
} else {
messageOpacity -= 5;
if (messageOpacity < 1) {
messages.pop();
updateMessages();
return;
}
messageTimer = setTimeout(fadeMessage,100);
var o = messageOpacity;
if (o>OPAC) o=OPAC;
$('#messages').css('opacity',o/OPAC);
}
}
function getCookie(key) {
var keyValue = document.cookie.match('(^|;) ?' + key + '=([^;]*)(;|$)');
return keyValue ? keyValue[2] : null;
@ -330,7 +313,6 @@ function runAction(ev){ @@ -330,7 +313,6 @@ function runAction(ev){
function stream(ev){
var data = ev.data;
data = data.replace(/%newline%/g,"\n");
console.log("received: ",data);
if (data.startsWith('<svg')) return place(data);
if (data.startsWith("heartbeat")) return heartbeat(data);
if (data.startsWith("place ")) return place(data.substring(6));

Loading…
Cancel
Save