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

bower.json

@@ -44,7 +44,8 @@
     "open-sans-fontface": "^1.4.2",
     "bootstrap-tokenfield": "^0.12.1",
     "localforage": "^1.5.2",
-    "html2canvas": "^0.4.1"
+    "html2canvas": "^0.4.1",
+    "croppie": "^2.5.0"
   },
   "resolutions": {
     "bootstrap": "v4.0.0-alpha.6"

customize.dist/translations/messages.fr.js

@@ -298,6 +298,8 @@ define(function () {
     out.profile_namePlaceholder = 'Nom ou pseudo pour le profil';
     out.profile_avatar = "Avatar";
     out.profile_upload = " Importer un nouvel avatar";
+    out.profile_uploadSizeError = "Erreur : votre avatar doit avoir une taille inférieure à {0}";
+    out.profile_uploadTypeError = "Erreur : le format de votre avatar est invalide. Les formats autorisés sont : {0}";
     out.profile_error = "Erreur lors de la création du profil : {0}";
     out.profile_register = "Vous devez vous inscrire pour pouvoir créer un profil !";
     out.profile_create = "Créer un profil";

customize.dist/translations/messages.js

@@ -301,6 +301,8 @@ define(function () {
     out.profile_namePlaceholder = 'Name displayed in your profile';
     out.profile_avatar = "Avatar";
     out.profile_upload = " Upload a new avatar";
+    out.profile_uploadSizeError = "Error: your avatar must be smaller than {0}";
+    out.profile_uploadTypeError = "Error: your avatar type is not allowed. Allowed types are: {0}";
     out.profile_error = "Error while creating your profile: {0}";
     out.profile_register = "You have to sign up to create a profile!";
     out.profile_create = "Create a profile";

www/common/common-ui-elements.js

@@ -98,7 +98,13 @@ define([
                         target: data.target
                     };
                     if (data.filter && !data.filter(file)) {
-                        UI.log('Invalid avatar (type or size)');
+                        return;
+                    }
+                    if (data.transformer) {
+                        data.transformer(file, function (newFile) {
+                            data.FM.handleFile(newFile, ev);
+                            if (callback) { callback(); }
+                        });
                         return;
                     }
                     data.FM.handleFile(file, ev);

www/common/sframe-common-file.js

@@ -212,7 +212,9 @@ define([
             queue.next();
         };
 
-        var showNamePrompt = true;
+        // Don't show the rename prompt if we don't want to store the file in the drive (avatar)
+        var showNamePrompt = !config.noStore;
+
         var promptName = function (file, cb) {
             var extIdx = file.name.lastIndexOf('.');
             var name = extIdx !== -1 ? file.name.slice(0,extIdx) : file.name;

www/profile/app-profile.less

@@ -73,6 +73,9 @@
             margin: 5px;
         }
     }
+    .cp-app-profile-resizer {
+        text-align: center;
+    }
     #cp-app-profile-displayname, #cp-app-profile-link {
         width: 100%;
         height: 40px;

www/profile/inner.js

@@ -20,6 +20,8 @@ define([
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/customize/src/less2/main.less',
+    '/bower_components/croppie/croppie.min.js',
+    'css!/bower_components/croppie/croppie.css',
 ], function (
     $,
     Crypto,
@@ -253,12 +255,44 @@ define([
         createEditableInput($block, LINK_ID, placeholder, getValue, setValue);
     };
 
+    var AVATAR_SIZE_LIMIT = 0.5;
     var allowedMediaTypes = [
         'image/png',
         'image/jpeg',
         'image/jpg',
         'image/gif',
     ];
+    var transformAvatar = function (file, cb) {
+        if (file.type === 'image/gif') { return void cb(file); }
+        var $croppie = $('<div>', {
+            'class': 'cp-app-profile-resizer'
+        });
+
+        var todo = function () {
+            UI.confirm($croppie[0], function (yes) {
+                if (!yes) { return; }
+                $croppie.croppie('result', {
+                    type: 'blob',
+                    size: {width: 300, height: 300}
+                }).then(function(blob) {
+                    blob.lastModifiedDate = new Date();
+                    blob.name = 'avatar';
+                    cb(blob);
+                });
+            });
+        };
+
+        var reader = new FileReader();
+        reader.onload = function(e) {
+            $croppie.croppie({
+                url: e.target.result,
+                viewport: { width: 100, height: 100 },
+                boundary: { width: 400, height: 300 },
+            });
+            todo();
+        };
+        reader.readAsDataURL(file);
+    };
     var addAvatar = function ($container) {
         var $block = $('<div>', {id: AVATAR_ID}).appendTo($container);
         var $span = $('<span>').appendTo($block);
@@ -318,14 +352,30 @@ define([
             }
         };
         APP.FM = common.createFileManager(fmConfig);
+        var accepted = ".gif,.jpg,.jpeg,.png";
         var data = {
             FM: APP.FM,
             filter: function (file) {
                 var sizeMB = Util.bytesToMegabytes(file.size);
                 var type = file.type;
-                return sizeMB <= 0.5 && allowedMediaTypes.indexOf(type) !== -1;
+                // We can't resize .gif so we have to display an error if it is too big
+                if (sizeMB > AVATAR_SIZE_LIMIT && type === 'image/gif') {
+                    UI.log(Messages._getKey('profile_uploadSizeError', [
+                        Messages._getKey('formattedMB', [AVATAR_SIZE_LIMIT])
+                    ]));
+                    return false;
+                }
+                // Display an error if the image type is not allowed
+                if (allowedMediaTypes.indexOf(type) === -1) {
+                    UI.log(Messages._getKey('profile_uploadTypeError', [
+                        accepted.split(',').join(', ')
+                    ]));
+                    return false;
+                }
+                return true;
             },
-            accept: ".gif,.jpg,.jpeg,.png"
+            transformer: transformAvatar,
+            accept: accepted
         };
         var $upButton = common.createButton('upload', false, data);
         $upButton.text(Messages.profile_upload);