Merge branch 'mute' into sidebarbuttons

This commit is contained in:
yflory
2019-12-16 14:46:36 +01:00
37 changed files with 1019 additions and 141 deletions

View File

@@ -189,6 +189,10 @@
}
.cp-app-profile-mute-container {
margin-top: 5px;
p {
margin-top: 5px;
font-size: 13px;
}
}
}

View File

@@ -306,6 +306,7 @@ define([
refreshMute(data);
});
}).appendTo($mute);
$(h('p', Messages.contacts_muteInfo)).appendTo($mute);
});
};
@@ -439,6 +440,17 @@ define([
var refreshDescription = function (data) {
var val = Marked(data.description || "");
APP.$description.html(val);
APP.$description.off('click');
APP.$description.click(function (e) {
if (!e.target) { return; }
var $t = $(e.target);
if ($t.is('a') || $t.parents('a').length) {
e.preventDefault();
var $a = $t.is('a') ? $t : $t.parents('a').first();
var href = $a.attr('href');
common.openUnsafeURL(href);
}
});
APP.$descriptionEdit.find('span').text(val === "" ? Messages.profile_addDescription : Messages.profile_editDescription);
if (!APP.editor) { return; }
APP.editor.setValue(data.description || "");