infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix initial text not removed in /contacts

pull/1/head
yflory 2017-07-18 10:13:04 +02:00
parent 3545a66320
commit 36d792874a
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/common-messaging.js
View File

@ -89,7 +89,7 @@ define([
});
$remove.click(function (e) {
e.stopPropagation();
common.confirm(common.Messages.getKey('contacts_confirmRemove', [
common.confirm(common.Messages._getKey('contacts_confirmRemove', [
common.fixHTML(data.displayName)
]), function (yes) {
if (!yes) { return; }
@ -364,6 +364,7 @@ define([
};
// Display a new channel
var display = function (curvePublic) {
$msgContainer.find('.info').hide();
var isNew = false;
var $chat = $msgContainer.find('.chat').filter(function (idx, el) {
return $(el).data('key') === curvePublic;
@ -421,7 +422,12 @@ define([
var $friend = $listContainer.find('.friend').filter(function (idx, el) {
return $(el).data('key') === curvePublic;
});
var $chat = $msgContainer.find('.chat').filter(function (idx, el) {
return $(el).data('key') === curvePublic;
});
$friend.remove();
$chat.remove();
$msgContainer.find('.info').show();
};
var updateUI = function (curvePublic, types) {
var data = getFriend(common, curvePublic);

7
www/contacts/main.js
View File

@ -49,11 +49,12 @@ define([
Cryptpad.initMessaging(Cryptpad, $list, $messages);
var $title = $('<h2>').text(Messages.contacts_info1).appendTo($messages);
var $ul = $('<ul>').appendTo($messages);
var $infoBlock = $('<div>', {'class': 'info'}).appendTo($messages);
$('<h2>').text(Messages.contacts_info1).appendTo($infoBlock);
var $ul = $('<ul>').appendTo($infoBlock);
$('<li>').text(Messages.contacts_info2).appendTo($ul);
$('<li>').text(Messages.contacts_info3).appendTo($ul);
$('<li>').text(Messages.contacts_info4).appendTo($ul);
//$('<li>').text(Messages.contacts_info4).appendTo($ul);
Cryptpad.removeLoadingScreen();
};

3
www/contacts/main.less
View File

@ -98,6 +98,9 @@ body {
height: 100%;
background-color: lighten(@bg-color, 20%);
min-width: 0;
.info {
padding: 20px;
}
.header {
background-color: lighten(@bg-color, 15%);
padding: 10px;