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

Merge remote-tracking branch 'origin/design_dialogs' into design_dialogs

Browse Source
This commit is contained in:
David Benqué
2019-11-22 16:03:50 +00:00
parent 754fa9dab2 82bb710060
commit 0429859c26
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/common-interface.js
View File

@@ -348,7 +348,8 @@ define([
if (!b.name || !b.onClick) { return; } if (!b.name || !b.onClick) { return; }
var button = h('button', { tabindex: '1', 'class': b.className || '' }, b.name); var button = h('button', { tabindex: '1', 'class': b.className || '' }, b.name);
$(button).click(function () { $(button).click(function () {
b.onClick(); var noClose = b.onClick();
if (noClose) { return; }
var $modal = $(button).parents('.alertify').first(); var $modal = $(button).parents('.alertify').first();
if ($modal.length && $modal[0].closeModal) { if ($modal.length && $modal[0].closeModal) {
$modal[0].closeModal(function () { $modal[0].closeModal(function () {

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

@@ -1103,6 +1103,7 @@ define([
embed: Util.isChecked($link.find('#cp-share-embed')) embed: Util.isChecked($link.find('#cp-share-embed'))
}); });
window.open(v); window.open(v);
return true;
}, },
keys: [[13, 'ctrl']] keys: [[13, 'ctrl']]
}, },