For #1: rename editor events

  - editorChange --> editorTextChange
  - changeScroll --> editorScrollChange
  - changeCursor --> editorCursorChange

Author: LearningNerd

public/local.js

@@ -92,21 +92,21 @@ editor.getSession().setMode('ace/mode/javascript');
 	- connection 		Send: 		SocketIO built-in event
 	- disconnect 		Send: 		SocketIO built-in event
 	- loggedIn			Send: 		handleUserLogin
-	- editorChange		Send: 		handleUserTyping
+	- editorTextChange		Send: 		handleUserTyping
 						Receive: 	handleEditorChange
 	- playerListChange 	Receive: 	handlePlayerListChange
 	- updateState		Receive: 	handleUpdateState
 	- turnChange 		Receive: 	handleTurnChange
-	- changeCursor		Send: 		handleChangeCursor
+	- editorCursorChange		Send: 		handleChangeCursor
 						Receive: 	handleNewCursorData
-	- changeScroll 		Send: 		handleChangeScroll
+	- editorScrollChange 		Send: 		handleeditorScrollChange
 						Receive: 	handleNewScrollData
 	- createNewGist 	Receive: 	createNewGist
 	- newGistLink		Receive: 	handleNewGistLink
 						Send: 		(sent after creating or forking)	
 -------------------------------------------------------------- */
 editor.getSession().on('change', handleUserTyping);
-editor.getSession().selection.on('changeCursor', handleChangeCursor);
+editor.getSession().selection.on('editorCursorChange', handleChangeCursor);
 editor.getSession().on('changeScrollLeft', handleChangeScroll);
 editor.getSession().on('changeScrollTop', handleChangeScroll);
 
@@ -149,7 +149,7 @@ function handleUserTyping (event) {
 	if (socket.id === currentPlayerId) {
 		//console.log('Sending data to server!')
 		// Send data to server
-		socket.emit( 'editorChange', editor.getValue() );
+		socket.emit( 'editorTextChange', editor.getValue() );
 	}
 }
 
