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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-09-11 17:52:40 +02:00
parent 671c893e8a 5a4836fe6d
commit a74915ab58
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,6 +237,7 @@ define([
setTimeout(function () {
$ok.focus();
UI.notify();
if (!document.hasFocus()) { window.focus(); }
});
};
@@ -282,10 +283,11 @@ define([
setTimeout(function () {
input.select().focus();
UI.notify();
if (!document.hasFocus()) { window.focus(); }
});
};
UI.confirm = function (msg, cb, opt, force, styleCB) {
UI.confirm = function (msg, cb, opt, force) {
cb = cb || function () {};
opt = opt || {};
@@ -328,9 +330,10 @@ define([
document.body.appendChild(frame);
setTimeout(function () {
UI.notify();
if (typeof(styleCB) === 'function') {
styleCB($ok.closest('.dialog'));
if (typeof(opt.done) === 'function') {
opt.done($ok.closest('.dialog'));
}
if (!document.hasFocus()) { window.focus(); }
});
};

5
www/common/sframe-common-interface.js
View File

@@ -490,7 +490,10 @@ define([
sframeChan.query("Q_TEMPLATE_EXIST", type, function (err, data) {
if (data) {
Cryptpad.confirm(Messages.useTemplate, onConfirm);
Cryptpad.confirm(Messages.useTemplate, onConfirm, {
ok: Messages.useTemplateOK,
cancel: Messages.useTemplateCancel,
});
}
});
};

2
www/common/sframe-common-title.js
View File

@@ -34,7 +34,7 @@ define(['jquery'], function ($) {
exp.updateTitle = function (newTitle, cb) {
cb = cb || $.noop;
if (newTitle === exp.title) { return; }
if (newTitle === exp.title) { return void cb(); }
metadataMgr.updateTitle(newTitle);
titleUpdated = cb;
};

7
www/register/main.js
View File

@@ -217,9 +217,10 @@ define([
cancelClass: 'safe',
okClass: 'danger',
reverseOrder: true,
}, true, function ($dialog) {
$dialog.find('> div').addClass('half');
});
done: function ($dialog) {
$dialog.find('> div').addClass('half');
},
}, true);
}, 150);
});