@@ -88,27 +88,27 @@ editor.getSession().setMode('ace/mode/javascript');
88
88
/* ------------------------------------------------------------
89
89
EVENT LISTENERS / SEND DATA TO SERVER
90
90
91
- EVENT NAMES: CLIENT FUNCTIONS:
92
- - connection Send: SocketIO built-in event
93
- - disconnect Send: SocketIO built-in event
94
- - loggedIn Send: handleUserLogin
95
- - editorTextChange Send: handleUserTyping
96
- Receive: handleEditorChange
97
- - playerListChange Receive: handlePlayerListChange
98
- - updateState Receive: handleUpdateState
99
- - turnChange Receive: handleTurnChange
100
- - editorCursorChange Send: handleChangeCursor
101
- Receive: handleNewCursorData
102
- - editorScrollChange Send: handleeditorScrollChange
103
- Receive: handleNewScrollData
104
- - createNewGist Receive: createNewGist
105
- - newGistLink Receive: handleNewGistLink
106
- Send: (sent after creating or forking)
91
+ EVENT NAMES: CLIENT FUNCTIONS:
92
+ - connection Send: SocketIO built-in event
93
+ - disconnect Send: SocketIO built-in event
94
+ - loggedIn Send: handleUserLogin
95
+ - editorTextChange Send: handleLocalEditorTextChange
96
+ Receive: handleServerEditorTextChange
97
+ - playerListChange Receive: handlePlayerListChange
98
+ - updateState Receive: handleUpdateState
99
+ - turnChange Receive: handleTurnChange
100
+ - editorCursorChange Send: handleLocalEditorCursorChange
101
+ Receive: handleServerEditorCursorChange
102
+ - editorScrollChange Send: handleLocalEditorScrollChange
103
+ Receive: handleServerEditorScrollChange
104
+ - createNewGist Receive: createNewGist
105
+ - newGistLink Receive: handleNewGistLink
106
+ Send: (sent after creating or forking)
107
107
-------------------------------------------------------------- */
108
- editor . getSession ( ) . on ( 'change' , handleUserTyping ) ;
109
- editor . getSession ( ) . selection . on ( 'editorCursorChange' , handleChangeCursor ) ;
110
- editor . getSession ( ) . on ( 'changeScrollLeft' , handleChangeScroll ) ;
111
- editor . getSession ( ) . on ( 'changeScrollTop' , handleChangeScroll ) ;
108
+ editor . getSession ( ) . on ( 'change' , handleLocalEditorTextChange ) ;
109
+ editor . getSession ( ) . selection . on ( 'editorCursorChange' , handleLocalEditorCursorChange ) ;
110
+ editor . getSession ( ) . on ( 'changeScrollLeft' , handleLocalEditorScrollChange ) ;
111
+ editor . getSession ( ) . on ( 'changeScrollTop' , handleLocalEditorScrollChange ) ;
112
112
113
113
// When client connects to server,
114
114
socket . on ( 'connect' , function ( ) {
@@ -139,8 +139,8 @@ function handleUserLogin (userData) {
139
139
}
140
140
141
141
// Send editorInputView data to server
142
- function handleUserTyping ( event ) {
143
- //console.log('handleUserTyping event! value: ');
142
+ function handleLocalEditorTextChange ( event ) {
143
+ //console.log('handleLocalEditorTextChange event! value: ');
144
144
//console.log(event);
145
145
146
146
//console.log('%c ' + editor.getValue(), 'color: green; font-weight: bold;');
@@ -176,7 +176,7 @@ function handleUserNameChange (event) {
176
176
}
177
177
178
178
// Send cursor and selection data to server
179
- function handleChangeCursor ( event ) {
179
+ function handleLocalEditorCursorChange ( event ) {
180
180
//console.log('editorCursorChange fired!');
181
181
//console.log('%c ' + event, 'color: green; font-weight: bold;');
182
182
@@ -191,7 +191,7 @@ function handleChangeCursor (event) {
191
191
}
192
192
193
193
// Send scroll data to server
194
- function handleChangeScroll ( event ) {
194
+ function handleLocalEditorScrollChange ( event ) {
195
195
//console.log('editorScrollChange (left or top) fired!');
196
196
//console.log('%c scrollLeft: ' + editor.getSession().getScrollLeft() + ', scrollTop: ' + editor.getSession().getScrollTop(), 'color: green; font-weight: bold;');
197
197
@@ -205,25 +205,25 @@ function handleChangeScroll (event) {
205
205
/* -------------------------------------------------
206
206
EVENT LISTENERS / RECEIVE DATA FROM SERVER
207
207
---------------------------------------------------- */
208
- socket . on ( 'editorTextChange' , handleEditorChange ) ;
209
- socket . on ( 'editorCursorChange' , handleNewCursorData ) ;
210
- socket . on ( 'editorScrollChange' , handleNewScrollData ) ;
208
+ socket . on ( 'editorTextChange' , handleServerEditorTextChange ) ;
209
+ socket . on ( 'editorCursorChange' , handleServerEditorCursorChange ) ;
210
+ socket . on ( 'editorScrollChange' , handleServerEditorScrollChange ) ;
211
211
socket . on ( 'playerListChange' , handlePlayerListChange ) ;
212
212
socket . on ( 'updateState' , handleUpdateState ) ;
213
213
socket . on ( 'turnChange' , handleTurnChange ) ;
214
214
socket . on ( 'createNewGist' , createNewGist ) ;
215
215
socket . on ( 'newGistLink' , handleNewGistLink ) ;
216
216
217
217
// When receiving new editorInputView data from server
218
- function handleEditorChange ( data ) {
218
+ function handleServerEditorTextChange ( data ) {
219
219
//console.log('editorTextChange event received!');
220
220
//console.log('%c ' + data, 'color: blue; font-weight: bold;');
221
221
222
222
updateEditorView ( data ) ;
223
223
}
224
224
225
225
// When receiving new cursor/selection data from server
226
- function handleNewCursorData ( data ) {
226
+ function handleServerEditorCursorChange ( data ) {
227
227
//console.log('%c cursorChange event received!', 'color: blue; font-weight: bold;');
228
228
//console.dir(data);
229
229
@@ -233,7 +233,7 @@ function handleNewCursorData (data) {
233
233
}
234
234
235
235
// When receiving new scroll data from server
236
- function handleNewScrollData ( data ) {
236
+ function handleServerEditorScrollChange ( data ) {
237
237
//console.log('%c editorScrollChange event received!', 'color: blue; font-weight: bold;');
238
238
//console.dir(data);
239
239
0 commit comments