From a98353af6c299c352c5112f270e6e52909b0ff6e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Jun 2017 15:55:03 +0200
Subject: [PATCH] Add a button to upload a file in the drive

---
 customize.dist/translations/messages.fr.js |  2 ++
 customize.dist/translations/messages.js    |  2 ++
 www/common/common-file.js                  |  1 -
 www/drive/main.js                          | 27 +++++++++++++++++++++-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 41423fe57..4c5ba9fc9 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -107,6 +107,8 @@ define(function () {
 
     out.newButton = 'Nouveau';
     out.newButtonTitle = 'Créer un nouveau pad';
+    out.uploadButton = 'Upload';
+    out.uploadButtonTitle = 'Uploader un nouveau fichier dans le dossier actuel';
 
     out.saveTemplateButton = "Sauver en tant que modèle";
     out.saveTemplatePrompt = "Choisir un titre pour ce modèle";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index c549a6009..ceade6204 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -109,6 +109,8 @@ define(function () {
 
     out.newButton = 'New';
     out.newButtonTitle = 'Create a new pad';
+    out.uploadButton = 'Upload';
+    out.uploadButtonTitle = 'Upload a new file to the current folder';
 
     out.saveTemplateButton = "Save as template";
     out.saveTemplatePrompt = "Choose a title for the template";
diff --git a/www/common/common-file.js b/www/common/common-file.js
index bb345565d..43d7cff2a 100644
--- a/www/common/common-file.js
+++ b/www/common/common-file.js
@@ -223,7 +223,6 @@ define([
         };
 
         var handleFile = File.handleFile = function (file, e) {
-            console.log(file);
             var reader = new FileReader();
             reader.onloadend = function () {
                 queue.push({
diff --git a/www/drive/main.js b/www/drive/main.js
index b93086262..0d1f6c0e3 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1441,6 +1441,30 @@ define([
             return $block;
         };
 
+        var createUploadButton = function () {
+            var inTrash = filesOp.isPathIn(currentPath, [TRASH]);
+            var $icon = $('<span>', {
+                'class': 'fa fa-upload'
+            });
+            var $input = $('<input>', {
+                'type': 'file',
+                'style': 'display: none;'
+            }).on('change', function (e) {
+                var file = e.target.files[0];
+                var ev = {
+                    target: $content[0]
+                };
+                APP.FM.handleFile(file, ev);
+            });
+            var $button = $('<button>', {
+                'class': 'btn btn-primary new',
+                title: Messages.uploadButtonTitle
+            }).append($icon).append(' '+Messages.uploadButton).click(function () {
+                $input.click();
+            });
+            return $button;
+        };
+
         var hideNewButton = function () {
             $iframe.find('.dropdown-bar-content').hide();
         };
@@ -1877,6 +1901,7 @@ define([
 
             // NewButton can be undefined if we're in read only mode
             $toolbar.find('.leftside').append(createNewButton(isInRoot));
+            $toolbar.find('.leftside').append(createUploadButton());
 
 
             var $folderHeader = getFolderListHeader();
@@ -2700,7 +2725,7 @@ define([
 
             var userList = APP.userList = info.userList;
             var config = {
-                displayed: ['useradmin', 'spinner', 'lag', 'state', 'limit'],
+                displayed: ['useradmin', 'spinner', 'lag', 'state', 'limit', 'newpad'],
                 userList: {
                     list: userList,
                     userNetfluxId: info.myID