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

www/common/common-interface.js

@@ -386,7 +386,7 @@ define([
         };
     };
 
-    var LOADING = 'loading';
+    var LOADING = 'cp-loading';
 
     var getRandomTip = function () {
         if (!Messages.tips || !Object.keys(Messages.tips).length) { return ''; }
@@ -405,21 +405,21 @@ define([
             if (loadingText) {
                 $('#' + LOADING).find('p').text(loadingText);
             }
-            $container = $loading.find('.loadingContainer');
+            $container = $loading.find('.cp-loading-container');
         } else {
             $loading = $(Pages.loadingScreen());
-            $container = $loading.find('.loadingContainer');
+            $container = $loading.find('.cp-loading-container');
             if (hideLogo) {
                 $loading.find('img').hide();
             } else {
                 $loading.find('img').show();
             }
-            var $spinner = $loading.find('.spinnerContainer');
+            var $spinner = $loading.find('.cp-loading-spinner-container');
             $spinner.show();
             $('body').append($loading);
         }
         if (Messages.tips && !hideTips) {
-            var $loadingTip = $('<div>', {'id': 'loadingTip'});
+            var $loadingTip = $('<div>', {'id': 'cp-loading-tip'});
             $('<span>', {'class': 'tips'}).text(getRandomTip()).appendTo($loadingTip);
             $loadingTip.css({
                 'bottom': $('body').height()/2 - $container.height()/2 + 20 + 'px'
@@ -429,7 +429,7 @@ define([
     };
     UI.removeLoadingScreen = function (cb) {
         $('#' + LOADING).fadeOut(750, cb);
-        var $tip = $('#loadingTip').css('top', '')
+        var $tip = $('#cp-loading-tip').css('top', '')
         // loading.less sets transition-delay: $wait-time
         // and               transition: opacity $fadeout-time
             .css({
@@ -443,7 +443,7 @@ define([
     };
     UI.errorLoadingScreen = function (error, transparent) {
         if (!$('#' + LOADING).is(':visible')) { UI.addLoadingScreen({hideTips: true}); }
-        $('.spinnerContainer').hide();
+        $('.cp-loading-spinner-container').hide();
         if (transparent) { $('#' + LOADING).css('opacity', 0.8); }
         $('#' + LOADING).find('p').html(error || Messages.error);
     };

www/common/loading.js

@@ -1,13 +1,14 @@
 define([
-    'less!/customize/src/less/loading.less'
+    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/customize/src/less2/loading.less'
 ], function () {
     var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
     var elem = document.createElement('div');
-    elem.setAttribute('id', 'loading');
+    elem.setAttribute('id', 'cp-loading');
     elem.innerHTML = [
-        '<div class="loadingContainer">',
-            '<img class="cryptofist" src="/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs + '">',
-            '<div class="spinnerContainer">',
+        '<div class="cp-loading-container">',
+            '<img class="cp-loading-cryptofist" src="/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs + '">',
+            '<div class="cp-loading-spinner-container">',
                 '<span class="fa fa-circle-o-notch fa-spin fa-4x fa-fw"></span>',
             '</div>',
             '<p id="cp-loading-message"></p>',

www/common/sframe-common-codemirror.js

@@ -49,6 +49,7 @@ define([
             readOnly: true
         });
         editor.setValue(Messages.codeInitialState);
+        editor.focus();
 
         var setMode = exp.setMode = function (mode, cb) {
             exp.highlightMode = mode;

www/common/sframe-common-interface.js

@@ -200,20 +200,7 @@ define([
         return button;
     };
 
-
-    UI.getFileSize = function (Common, href, cb) {
-        var channelId = Cryptpad.hrefToHexChannelId(href);
-        Common.sendAnonRpcMsg("GET_FILE_SIZE", channelId, function (data) {
-            if (!data) { return void cb("No response"); }
-            if (data.error) { return void cb(data.error); }
-            if (data.response && data.response.length && typeof(data.response[0]) === 'number') {
-                return void cb(void 0, data.response[0]);
-            } else {
-                cb('INVALID_RESPONSE');
-            }
-        });
-    };
-
+    // Avatars
     UI.displayAvatar = function (Common, $container, href, name, cb) {
         var MutationObserver = window.MutationObserver;
         var displayDefault = function () {
@@ -229,7 +216,7 @@ define([
             var cryptKey = secret.keys && secret.keys.fileKeyStr;
             var hexFileName = Cryptpad.base64ToHex(secret.channel);
             var src = Cryptpad.getBlobPathFromHex(hexFileName);
-            UI.getFileSize(Common, href, function (e, data) {
+            Common.getFileSize(href, function (e, data) {
                 if (e) {
                     displayDefault();
                     return void console.error(e);
@@ -467,9 +454,13 @@ define([
         var metadataMgr = common.getMetadataMgr();
         var type = metadataMgr.getMetadataLazy().type;
         var sframeChan = common.getSframeChannel();
+        var focus;
 
         var onConfirm = function (yes) {
-            if (!yes) { return; }
+            if (!yes) {
+                if (focus) { focus.focus(); }
+                return;
+            }
             var first = true; // We can only pick a template once (for a new document)
             var fileDialogCfg = {
                 onSelect: function (data) {
@@ -480,6 +471,7 @@ define([
                             Cryptpad.removeLoadingScreen();
                             common.feedback('TEMPLATE_USED');
                         });
+                        if (focus) { focus.focus(); }
                         return;
                     }
                 }
@@ -494,6 +486,7 @@ define([
 
         sframeChan.query("Q_TEMPLATE_EXIST", type, function (err, data) {
             if (data) {
+                focus = document.activeElement;
                 Cryptpad.confirm(Messages.useTemplate, onConfirm, {
                     ok: Messages.useTemplateOK,
                     cancel: Messages.useTemplateCancel,

www/common/sframe-common.js

@@ -77,7 +77,6 @@ define([
     funcs.openTemplatePicker = callWithCommon(UI.openTemplatePicker);
     funcs.displayAvatar = callWithCommon(UI.displayAvatar);
     funcs.createButton = callWithCommon(UI.createButton);
-    funcs.getFileSize = callWithCommon(UI.getFileSize);
 
     // History
     funcs.getHistory = callWithCommon(History.create);
@@ -106,6 +105,19 @@ define([
         }
         return;
     };
+    funcs.getFileSize = function (href, cb) {
+        var channelId = Cryptpad.hrefToHexChannelId(href);
+        funcs.sendAnonRpcMsg("GET_FILE_SIZE", channelId, function (data) {
+            if (!data) { return void cb("No response"); }
+            if (data.error) { return void cb(data.error); }
+            if (data.response && data.response.length && typeof(data.response[0]) === 'number') {
+                return void cb(void 0, data.response[0]);
+            } else {
+                cb('INVALID_RESPONSE');
+            }
+        });
+    };
+
 
     // CodeMirror
     funcs.initCodeMirrorApp = callWithCommon(CodeMirror.create);

www/common/toolbar3.js

@@ -837,7 +837,7 @@ define([
     };
 
     // Events
-    var initClickEvents = function (toolbar, config) {
+    var initClickEvents = function (toolbar) {
         var removeDropdowns =  function () {
             window.setTimeout(function () {
                 toolbar.$toolbar.find('.cp-dropdown-content').hide();