--- miscJava/Test3/WebContent/WebsockTest.html	2014/02/10 21:54:54	2106
+++ miscJava/Test3/WebContent/WebsockTest.html	2014/02/11 09:50:30	2110
@@ -5,11 +5,33 @@
 
 <script type="text/javascript">
 
+var actTime = 0;
+var socket = null;
+
+function setActTime() {
+	actTime = new Date().getTime();
+}
+
 function append(str) {
 	var log = $("#log");
 	log.val( log.val() + str + "\n")
 }
 
+function sendMessage() {
+	try {
+		var txt = $("#txt").val();
+		append(txt);
+		
+		socket.send(txt);
+		
+		$("#txt").val("");
+		setActTime();
+		
+	} catch(exception) {
+		append(exception);
+	}
+}
+
 $( function() {
 	$("#log").val("");
 	append("starting app");
@@ -18,36 +40,42 @@
 		var url = "ws://" + document.location.host + "/Test3/wstest";
 		append("Opening connection to " + url)
 		
-		var socket = new WebSocket(url);
+		socket = new WebSocket(url);
 		
 		socket.onopen = function() {
 		    append("Socket has been opened!");
+		    setActTime();
 		}
 		
 		socket.onmessage = function(msg){
-		    append(msg); //Awesome!
+		    append(msg.data); //Awesome!
+		    setActTime();
 		}
 	
 		socket.onclose = function(){
-        	append('Connection closed');
+			var now = new Date().getTime();
+			var elapsed = now - actTime;
+			elapsed = elapsed / 1000;
+			
+        	append('Connection closed after ' + elapsed + ' seconds of inactivity');
     	} 
 	} catch(exception){
         append(exception);
 	}
 	
 	$("#btn").click( function() {
-		try {
-			var txt = $("#txt").val();
-			append(txt);
-			
-			socket.send(txt);
-			
-		} catch(exception) {
-			append(exception);
+		sendMessage();
+	});
+	
+	$(document).keypress(function(e) {
+		if(e.which == 13) {
+			sendMessage();
 		}
 	});
 	
 });
+
+
 </script>
 
 </head>
@@ -55,11 +83,11 @@
 
 <h2>Websocket test chat</h2>
 
-<textarea rows="30" cols="160" id="log"></textarea>
+<textarea rows="30" cols="160" id="log" readonly></textarea>
 <br>
 <input size=120  type="text" name="txt" id="txt">
 <button id="btn">Submit</button>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>