backported bugfixes from state-machine branch

pom.xml

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

resources/js/plan.js

@@ -177,9 +177,10 @@ function heartbeat(data){
 
 function keypress(ev){
 	if (ev.code === 'Escape') return request({realm:"cu",action:"emergency"});
-	if (ev.code === 'Enter') {
+	if (ev.code === 'Enter') {		
 		elem = ev.target;
 		while (elem != undefined && elem != null){
+			if (elem.nodeName == 'TEXTAREA') return false;
 			if (elem.nodeName == 'FORM') return submitForm(elem.getAttribute('id'));
 			elem = elem.parentNode;
 		}		

src/main/java/de/srsoftware/web4rail/tiles/BlockContact.java

@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.util.Map;
 
 import de.srsoftware.tools.Tag;
-import de.srsoftware.web4rail.Route;
+import de.srsoftware.web4rail.moving.Train;
 
 public class BlockContact extends Contact {
 	
@@ -36,6 +36,12 @@ public class BlockContact extends Contact {
 	public Tag tag(Map<String, Object> replacements) throws IOException {
 		return ((Block)parent()).tag(replacements);
 	}
+	
+	@Override
+	public Train train() {
+		train = ((Block)parent()).train();
+		return train;
+	}
 
 	@Override
 	public String toString() {