wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "CollabTarget: remember current name, briefly"

Browse source
This commit is contained in:
jenkins-bot 2018-05-16 16:40:09 +00:00 committed by Gerrit Code Review
parent df4d8673ca aab3c106df
commit a8ca28da84
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/ve-mw-collab/ve.init.mw.CollabTarget.js
View file

@ -111,7 +111,7 @@ ve.init.mw.CollabTarget.prototype.attachToolbar = function () {
* @inheritdoc * @inheritdoc
*/ */
ve.init.mw.CollabTarget.prototype.setSurface = function ( surface ) { ve.init.mw.CollabTarget.prototype.setSurface = function ( surface ) {
var synchronizer, surfaceView; var synchronizer, surfaceView, defaultName;
if ( surface !== this.surface ) { if ( surface !== this.surface ) {
this.$editableContent.after( surface.$element ); this.$editableContent.after( surface.$element );
@ -123,12 +123,22 @@ ve.init.mw.CollabTarget.prototype.setSurface = function ( surface ) {
this.title.toString(), this.title.toString(),
{ server: this.rebaserUrl } { server: this.rebaserUrl }
); );
synchronizer.on( 'authorNameChange', function ( authorId ) {
var newName = synchronizer.authorNames[ authorId ];
if ( authorId === synchronizer.getAuthorId() ) {
mw.storage.session.set( 've-collab-username', newName );
}
} );
// TODO: server could communicate with MW (via oauth?) to know the // TODO: server could communicate with MW (via oauth?) to know the
// current-user's name. Disable changing name if logged in? // current-user's name. Disable changing name if logged in?
// Communicate an I-am-a-valid-user flag to other clients? // Communicate an I-am-a-valid-user flag to other clients?
if ( !mw.user.isAnon() ) { defaultName = mw.storage.session.get( 've-collab-username' );
synchronizer.changeName( mw.user.getName() ); if ( !defaultName && !mw.user.isAnon() ) {
defaultName = mw.user.getName();
}
if ( defaultName ) {
synchronizer.changeName( defaultName );
} }
surfaceView.setSynchronizer( synchronizer ); surfaceView.setSynchronizer( synchronizer );