Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -rc4111cb04c54f01b5ba38e9f193e00039cfd7e18 -r0e594c4a472245d5f4fc8b4978d20a1e7c99867b
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision c4111cb04c54f01b5ba38e9f193e00039cfd7e18)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 0e594c4a472245d5f4fc8b4978d20a1e7c99867b)
@@ -10,8 +10,8 @@
 
 <script type="text/javascript">
 
-	var lastActionId = null, 	// multiuser request tracking
-		doPoll = false, 			// multiuser - only poll once set up and not while saving a node
+	var initialActionId = null,  // multiuser request tracking
+		lastActionId = null, 	// multiuser request tracking
 		// Requests already processed:
 		// If we process all requests that come back from the server from a poll we will reprocess our own requests
 		// so keep a list and check. If we just kept the lastActionId and update it when we do a save, 
@@ -37,17 +37,20 @@
 				sessionId: "${sessionId}", mode: "${mode}" } , 
 	        dataType: "json", 
 	        success: function (response) {
-		        lastActionId = response.lastActionId;
+		        	initialActionId = response.lastActionId;
+		        lastActionId = initialActionId;
 		        var idea = content(response.mindmap);
 		        window.mapModel.setIdea(idea);
 		        <c:if test="${!contentEditable}">
 		    		    window.mapModel.setEditingEnabled(false);
     			    </c:if>
-		        <c:if  test="${multiMode}">
+		        <c:if  test="${multiMode && contentEditable}">
 			        idea.addEventListener('changed', onIdeaChangedLAMS); 
 		        </c:if>
 		        contentAggregate = window.mapModel.getIdea();
-		        doPoll = true;
+		        <c:if  test="${multiMode && contentEditable}">
+		        startWebsocket(initialActionId);
+			    </c:if>
 			},
 			error: function (response) {
 				alert('<fmt:message key="error.unable.to.load.mindmap"/>')
@@ -103,11 +106,9 @@
 		}
 	 
 		function onIdeaChangedLAMS(action, args, sessionId) {
-			// console.log("onIdeaChangedLAMS: action "+action+" args "+args);
 			var ideaToUpdate = null,
 				updateRequest = null;
 			
-	        doPoll = false;
 			if ( action == 'removeSubIdea') {
 				// delete node
 				updateRequest = { type: 0, id: args[0] };
@@ -121,15 +122,18 @@
 					alert('<fmt:message key="error.occured.during.save"/>');
 				updateRequest = { type: 1, id: args[0], parentId: parentIdea.id, title: args[1] };
 			} else if ( action == 'updateAttr' && args[1] == 'style') {
-				// change color
+				// change color - need to filter out the color changes triggered by server for other users' nodes.
+				ideaToUpdate = contentAggregate.findSubIdeaById(args[0]);
+				var locked = ideaToUpdate.attr ? ideaToUpdate.attr.contentLocked : false;
+				if ( locked ) 
+					return;
 				updateRequest = { type: 2, id: args[0], background: args[2].background  };
 			} else if ( action == 'updateTitle') {
 				// update title
 				updateRequest = { type: 3, id: args[0], title: args[1] };
 			} else {
 				// skip 'addSubIdea' - wait till title initialised
 				// do not implement undo, paste - too complicated at this point
-		        doPoll = true;
 				return;
 			}
 	
@@ -140,7 +144,6 @@
 					sessionId: "${sessionId}", lastActionId: lastActionId, actionJSON:  JSON.stringify(updateRequest) } , 
 		        dataType: "json", 
 		        success: function (response) {
-		        		console.log(response);
 		        		if ( ! response.ok  || ( action == 'initialiseTitle' && ! response.nodeId) ) {
 		        			abortSave();
 		        			return;
@@ -162,7 +165,6 @@
 		        				return;
 		        			}
 		        		}	        		
