Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7 -r876e644c066e81c2721ffa085fd12f386e2f3bb6
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 876e644c066e81c2721ffa085fd12f386e2f3bb6)
@@ -21,63 +21,58 @@
 	<script type="text/javascript" src='${lams}includes/javascript/jquery.js'></script>
 	<script type="text/javascript">
 		let reportSubmitted = ${scribeSessionDTO.reportSubmitted},
-				agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
-				scribeWebsocket	= null;
+				agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />';
 
 		$(document).ready(function(){
 			// focus on the first report input
 			$('textarea[id^="report-"]').first().focus();
 
-			scribeWebsocket = initWebsocket('scribe${scribeSessionDTO.sessionID}',
+			initWebsocket('scribe${scribeSessionDTO.sessionID}',
 					'${tool}'.replace('http', 'ws')
-					+ 'learningWebsocket?toolSessionID=${scribeSessionDTO.sessionID}');
-
-			if (scribeWebsocket) {
-				// when the server pushes new inputs
-				scribeWebsocket.onmessage = function (e) {
-					// create JSON object
-					var input = JSON.parse(e.data),
+					+ 'learningWebsocket?toolSessionID=${scribeSessionDTO.sessionID}',
+					function (e) {
+						// create JSON object
+						var input = JSON.parse(e.data),
 							agreeButton = $('#agreeButton');
 
-					// if the scribe or monitor force completes the activity, reload to display report page
-					if (input.close) {
-						window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
-						return;
-					}
+						// if the scribe or monitor force completes the activity, reload to display report page
+						if (input.close) {
+							window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
+							return;
+						}
 
-					// only changed reports will be sent
-					if (input.reports) {
-						$.each(input.reports, function() {
-							$('#reportText-' + this.uid).html(this.text);
-						});
-					}
+						// only changed reports will be sent
+						if (input.reports) {
+							$.each(input.reports, function() {
+								$('#reportText-' + this.uid).html(this.text);
+							});
+						}
 
-					// can the user vote
-					if (!reportSubmitted || input.approved) {
-						agreeButton.hide();
-					} else {
-						agreeButton.show();
-					}
+						// can the user vote
+						if (!reportSubmitted || input.approved) {
+							agreeButton.hide();
+						} else {
+							agreeButton.show();
+						}
 
-					// update vote statistics
-					var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
-							.replace('{1}', input.numberOfLearners);
-					$('#agreementPercentageLabel').text(label);
-					$('#agreementPercentage').text('(' + input.votePercentage + '%)');
-					$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
-							.css('width',input.votePercentage + '%');
+						// update vote statistics
+						var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
+								.replace('{1}', input.numberOfLearners);
+						$('#agreementPercentageLabel').text(label);
+						$('#agreementPercentage').text('(' + input.votePercentage + '%)');
+						$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
+								.css('width',input.votePercentage + '%');
 
-					// reset ping timer
-					websocketPing('scribe${scribeSessionDTO.sessionID}', true);
-				};
-			}
+						// reset ping timer
+						websocketPing('scribe${scribeSessionDTO.sessionID}', true);
+					});
 		});
 
 		function submitApproval() {
 			var data = {
 				type : 'vote'
 			};
-			scribeWebsocket.send(JSON.stringify(data));
+			sendToWebsocket('scribe${scribeSessionDTO.sessionID}', JSON.stringify(data));
 
 			$('#agreeButton').hide();
 		}
@@ -95,7 +90,7 @@
 				});
 			});
 			data.reports = reports;
-			scribeWebsocket.send(JSON.stringify(data));
+			sendToWebsocket('scribe${scribeSessionDTO.sessionID}', JSON.stringify(data));
 
 			reportSubmitted = true;
 		}