Update display name in realtime across tabs and remember 'anonymous' name
This commit is contained in:
@@ -436,13 +436,6 @@ define([
|
||||
APP.proxy.info.userData = userData;
|
||||
};
|
||||
|
||||
//var myData = {};
|
||||
var getLastName = function (cb) {
|
||||
Cryptpad.getAttribute('username', function (err, userName) {
|
||||
cb(err, userName || '');
|
||||
});
|
||||
};
|
||||
|
||||
var setName = APP.setName = function (newName) {
|
||||
if (typeof(newName) !== 'string') { return; }
|
||||
var myUserNameTemp = Cryptpad.fixHTML(newName.trim());
|
||||
@@ -461,8 +454,6 @@ define([
|
||||
console.error("Couldn't set username");
|
||||
return;
|
||||
}
|
||||
APP.userName.lastName = myUserName;
|
||||
//change();
|
||||
});
|
||||
};
|
||||
|
||||
@@ -636,7 +627,7 @@ define([
|
||||
}
|
||||
|
||||
|
||||
getLastName(function (err, lastName) {
|
||||
Cryptpad.getLastName(function (err, lastName) {
|
||||
APP.ready = true;
|
||||
|
||||
if (!proxy.published) {
|
||||
@@ -680,13 +671,6 @@ define([
|
||||
|
||||
userList = APP.userList = info.userList;
|
||||
|
||||
APP.userName = {};
|
||||
// The lastName is stored in an object passed to the toolbar so that when the user clicks on
|
||||
// the "change display name" button, the prompt already knows his current name
|
||||
getLastName(function (err, lastName) {
|
||||
APP.userName.lastName = lastName;
|
||||
});
|
||||
|
||||
var config = {
|
||||
displayed: ['useradmin', 'language', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad'],
|
||||
userData: userData,
|
||||
@@ -696,10 +680,6 @@ define([
|
||||
defaultName: defaultName,
|
||||
suggestName: suggestName
|
||||
},
|
||||
userName: {
|
||||
setName: setName,
|
||||
lastName: APP.userName
|
||||
},
|
||||
ifrw: window,
|
||||
common: Cryptpad,
|
||||
};
|
||||
@@ -734,6 +714,8 @@ define([
|
||||
// set the hash
|
||||
if (!readOnly) { Cryptpad.replaceHash(editHash); }
|
||||
|
||||
Cryptpad.onDisplayNameChanged(setName);
|
||||
|
||||
Cryptpad.getPadTitle(function (err, title) {
|
||||
if (err) {
|
||||
error(err);
|
||||
|
||||
Reference in New Issue
Block a user