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

pull/1/head
David Benqué 5 years ago
commit 0429859c26

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

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

Loading…
Cancel
Save