-		        		doPoll = true;
 				},
 				error: function (response) {
 					// would be nice to trigger undo, but undo what? the UI may have moved on a done more stuff in the meantime.
@@ -191,7 +193,6 @@
 
 		function abortSave() {
 			alert('<fmt:message key="error.occured.during.save"/>');
-			doPoll = true;
 		}
 		
  		// Functionality copied from commandProcessors.removeSubIdea = function (...) 
@@ -215,86 +216,114 @@
 			});
 		} 
 		
+		<%-- Websockets used to get the node updates from the server --%>
+		<%-- init the connection with server using server URL but with different protocol --%>
+		var mindmapWebsocketInitTime = null, 
+			mindmapWebsocket = null,
+			mindmapWebsocketPingTimeout = null,
+			mindmapWebsocketPingFunc = null;
+
 		function abortLoad(msg) {
 			alert(msg);
-			doPoll = false;
 			window.mapModel.setEditingEnabled(false);
 		}
 
-		// get updates from server every one minute. If it fails then quit polling and need to manually reload the page.
-	 	$.timer(60000, function (timer) {
-	 		if ( doPoll ) {
-	 			doPoll = false;
-		 		$.ajax({ 
-			        method: "POST", 
-			        url: "learning.do", 
-			        data: { dispatch: "pollServerActionJSON", mindmapId: "${mindmapId}", userId: "${userId}", 
-						sessionId: "${sessionId}", lastActionID: lastActionId } , 
-			        dataType: "json", 
-			        success: function (response) {
-			        		// need to work out how to update model
-			        		console.log(response);
-			        		if ( ! response.actions ) {
-			        			doPoll = true;
-			        			return;
-			        		}
+		mindmapWebsocketPingFunc = function(skipPing){
+			if (mindmapWebsocket.readyState == mindmapWebsocket.CLOSING 
+					|| mindmapWebsocket.readyState == mindmapWebsocket.CLOSED){
+				if (Date.now() - mindmapWebsocketInitTime < 1000) {
+					return;
+				}
+				abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
+			}
+			// check and ping every 3 minutes
+			mindmapWebsocketPingTimeout = setTimeout(mindmapWebsocketPingFunc, 3*60*1000);
+			// initial set up does not send ping
+			if (!skipPing) {
+				mindmapWebsocket.send("ping");
+			}
+		};
+	
+		mindmapWebsocketProcessMessage = function(e) {
+			// create JSON object
+			var response = JSON.parse(e.data);
+			
+			// reset ping timer
+			clearTimeout(mindmapWebsocketPingTimeout);
+			mindmapWebsocketPingFunc(true);
+			
+        		if ( ! response.actions ) {
+        			return;
+        		}
 			        		
-			        		var requestId = false;
-			        		for ( i=0; i<response.actions.length; i++ ) {
-			        			var action = response.actions[i];
-		        				requestId =  action.actionId;
-			        			if ( ! action.actionId ) {
-			        				abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
-			        				return;
-			        			}
-			        			// only process requests we have not done already otherwise we would redo any we trigger
-			        			if ( requestsProcessed.indexOf(requestId) == -1 ) {
-					        		if ( action.type == 0 ) {
-					        			customRemoveSubIdea(action.nodeId);
-					        		} else if ( action.type == 1 ) {
-	 								updateUnsavedNodeIds(action.childNodeId);
-					        			// add node response.nodeId, response.title, response.color
-					        			debugger;
-	 								contentAggregate.addSubIdea(action.nodeId, action.title, action.childNodeId);
-					        			var newChildNode = contentAggregate.findSubIdeaById(action.childNodeId);
-	 								newChildNode.attr = {};
-	 								newChildNode.attr.contentLocked = true;
-					        			if ( action.color ) {
-		 								newChildNode.attr.style = {};
-						        			newChildNode.attr.style.background = action.color;
-					        			}
-					        		} else if ( action.type == 2 ) {
-					        			var ideaToUpdate = contentAggregate.findSubIdeaById(action.nodeId);
-					        			if ( ! ideaToUpdate.attr ) {
-					        				ideaToUpdate.attr = {};
-					        			}
-					        			if ( ! ideaToUpdate.attr.style ) {
-					        				ideaToUpdate.attr.style = {};
-					        			}
-									ideaToUpdate.attr.style.background = action.color;
-					        		} else if ( action.type == 3 ) {
-					        			// update title
-					        			var ideaToUpdate = contentAggregate.findSubIdeaById(action.nodeId);
-					        			ideaToUpdate.title = action.title;    		
-					        		} else {
-					        			console.log("Unexpected change received from server. Type "+action.type+" Full action: "+action);
-					        		}
-					        		requestsProcessed.push( requestId );
-			        				updateLastActionId( requestId );
-				        		}
-			        		}
-			        		if ( requestId ) {
-				        		window.mapModel.rebuildRequired();
-			        		}
-			        		doPoll = true;
-					},
-					error: function (response) {
+        		var valuesChanged = false;
+        		for ( i=0; i<response.actions.length; i++ ) {
+        			var action = response.actions[i];
+       				requestId =  action.actionId;
+        			if ( ! action.actionId ) {
+        				abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
+        				return;
+        			}
+        			// only process requests we have not done already otherwise we would redo any we trigger
+        			if ( requestId > initialActionId && requestsProcessed.indexOf(requestId) == -1 ) {
+		        		if ( action.type == 0 ) {
+		        			customRemoveSubIdea(action.nodeId);
+		        		} else if ( action.type == 1 ) {
+						updateUnsavedNodeIds(action.childNodeId);
+		        			// add node response.nodeId, response.title, response.color
+						contentAggregate.addSubIdea(action.nodeId, action.title, action.childNodeId);
+		        			var newChildNode = contentAggregate.findSubIdeaById(action.childNodeId);
+							newChildNode.attr = {};
+							newChildNode.attr.contentLocked = true;
+		        			if ( action.color ) {
+							newChildNode.attr.style = {};
+			        			newChildNode.attr.style.background = action.color;
+		        			}
+		        		} else if ( action.type == 2 ) {
+		        			// update colour - this call updates the node on screen but also triggers the change
+		        			// action which will call onIdeaChangedLAMS() - so the change to the other user's node
+		        			// will need to be ignored.
+		        			contentAggregate.mergeAttrProperty(action.nodeId, 'style', 'background', action.color);
+		        		} else if ( action.type == 3 ) {
+		        			// update title
+		        			var ideaToUpdate = contentAggregate.findSubIdeaById(action.nodeId);
+		        			ideaToUpdate.title = action.title;    		
+		        		} else {
 						abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
-					}
-				});
-	 		}
-		});
-	</c:when>
+		        		}
+		        		requestsProcessed.push( requestId );
+        				updateLastActionId( requestId );
+        				valuesChanged = true;
+	        		}
+        		}
+        		if ( valuesChanged ) {
+	        		window.mapModel.rebuildRequired();
+        		}
+		};
+	
+		// websocket communicaton should only be done once the diagram is fully loaded.
+		function startWebsocket(lastActionId) {
+			mindmapWebsocketInitTime = Date.now();
+			mindmapWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws')
+						+ 'learningWebsocket?toolSessionID=' + '${sessionId}' + '&lastActionId=' + lastActionId );
+
+			// run when the server pushes new reports and vote statistics
+			mindmapWebsocket.onmessage = mindmapWebsocketProcessMessage;
+
+			mindmapWebsocket.onclose = function(e){
+				if (e.code === 1006 &&
+					Date.now() - mindmapWebsocketInitTime > 1000) {
+					abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
+				}
+			};
+			
+			// set up timer for the first time
+			mindmapWebsocketPingFunc(true);
+		}			
+
+		<%--  End Websockets --%>
+
+    </c:when>
 	<c:otherwise>
 		function onIdeaChangedLAMS(action, args, sessionId) {
 			if ( ! (action == 'updateAttr' && args[1] == 'collapsed') ) {
@@ -328,7 +357,6 @@
 			        },
 			        dataType: "json", 
 			        success: function (response) {
-			        		console.log(response);
 			        		if ( ! response.ok ) {
 			        			alert('<fmt:message key="error.occured.during.save"/>');
 			        			return;