web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the new toolbar and move the userlist code in a separate file

Browse Source
This commit is contained in:
yflory
2017-05-05 17:56:49 +02:00
parent 6847906ac9
commit 5a883d5a57
10 changed files with 292 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/common/toolbar2.js
View File

@@ -102,7 +102,7 @@ define([
var checkSynchronizing = function (toolbar, config) {
if (!toolbar.state) { return; }
var userList = config.userList.list.users;
var userNetfluxId = config.userList.userNetfluxId; // TODO
var userNetfluxId = config.userList.userNetfluxId;
var meIdx = userList.indexOf(userNetfluxId);
if (meIdx === -1) {
toolbar.state.text(Messages.synchronizing);
@@ -113,7 +113,7 @@ define([
var getOtherUsers = function(config) {
var userList = config.userList.list.users;
var userData = config.userList.data;
var userNetfluxId = config.userList.userNetfluxId; // TODO
var userNetfluxId = config.userList.userNetfluxId;
var i = 0; // duplicates counter
var list = [];
@@ -260,8 +260,6 @@ define([
$block.attr('id', 'userButtons');
toolbar.$leftside.prepend($block);
initUserList(toolbar, config);
return $block;
};
@@ -596,7 +594,7 @@ define([
'class': 'synced fa fa-check',
title: Messages.synced
}).appendTo($spin);
toolbar.$userAdmin.prepend($spin); // TODO: put at the corretc position in userAdmin
toolbar.$userAdmin.prepend($spin);
if (config.realtime) {
config.realtime.onPatch(ks(toolbar, config));
config.realtime.onMessage(ks(toolbar, config, true));
@@ -677,7 +675,8 @@ define([
$userButton.click(function (e) {
e.preventDefault();
e.stopPropagation();
Cryptpad.getLastName(function (lastName) {
Cryptpad.getLastName(function (err, lastName) {
if (err) { return void console.error("Cannot get last name", err); }
Cryptpad.prompt(Messages.changeNamePrompt, lastName || '', function (newName) {
if (newName === null && typeof(lastName) === "string") { return; }
if (newName === null) { newName = ''; }
@@ -844,7 +843,7 @@ define([
tb['userlist'] = createUserList;
tb['share'] = createShare;
tb['fileshare'] = createFileShare;
tb['title'] = createTitle; // TODO: New one, add it to the displayed in main.js ?
tb['title'] = createTitle;
tb['lag'] = createLag;
tb['spinner'] = createSpinner;
tb['state'] = createState;
@@ -866,6 +865,7 @@ define([
};
addElement(config.displayed, {}, true);
initUserList(toolbar, config);
toolbar['linkToMain'] = createLinkToMain(toolbar, config);