blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit a74915ab58
5 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
customize.dist/translations/messages.js
View file

@ -131,7 +131,9 @@ define(function () {
out.saveTemplatePrompt = "Choose a title for the template";
out.templateSaved = "Template saved!";
out.selectTemplate = "Select a template or press escape";
out.useTemplate = "You have available templates for that type of pad. Do you want to use one?";
out.useTemplate = "Start with a template?"; //Would you like to "You have available templates for this type of pad. Do you want to use one?";
out.useTemplateOK = 'Pick a template (Enter)';
out.useTemplateCancel = 'Start fresh (Esc)';
out.previewButtonTitle = "Display or hide the Markdown preview mode";

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);
});