@@ -177,7 +177,7 @@ function handleUserNameChange (event) {
 
 // Send cursor and selection data to server
 function handleChangeCursor (event) {
-	//console.log('changeCursor fired!');
+	//console.log('editorCursorChange fired!');
 	//console.log('%c ' + event, 'color: green; font-weight: bold;');	
 
 	// Cursor object:
@@ -187,16 +187,16 @@ function handleChangeCursor (event) {
 	// { end: {column, row}, start: {column, row} }
 
 	// Send to server:
-	socket.emit( 'changeCursor', { cursor: editor.getSession().selection.getCursor(), range: editor.getSession().selection.getRange() } );
+	socket.emit( 'editorCursorChange', { cursor: editor.getSession().selection.getCursor(), range: editor.getSession().selection.getRange() } );
 }
 
 // Send scroll data to server
 function handleChangeScroll (event) {
-	//console.log('changeScroll (left or top) fired!');
+	//console.log('editorScrollChange (left or top) fired!');
 	//console.log('%c scrollLeft: ' + editor.getSession().getScrollLeft() + ', scrollTop: ' + editor.getSession().getScrollTop(), 'color: green; font-weight: bold;');
 
 	// Send to server:
-	socket.emit('changeScroll', { scrollLeft: editor.getSession().getScrollLeft(), scrollTop: editor.getSession().getScrollTop() });	
+	socket.emit('editorScrollChange', { scrollLeft: editor.getSession().getScrollLeft(), scrollTop: editor.getSession().getScrollTop() });	
 }
 
 // TODO: Test 'input' event some more in different browsers!
@@ -205,9 +205,9 @@ function handleChangeScroll (event) {
 /* -------------------------------------------------
 	EVENT LISTENERS / RECEIVE DATA FROM SERVER	
 ---------------------------------------------------- */
-socket.on('editorChange', handleEditorChange);
-socket.on('changeCursor', handleNewCursorData);
-socket.on('changeScroll', handleNewScrollData);
+socket.on('editorTextChange', handleEditorChange);
+socket.on('editorCursorChange', handleNewCursorData);
+socket.on('editorScrollChange', handleNewScrollData);
 socket.on('playerListChange', handlePlayerListChange);
 socket.on('updateState', handleUpdateState);
 socket.on('turnChange', handleTurnChange);
@@ -216,7 +216,7 @@ socket.on('newGistLink', handleNewGistLink);
 
 // When receiving new editorInputView data from server
 function handleEditorChange (data) {
-	//console.log('editorChange event received!');
+	//console.log('editorTextChange event received!');
 	//console.log('%c ' + data, 'color: blue; font-weight: bold;');
 
 	updateEditorView(data);
@@ -234,7 +234,7 @@ function handleNewCursorData (data) {
 
 // When receiving new scroll data from server
 function handleNewScrollData (data) {
-	//console.log('%c scrollChange event received!', 'color: blue; font-weight: bold;');
+	//console.log('%c editorScrollChange event received!', 'color: blue; font-weight: bold;');
 	//console.dir(data); 
 
 	// Set Ace editor's scroll position to match

server.js

@@ -67,11 +67,11 @@ server.listen(port, function() {
 /* ------------------------------------------------------------
 	EVENT NAMES: 		SERVER FUNCTIONS:			
 	- loggedIn			io.emit: playerListChange
-						socket.emit: editorChange, changeScroll, changeCursor, turnChange
+						socket.emit: editorTextChange, editorScrollChange, editorCursorChange, turnChange
 	- disconnect 		Broadcast: playerListChange
-	- editorChange		Broadcast: editorChange
-	- changeCursor		Broadcast: changeCursor
-	- changeScroll		Broadcast: changeScroll
+	- editorTextChange		Broadcast: editorTextChange
+	- editorCursorChange		Broadcast: editorCursorChange
+	- editorScrollChange		Broadcast: editorScrollChange
 	- updateState		Broadcast: updateState
 	- turnChange 		Broadcast: turnChange
 	- createNewGist		Broadcast: createNewGist
@@ -114,12 +114,12 @@ io.on('connection', function (socket) {
 		playerList.push(socket.id);
 
 		// Send current state of the text editor to the new client, to initialize!
-		socket.emit('editorChange', editorContent);
+		socket.emit('editorTextChange', editorContent);
 		if (editorScroll != null) {
-			socket.emit('changeScroll', editorScroll);
+			socket.emit('editorScrollChange', editorScroll);
 		}
 		if (editorCursorAndSelection != null) {
-			socket.emit('changeCursor', editorCursorAndSelection);
+			socket.emit('editorCursorChange', editorCursorAndSelection);
 		}
 
 		// Initialize the turn (and timer) with first connected user
@@ -204,10 +204,10 @@ io.on('connection', function (socket) {
 		}		
 	});
 
-	// When "editorChange" event received, update editor state and broadcast it back out
-	socket.on('editorChange', function (data) {
+	// When "editorTextChange" event received, update editor state and broadcast it back out
+	socket.on('editorTextChange', function (data) {
 
-		//console.log('editorChange event received!');
+		//console.log('editorTextChange event received!');
 		//console.log(data);
 
 		// Double check that this user is allowed to type (in case of client-side tampering with the JS!)
@@ -216,17 +216,17 @@ io.on('connection', function (socket) {
 			editorContent = data;
 
 			// Broadcast updated editor content to other clients
-			socket.broadcast.emit('editorChange', editorContent);
+			socket.broadcast.emit('editorTextChange', editorContent);
 
 			//console.log('Broadcasting editorContent to other clients!');
 		}
 
 	});
 
-	// When "changeCursor" event received, update editor state and broadcast it back out
-	socket.on('changeCursor', function (data) {
+	// When "editorCursorChange" event received, update editor state and broadcast it back out
+	socket.on('editorCursorChange', function (data) {
 
-		//console.log('changeCursor event received!');
+		//console.log('editorCursorChange event received!');
 		//console.log(data);
 
 		// Double check that this user is allowed to broadcast (in case of client-side tampering with the JS!)
@@ -235,17 +235,17 @@ io.on('connection', function (socket) {
 			editorCursorAndSelection = data;
 
 			// Broadcast data to other clients
-			socket.broadcast.emit('changeCursor', editorCursorAndSelection);
+			socket.broadcast.emit('editorCursorChange', editorCursorAndSelection);
 
-			//console.log('Broadcasting changeCursor to other clients!');
+			//console.log('Broadcasting editorCursorChange to other clients!');
 		}
 
 	});
 
-	// When "changeScroll" event received, update editor state and broadcast it back out
-	socket.on('changeScroll', function (data) {
+	// When "editorScrollChange" event received, update editor state and broadcast it back out
+	socket.on('editorScrollChange', function (data) {
 
-		//console.log('changeScroll event received!');
+		//console.log('editorScrollChange event received!');
 		//console.log(data);
 
 		// Double check that this user is allowed to broadcast (in case of client-side tampering with the JS!)
@@ -254,9 +254,9 @@ io.on('connection', function (socket) {
 			editorScroll = data;
 
 			// Broadcast data to other clients
-			socket.broadcast.emit('changeScroll', editorScroll);
+			socket.broadcast.emit('editorScrollChange', editorScroll);
 
-			//console.log('Broadcasting changeScroll to other clients!');
+			//console.log('Broadcasting editorScrollChange to other clients!');
 		}
 
 	});