ve.collab: fix remote selection logic

Bug: T387989
Change-Id: Idecd50734eb6713d0f4f79c0d483eb1c928a2177

Author: divec

collab/ve.collab.js

@@ -131,12 +131,14 @@ ve.collab.initPeerClient = function ( serverId, isMain, userName ) {
 ve.collab.connectModelSynchronizer = function () {
 	const ceSurface = ve.init.target.surface.view;
 	ceSurface.model.synchronizer.connect( ceSurface, {
-		authorSelect: 'onSynchronizerAuthorUpdate',
-		authorChange: 'onSynchronizerAuthorUpdate',
-		authorDisconnect: 'onSynchronizerAuthorDisconnect',
 		wrongDoc: 'onSynchronizerWrongDoc',
 		pause: 'onSynchronizerPause'
 	} );
+	ceSurface.model.synchronizer.connect( ceSurface.getSelectionManager(), {
+		authorSelect: 'onSynchronizerAuthorUpdate',
+		authorChange: 'onSynchronizerAuthorUpdate',
+		authorDisconnect: 'onSynchronizerAuthorDisconnect'
+	} );
 };
 
 ve.collab.join = function () {

rebaser/src/dm/ve.dm.ProtocolServer.js

@@ -180,28 +180,19 @@ ve.dm.ProtocolServer.prototype.onSubmitChange = function ( context, data ) {
  * Apply and broadcast an author change
  *
  * @param {Object} context The connection context
- * @param {string} newData The new author data
+ * @param {Object} newData The new author data
  */
 ve.dm.ProtocolServer.prototype.onChangeAuthor = function ( context, newData ) {
-	this.rebaseServer.updateDocState( context.docName, context.authorId, null, {
-		name: newData.name,
-		color: newData.color
-	} );
+	this.rebaseServer.updateDocState( context.docName, context.authorId, null, newData );
 	context.broadcast( 'authorChange', {
 		authorId: context.authorId,
-		authorData: {
-			name: newData.name,
-			color: newData.color
-		}
+		authorData: newData
 	} );
 	this.logger.logServerEvent( {
 		type: 'authorChange',
 		doc: context.docName,
 		authorId: context.authorId,
-		authorData: {
-			name: newData.name,
-			color: newData.color
-		}
+		authorData: newData
 	} );
 };
 

src/dm/ve.dm.SurfaceSynchronizer.js

@@ -375,9 +375,15 @@ ve.dm.SurfaceSynchronizer.prototype.getAuthorData = function ( authorId ) {
 };
 
 ve.dm.SurfaceSynchronizer.prototype.onAuthorChange = function ( data ) {
-	this.authors[ data.authorId ] = data.authorData;
+	let authorData = this.authors[ data.authorId ];
+	if ( authorData === undefined ) {
+		authorData = Object.create( null );
+		this.authors[ data.authorId ] = authorData;
+	}
+	Object.keys( data.authorData ).forEach( ( key ) => {
+		authorData[ key ] = data.authorData[ key ];
+	} );
 	this.emit( 'authorChange', data.authorId );
-
 	if ( data.authorId === this.getAuthorId() ) {
 		ve.init.platform.sessionStorage.setObject( 've-collab-author', data.authorData );
 	}

src/ui/tools/ve.ui.AuthorListPopupTool.js

@@ -170,7 +170,8 @@ ve.ui.AuthorListPopupTool.prototype.onSynchronizerAuthorUpdate = function ( auth
 			}
 		}
 	}
-	this.oldName = this.synchronizer.getAuthorData( authorId ).name;
+	const authorData = this.synchronizer.getAuthorData( authorId );
+	this.oldName = authorData ? authorData.name : '';
 };
 
 /**

src/ui/widgets/ve.ui.AuthorItemWidget.js

@@ -122,6 +122,9 @@ ve.ui.AuthorItemWidget.prototype.setAuthorId = function ( authorId ) {
  */
 ve.ui.AuthorItemWidget.prototype.update = function () {
 	const authorData = this.synchronizer.getAuthorData( this.authorId );
+	if ( !authorData ) {
+		return;
+	}
 	this.name = authorData.name;
 	this.color = authorData.color;
 	this.$color.css( 'background-color', '#' + this.color );