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

align button array in Link tab

Browse Source
This commit is contained in:
David Benqué
2019-11-19 16:28:05 +00:00
parent aa743d5c90
commit db104d6610
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
www/common/common-ui-elements.js
View File

@@ -1032,7 +1032,7 @@ define([
if (!hashes || (!hashes.editHash && !hashes.viewHash)) { return; } if (!hashes || (!hashes.editHash && !hashes.viewHash)) { return; }
function createAccessRights(group_name) { var createAccessRights = function (group_name) {
var rights = [ var rights = [
h('label', Messages.share_linkAccess), h('label', Messages.share_linkAccess),
h('br'), h('br'),
@@ -1049,7 +1049,6 @@ define([
}; };
// Share link tab // Share link tab
var content = []; var content = [];
var sfContent = [ var sfContent = [
h('label', Messages.sharedFolders_share), h('label', Messages.sharedFolders_share),
@@ -1090,12 +1089,15 @@ define([
var parsed = Hash.parsePadUrl(href); var parsed = Hash.parsePadUrl(href);
return origin + parsed.getUrl({embed: embed, present: present}); return origin + parsed.getUrl({embed: embed, present: present});
}; };
var linkButtons = [{
var cancelButton = {
className: 'cancel', className: 'cancel',
name: Messages.cancel, name: Messages.cancel,
onClick: function () {}, onClick: function () {},
keys: [27] keys: [27]
}]; };
var linkButtons = [cancelButton];
var shareButtons = [{ var shareButtons = [{
className: 'primary', className: 'primary',
name: Messages.share_linkCopy, name: Messages.share_linkCopy,
@@ -1108,8 +1110,8 @@ define([
keys: [13] keys: [13]
}]; }];
if (!config.sharedFolder) { if (!config.sharedFolder) {
shareButtons.push({ shareButtons.unshift({
className: 'primary', className: 'secondary', // XXX style this diferently than cancel
name: Messages.share_linkOpen, name: Messages.share_linkOpen,
onClick: function () { onClick: function () {
saveValue(); saveValue();
@@ -1121,7 +1123,6 @@ define([
} }
var $link = $(link); var $link = $(link);
$link.append(UI.dialog.getButtons(shareButtons, config.onClose));
if (!hashes.editHash) { if (!hashes.editHash) {
$(link).find('#cp-share-editable-false').attr('checked', true); $(link).find('#cp-share-editable-false').attr('checked', true);
@@ -1136,6 +1137,12 @@ define([
$(link).find('#cp-share-link-preview').val(getLinkValue()); $(link).find('#cp-share-link-preview').val(getLinkValue());
}); });
// $link.append(UI.dialog.getButtons(shareButtons, config.onClose));
shareButtons.forEach(function(button){
linkButtons.push(button);
});
console.log(linkButtons);
var frameLink = UI.dialog.customModal(link, { var frameLink = UI.dialog.customModal(link, {
buttons: linkButtons, buttons: linkButtons,
onClose: config.onClose, onClose: config.onClose,
@@ -1156,8 +1163,10 @@ define([
$(friendsList).appendTo($contacts); $(friendsList).appendTo($contacts);
var contactButtons = [cancelButton]
var frameContacts = UI.dialog.customModal(contacts, { var frameContacts = UI.dialog.customModal(contacts, {
buttons: linkButtons, buttons: contactButtons,
onClose: config.onClose, onClose: config.onClose,
}); });
@@ -1174,12 +1183,8 @@ define([
h('br'), h('br'),
UI.dialog.selectable(getEmbedValue()) UI.dialog.selectable(getEmbedValue())
]); ]);
var embedButtons = [{ var embedButtons = [
className: 'cancel', cancelButton, {
name: Messages.cancel,
onClick: function () {},
keys: [27]
}, {
className: 'primary', className: 'primary',
name: Messages.share_linkCopy, name: Messages.share_linkCopy,
onClick: function () { onClick: function () {