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

Merge branch 'design_dialogs' into staging

Browse Source
This commit is contained in:
yflory
2019-11-22 17:26:53 +01:00
parent be7b184d97 0429859c26
commit 7e45f597c9
12 changed files with 298 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ define([
type: 'text',
'class': 'cp-text-input',
}, opt);
return h('input', attrs);
return h('p.msg', h('input', attrs));
};
dialog.nav = function (content) {
@@ -191,6 +191,10 @@ define([
if (!tab.content || !tab.title) { return; }
var content = h('div.alertify-tabs-content', tab.content);
var title = h('span.alertify-tabs-title', tab.title);
if (tab.icon) {
var icon = h('i', {class: tab.icon});
$(title).prepend(' ').prepend(icon);
}
$(title).click(function () {
titles.forEach(function (t) { $(t).removeClass('alertify-tabs-active'); });
contents.forEach(function (c) { $(c).removeClass('alertify-tabs-content-active'); });
@@ -344,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 () {