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

customize.dist/translations/messages.js

@@ -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";
 

www/common/common-interface.js

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

www/common/sframe-common-interface.js

@@ -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,
+                });
             }
         });
     };

www/common/sframe-common-title.js

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

www/register/main.js

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