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

Fix an issue with the cursor sometimes disappearing when a patch was received

Browse Source 
Update CodeMirror to the latest version (5.13.2)
This commit is contained in:
Yann Flory
2016-04-11 15:47:40 +02:00
parent 713c90242b
commit c2e0dded3a
486 changed files with 41342 additions and 1824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
www/code/toolbar.js
View File

@@ -123,19 +123,6 @@ define([
return $container.find('#'+id)[0];
};
var getOtherUsers = function(myUserName, userList) {
var i = 0;
var list = '';
userList.forEach(function(user) {
if(user !== myUserName) {
if(i === 0) list = ' : ';
list += user + ', ';
i++;
}
});
return (i > 0) ? list.slice(0, -2) : list;
}
var updateUserList = function (myUserName, listElement, userList) {
var meIdx = userList.indexOf(myUserName);
if (meIdx === -1) {
@@ -143,11 +130,11 @@ define([
return;
}
if (userList.length === 1) {
listElement.innerHTML = Messages.editingAlone;
listElement.textContent = Messages.editingAlone;
} else if (userList.length === 2) {
listElement.innerHTML = Messages.editingWithOneOtherPerson + getOtherUsers(myUserName, userList);
listElement.textContent = Messages.editingWithOneOtherPerson;
} else {
listElement.innerHTML = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople + getOtherUsers(myUserName, userList);
listElement.textContent = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople;
}
};