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

Merge branch 'staging' into slide2

Browse Source
This commit is contained in:
yflory
2017-09-08 16:23:07 +02:00
parent 05793c220c fc069dac48
commit c3a07e879c
21 changed files with 436 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
www/common/cryptpad-common.js
View File

@@ -81,6 +81,8 @@ define([
common.addTooltips = UI.addTooltips;
common.clearTooltips = UI.clearTooltips;
common.importContent = UI.importContent;
common.tokenField = UI.tokenField;
common.dialog = UI.dialog;
// import common utilities for export
common.find = Util.find;
@@ -1391,6 +1393,21 @@ define([
})
.click(prepareFeedback(type));
break;
case 'hashtag':
button = $('<button>', {
'class': 'fa fa-hashtag',
})
.click(prepareFeedback(type))
.click(function () {
// TODO fetch pad tags before presenting dialog to user
var dialog = UI.dialog.tagPrompt([], function (tags) {
if (!Array.isArray(tags)) { return; }
console.error(tags);
// TODO do something with the tags the user entered
});
document.body.appendChild(dialog);
});
break;
default:
button = $('<button>', {
'class': "fa fa-question",
@@ -1940,7 +1957,7 @@ define([
};
var $userAdmin = createDropdown(dropdownConfigUser);
var oldUrl;
var oldUrl = '';
if (account && !config.static && store) {
var $avatar = $userAdmin.find('.cp-dropdown-button-title');
var updateButton = function (newName) {
@@ -1950,7 +1967,7 @@ define([
if (oldUrl === url) { return; }
oldUrl = url;
$avatar.html('');
common.displayAvatar($avatar, url, newName, function ($img) {
common.displayAvatar($avatar, url, newName || Messages.anonymous, function ($img) {
if ($img) {
$userAdmin.find('button').addClass('avatar');
}