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

Merge branch 'staging' into mute

Browse Source
This commit is contained in:
yflory
2019-12-16 14:43:14 +01:00
parent b5193914e3 89e08704e5
commit 47128802a2
35 changed files with 1014 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
www/profile/inner.js
View File

@@ -440,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 || "");