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

Improve share modal customization to make it work with async functions

Browse Source
This commit is contained in:
yflory 2018-01-25 14:20:55 +01:00
parent fd4ed3ce3b
commit 3d3f58b3fc
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,8 +375,8 @@ define([
} }
if (val.embed) { $(link).find('#cp-share-embed').attr('checked', true); } if (val.embed) { $(link).find('#cp-share-embed').attr('checked', true); }
if (val.present) { $(link).find('#cp-share-present').attr('checked', true); } if (val.present) { $(link).find('#cp-share-present').attr('checked', true); }
UI.openCustomModal(UI.dialog.tabs(tabs));
}); });
return tabs;
}; };
UIElements.createFileShareModal = function (config) { UIElements.createFileShareModal = function (config) {
var origin = config.origin; var origin = config.origin;
@ -451,7 +451,7 @@ define([
pathname: pathname pathname: pathname
}); });
} }
UI.openCustomModal(UI.dialog.tabs(tabs)); return tabs;
}; };
UIElements.createButton = function (common, type, rightside, data, callback) { UIElements.createButton = function (common, type, rightside, data, callback) {

26
www/common/toolbar3.js
View File

@ -444,13 +444,14 @@ define([
'class': 'fa fa-share-alt cp-toolbar-share-button', 'class': 'fa fa-share-alt cp-toolbar-share-button',
title: Messages.shareButton title: Messages.shareButton
}); });
var modal = UIElements.createShareModal({
origin: origin,
pathname: pathname,
hashes: hashes,
common: Common
});
$shareBlock.click(function () { $shareBlock.click(function () {
UIElements.createShareModal({ UI.openCustomModal(UI.dialog.tabs(modal));
origin: origin,
pathname: pathname,
hashes: hashes,
common: Common
});
}); });
toolbar.$leftside.append($shareBlock); toolbar.$leftside.append($shareBlock);
@ -472,13 +473,14 @@ define([
'class': 'fa fa-share-alt cp-toolbar-share-button', 'class': 'fa fa-share-alt cp-toolbar-share-button',
title: Messages.shareButton title: Messages.shareButton
}); });
var modal = UIElements.createFileShareModal({
origin: origin,
pathname: pathname,
hashes: hashes,
common: Common
});
$shareBlock.click(function () { $shareBlock.click(function () {
UIElements.createFileShareModal({ UI.openCustomModal(UI.dialog.tabs(modal));
origin: origin,
pathname: pathname,
hashes: hashes,
common: Common
});
}); });
toolbar.$leftside.append($shareBlock); toolbar.$leftside.append($shareBlock);