From a6c49cd65c053ae3931ced9dd7be0f7db146cc3b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 10:49:59 +0200
Subject: [PATCH 1/8] Fix undefined title in slides present mode

---
 www/slide/main.js  | 4 ++--
 www/slide/slide.js | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/slide/main.js b/www/slide/main.js
index 3b01ae9fd..b3d1209fd 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -491,11 +491,11 @@ define([
 
                 Slide.onChange(function (o, n, l) {
                     if (n !== null) {
-                        document.title = APP.title + ' (' + (++n) + '/' + l +  ')';
+                        document.title = Title.title + ' (' + (++n) + '/' + l +  ')';
                         return;
                     }
                     console.log("Exiting presentation mode");
-                    document.title = APP.title;
+                    document.title = Title.title;
                 });
 
                 Cryptpad.removeLoadingScreen();
diff --git a/www/slide/slide.js b/www/slide/slide.js
index c9e6f3dcd..912820390 100644
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -211,7 +211,10 @@ define([
             $(ifrw).focus();
             change(null, Slide.index);
             if (!isPresentURL()) {
-                window.location.hash += '/present';
+                if (window.location.href.slice(-1) !== '/') {
+                    window.location.hash += '/';
+                }
+                window.location.hash += 'present';
             }
             $pad.contents().find('.cryptpad-present-button').hide();
             $pad.contents().find('.cryptpad-source-button').show();
@@ -220,7 +223,7 @@ define([
             $('.top-bar').hide();
             return;
         }
-        window.location.hash = window.location.hash.replace(/\/present$/, '');
+        window.location.hash = window.location.hash.replace(/\/present$/, '/');
         change(Slide.index, null);
         $pad.contents().find('.cryptpad-present-button').show();
         $pad.contents().find('.cryptpad-source-button').hide();

From 6a8153aca36918977f07bebc106ccf859326a754 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 11:44:58 +0200
Subject: [PATCH 2/8] Fix selection issues in the drive with Chrome

---
 www/drive/file.css   |  3 +++
 www/drive/file.less  |  4 ++++
 www/drive/inner.html |  2 +-
 www/drive/main.js    | 31 +++++++++++++++++++++++--------
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/www/drive/file.css b/www/drive/file.css
index 431cecd60..fed050db1 100644
--- a/www/drive/file.css
+++ b/www/drive/file.css
@@ -43,6 +43,9 @@ body {
     margin-top: 0.5em;
   }
 }
+div:focus {
+  outline: none;
+}
 .fa {
   /*min-width: 17px;*/
   margin-right: 3px;
diff --git a/www/drive/file.less b/www/drive/file.less
index fc6985802..fe506ae35 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -70,6 +70,10 @@ body {
     }
 }
 
+div:focus {
+    outline: none;
+}
+
 .fa {
     /*min-width: 17px;*/
     margin-right: 3px;
diff --git a/www/drive/inner.html b/www/drive/inner.html
index 859ae3391..c7f63f860 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -14,7 +14,7 @@
     <div class="app-container" tabindex="0">
         <div id="tree">
         </div>
-        <div id="content">
+        <div id="content" tabindex="2">
         </div>
         <div id="treeContextMenu" class="contextMenu dropdown clearfix">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
diff --git a/www/drive/main.js b/www/drive/main.js
index 39b5450fc..fe57a02c4 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -297,6 +297,7 @@ define([
         };
         $content.on('mousedown', function (e) {
             if (e.which !== 1) { return; }
+            $content.focus();
             sel.down = true;
             if (!e.ctrlKey) { removeSelected(); }
             var rect = e.currentTarget.getBoundingClientRect();
@@ -359,13 +360,15 @@ define([
             };
             $content.mousemove(sel.move);
         });
-        $content.on('mouseup', function (e) {
+        $(ifrw).on('mouseup', function (e) {
+            if (!sel.down) { return; }
             if (e.which !== 1) { return; }
             sel.down = false;
             sel.$selectBox.hide();
             $content.off('mousemove', sel.move);
             delete sel.move;
             $content.find('.selectedTmp').removeClass('selectedTmp').addClass('selected');
+            e.stopPropagation();
         });
 
         $(ifrw).keydown(function (e) {
@@ -560,7 +563,7 @@ define([
 
         var filterContextMenu = function ($menu, paths) {
             //var path = $element.data('path');
-            if (!paths || paths.length === 0) { console.error('no paths'); }
+            if (!paths || paths.length === 0) { logError('no paths'); }
 
             var hide = [];
             var hasFolder = false;
@@ -2028,16 +2031,19 @@ define([
         var search = APP.Search = {};
         var createSearch = function ($container) {
             var isInSearch = currentPath[0] === SEARCH;
-            var $div = $('<div>', {'id': 'searchContainer'});
+            var $div = $('<div>', {'id': 'searchContainer', 'class': 'unselectable'});
             var $input = $('<input>', {
                 id: 'searchInput',
                 type: 'text',
+                draggable: false,
+                tabindex: 1,
                 placeholder: Messages.fm_searchPlaceholder
             }).keyup(function (e) {
                 if (search.to) { window.clearTimeout(search.to); }
                 if ([38, 39, 40, 41].indexOf(e.which) !== -1) {
                     if (!$input.val()) {
                         $input.blur();
+                        $content.focus();
                         return;
                     } else {
                         e.stopPropagation();
@@ -2163,7 +2169,7 @@ define([
                 Cryptpad.getFileSize(el, function (e, bytes) {
                     if (e) {
                         // there was a problem with the RPC
-                        console.error(e);
+                        logError(e);
 
                         // but we don't want to break the interface.
                         // continue as if there was no RPC
@@ -2239,7 +2245,7 @@ define([
                 if (paths.length !== 1) { return; }
                 var el = filesOp.find(paths[0].path);
                 getProperties(el, function (e, $prop) {
-                    if (e) { return void console.error(e); }
+                    if (e) { return void logError(e); }
                     Cryptpad.alert('', undefined, true);
                     $('.alertify .msg').html("").append($prop);
                 });
@@ -2279,7 +2285,7 @@ define([
                 if (paths.length !== 1) { return; }
                 var el = filesOp.find(paths[0].path);
                 getProperties(el, function (e, $prop) {
-                    if (e) { return void console.error(e); }
+                    if (e) { return void logError(e); }
                     Cryptpad.alert('', undefined, true);
                     $('.alertify .msg').html("").append($prop);
                 });
@@ -2369,9 +2375,18 @@ define([
             module.hideMenu();
         });
 
-        $appContainer.on('mousedown', function (e) {
+        // Chrome considers the double-click means "select all" in the window
+        $content.on('mousedown', function (e) {
+            $content.focus();
+            e.preventDefault();
+        });
+        $appContainer.on('mouseup', function (e) {
+            if (sel.down) { return; }
             if (e.which !== 1) { return ; }
             removeSelected(e);
+        });
+        $appContainer.on('click', function (e) {
+            if (e.which !== 1) { return ; }
             removeInput();
             module.hideMenu(e);
             hideNewButton();
@@ -2676,7 +2691,7 @@ define([
                     history.onEnterHistory(obj);
                 } catch (e) {
                     // Probably a parse error
-                    console.error(e);
+                    logError(e);
                 }
             };
             histConfig.onClose = function () {

From c00158d23a3ee4119277d73834944c39d47705e1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 13:39:14 +0200
Subject: [PATCH 3/8] Move code to common-history

---
 www/code/main.js             | 33 ++++++++-------------------------
 www/common/common-history.js | 32 ++++++++++++++++++++++++++------
 www/drive/main.js            | 34 ++++++++++------------------------
 www/pad/main.js              | 30 ++++++------------------------
 www/slide/main.js            | 35 +++++++++--------------------------
 5 files changed, 59 insertions(+), 105 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index d8b9903f4..85cd26db3 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -150,34 +150,17 @@ define([
                 }
 
                 /* add a history button */
-                var histConfig = {};
-                histConfig.onRender = function (val) {
-                    if (typeof val === "undefined") { return; }
-                    try {
-                        var hjson = JSON.parse(val || '{}');
-                        var remoteDoc = hjson.content;
+                var histConfig = {
+                    onLocal: config.onLocal(),
+                    onRemote: config.onRemote(),
+                    setHistory: setHistory,
+                    applyVal: function (val) {
+                        var remoteDoc = JSON.parse(val || '{}').content;
                         editor.setValue(remoteDoc || '');
                         editor.save();
-                    } catch (e) {
-                        // Probably a parse error
-                        console.error(e);
-                    }
-                };
-                histConfig.onClose = function () {
-                    // Close button clicked
-                    setHistory(false, true);
-                };
-                histConfig.onRevert = function () {
-                    // Revert button clicked
-                    setHistory(false, false);
-                    config.onLocal();
-                    config.onRemote();
-                };
-                histConfig.onReady = function () {
-                    // Called when the history is loaded and the UI displayed
-                    setHistory(true);
+                    },
+                    $toolbar: $bar
                 };
-                histConfig.$toolbar = $bar;
                 var $hist = Cryptpad.createButton('history', true, {histConfig: histConfig});
                 $rightside.append($hist);
 
diff --git a/www/common/common-history.js b/www/common/common-history.js
index 1cd0e6555..8597598c1 100644
--- a/www/common/common-history.js
+++ b/www/common/common-history.js
@@ -24,7 +24,6 @@ define([
 
         var wcId = common.hrefToHexChannelId(config.href || window.location.href);
 
-        console.log(wcId);
         var createRealtime = function () {
             return ChainPad.create({
                 userName: 'history',
@@ -80,11 +79,32 @@ define([
         if (History.loading) { return void console.error("History is already being loaded..."); }
         History.loading = true;
         var $toolbar = config.$toolbar;
-        var noFunc = function () {};
-        var render = config.onRender || noFunc;
-        var onClose = config.onClose || noFunc;
-        var onRevert = config.onRevert || noFunc;
-        var onReady = config.onReady || noFunc;
+
+        if (!config.applyVal || !config.setHistory || !config.onLocal || !config.onRemote) {
+            throw new Error("Missing config element: applyVal, onLocal, onRemote, setHistory");
+        }
+
+        // config.setHistory(bool, bool)
+        // - bool1: history value
+        // - bool2: reset old content?
+        var render = function (val) {
+            if (typeof val === "undefined") { return; }
+            try {
+                config.applyVal(val);
+            } catch (e) {
+                // Probably a parse error
+                console.error(e);
+            }
+        };
+        var onClose = function () { config.setHistory(false, true); };
+        var onRevert = function () {
+            config.setHistory(false, false);
+            config.onLocal();
+            config.onRemote();
+        };
+        var onReady = function () {
+            config.setHistory(true);
+        };
 
         var Messages = common.Messages;
 
diff --git a/www/drive/main.js b/www/drive/main.js
index fe57a02c4..9e88fc5f0 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -2529,7 +2529,6 @@ define([
         setEditable(!bool);
         if (!bool && update) {
             history.onLeaveHistory();
-            //init(); //TODO real proxy here
         }
     };
 
@@ -2682,33 +2681,20 @@ define([
             }
 
             /* add a history button */
-            var histConfig = {};
-            histConfig.onRender = function (val) {
-                if (typeof val === "undefined") { return; }
-                try {
+            var histConfig = {
+                onLocal: function () {
+                    proxy.drive = history.currentObj.drive;
+                },
+                onRemote: function () {},
+                setHistory: setHistory,
+                applyVal: function (val) {
                     var obj = JSON.parse(val || '{}');
                     history.currentObj = obj;
                     history.onEnterHistory(obj);
-                } catch (e) {
-                    // Probably a parse error
-                    logError(e);
-                }
-            };
-            histConfig.onClose = function () {
-                // Close button clicked
-                setHistory(false, true);
-            };
-            histConfig.onRevert = function () {
-                // Revert button clicked
-                setHistory(false, false);
-                proxy.drive = history.currentObj.drive;
-            };
-            histConfig.onReady = function () {
-                // Called when the history is loaded and the UI displayed
-                setHistory(true);
+                },
+                $toolbar: APP.$bar,
+                href: window.location.origin + window.location.pathname + APP.hash
             };
-            histConfig.$toolbar = APP.$bar;
-            histConfig.href = window.location.origin + window.location.pathname + APP.hash;
             var $hist = Cryptpad.createButton('history', true, {histConfig: histConfig});
             $rightside.append($hist);
 
diff --git a/www/pad/main.js b/www/pad/main.js
index 50e35f2dc..635ea0087 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -499,31 +499,13 @@ define([
                 }
 
                 /* add a history button */
-                var histConfig = {};
-                histConfig.onRender = function (val) {
-                    if (typeof val === "undefined") { return; }
-                    try {
-                        applyHjson(val || '["BODY",{},[]]');
-                    } catch (e) {
-                        // Probably a parse error
-                        console.error(e);
-                    }
-                };
-                histConfig.onClose = function () {
-                    // Close button clicked
-                    setHistory(false, true);
-                };
-                histConfig.onRevert = function () {
-                    // Revert button clicked
-                    setHistory(false, false);
-                    realtimeOptions.onLocal();
-                    realtimeOptions.onRemote();
-                };
-                histConfig.onReady = function () {
-                    // Called when the history is loaded and the UI displayed
-                    setHistory(true);
+                var histConfig = {
+                    onLocal: realtimeOptions.onLocal(),
+                    onRemote: realtimeOptions.onRemote(),
+                    setHistory: setHistory,
+                    applyVal: function (val) { applyHjson(val || '["BODY",{},[]]'); },
+                    $toolbar: $bar
                 };
-                histConfig.$toolbar = $bar;
                 var $hist = Cryptpad.createButton('history', true, {histConfig: histConfig});
                 $rightside.append($hist);
 
diff --git a/www/slide/main.js b/www/slide/main.js
index b3d1209fd..ad80f03d7 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -293,34 +293,17 @@ define([
                 }
 
                 /* add a history button */
-                var histConfig = {};
-                histConfig.onRender = function (val) {
-                    if (typeof val === "undefined") { return; }
-                    try {
-                        var hjson = JSON.parse(val || '{}');
-                        var remoteDoc = hjson.content;
+                var histConfig = {
+                    onLocal: config.onLocal(),
+                    onRemote: config.onRemote(),
+                    setHistory: setHistory,
+                    applyVal: function (val) {
+                        var remoteDoc = JSON.parse(val || '{}').content;
                         editor.setValue(remoteDoc || '');
                         editor.save();
-                    } catch (e) {
-                        // Probably a parse error
-                        console.error(e);
-                    }
-                };
-                histConfig.onClose = function () {
-                    // Close button clicked
-                    setHistory(false, true);
-                };
-                histConfig.onRevert = function () {
-                    // Revert button clicked
-                    setHistory(false, false);
-                    config.onLocal();
-                    config.onRemote();
-                };
-                histConfig.onReady = function () {
-                    // Called when the history is loaded and the UI displayed
-                    setHistory(true);
-                };
-                histConfig.$toolbar = $bar;
+                    },
+                    $toolbar: $bar
+                }
                 var $hist = Cryptpad.createButton('history', true, {histConfig: histConfig});
                 $rightside.append($hist);
 

From 96ccb943979e28ef201ef9196440f2fe3889e9bc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 14:44:01 +0200
Subject: [PATCH 4/8] Add the share button when a file upload is complete

---
 www/common/toolbar2.js |  5 +--
 www/file/main.js       | 75 ++++++++++++++----------------------------
 2 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 9d7d43aa9..49e2376e8 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -367,7 +367,7 @@ define([
         return "Loading share button";
     };
 
-    var createFileShare = function () {
+    var createFileShare = function (toolbar) {
         if (!window.location.hash) {
             throw new Error("Unable to display the share button: hash required in the URL");
         }
@@ -380,6 +380,7 @@ define([
             if (success) { Cryptpad.log(Messages.shareSuccess); }
         });
 
+        toolbar.$leftside.append($button);
         return $button;
     };
 
@@ -852,7 +853,7 @@ define([
         tb['useradmin'] = createUserAdmin;
 
 
-        var addElement = function (arr, additionnalCfg, init) {
+        var addElement = toolbar.addElement = function (arr, additionnalCfg, init) {
             if (typeof additionnalCfg === "object") { $.extend(true, config, additionnalCfg); }
             arr.forEach(function (el) {
                 if (typeof el !== "string" || !el.trim()) { return; }
diff --git a/www/file/main.js b/www/file/main.js
index 223fcc41e..a8e7da517 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -2,7 +2,7 @@ define([
     'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
-    '/common/toolbar.js',
+    '/common/toolbar2.js',
     '/common/cryptpad-common.js',
     '/common/visible.js',
     '/common/notify.js',
@@ -24,6 +24,8 @@ define([
 
     Cryptpad.addLoadingScreen();
 
+    var Title;
+
     var myFile;
     var myDataType;
 
@@ -68,17 +70,13 @@ define([
                             var uri = ['', 'blob', id.slice(0,2), id].join('/');
                             console.log("encrypted blob is now available as %s", uri);
 
-                            // TODO use cryptpad-common utilities
-                            window.location.hash = [
-                                '',
-                                2,
-                                Cryptpad.hexToBase64(id).replace(/\//g, '-'),
-                                Nacl.util.encodeBase64(key).replace(/\//g, '-'),
-                                ''
-                            ].join('/');
+                            var b64Key = Nacl.util.encodeBase64(key);
+                            window.location.hash = Cryptpad.getFileHashFromKeys(id, ib64key);
 
                             $form.hide();
 
+                            APP.toolbar.addElement(['fileshare'], {});
+
                             // check if the uploaded file can be decrypted
                             var newU8 = FileCrypto.joinChunks(chunks);
                             FileCrypto.decrypt(newU8, key, function (e, res) {
@@ -88,7 +86,8 @@ define([
                                 myDataType = res.metadata.type;
 
                                 var defaultName = Cryptpad.getDefaultName(Cryptpad.parsePadUrl(window.location.href));
-                                APP.updateTitle(title || defaultName);
+                                Title.updateTitle(title || defaultName);
+                                APP.toolbar.title.show();
                                 Cryptpad.alert("successfully uploaded: " + title);
                             });
                         });
@@ -133,9 +132,6 @@ define([
             uploadMode = true;
         }
 
-        var parsed = Cryptpad.parsePadUrl(window.location.href);
-        var defaultName = Cryptpad.getDefaultName(parsed);
-
         var getTitle = function () {
             var pad = Cryptpad.getRelativeHref(window.location.href);
             var fo = Cryptpad.getStore().getProxy().fo;
@@ -143,27 +139,6 @@ define([
             return data ? data.title : undefined;
         };
 
-        var updateTitle = APP.updateTitle = function (newTitle) {
-            Cryptpad.renamePad(newTitle, function (err, data) {
-                if (err) {
-                    console.log("Couldn't set pad title");
-                    console.error(err);
-                    return;
-                }
-                document.title = newTitle;
-                $bar.find('.' + Toolbar.constants.title).find('span.title').text(data);
-                $bar.find('.' + Toolbar.constants.title).find('input').val(data);
-            });
-        };
-
-        var suggestName = function () {
-            return document.title || getTitle() || '';
-        };
-
-        var renameCb = function (err, title) {
-            document.title = title;
-        };
-
         var exportFile = function () {
             var suggestion = document.title;
             Cryptpad.prompt(Messages.exportPrompt,
@@ -174,33 +149,33 @@ define([
             });
         };
 
-        var displayed = ['useradmin', 'newpad', 'limit'];
+        Title = Cryptpad.createTitle({}, function(){}, Cryptpad);
+
+        var displayed = ['title', 'useradmin', 'newpad', 'limit'];
         if (secret && hexFileName) {
-            displayed.push('share');
+            displayed.push('fileshare');
         }
 
         var configTb = {
             displayed: displayed,
             ifrw: ifrw,
             common: Cryptpad,
-            title: {
-                onRename: renameCb,
-                defaultName: defaultName,
-                suggestName: suggestName
-            },
-            share: {
-                secret: secret,
-                channel: hexFileName
-            },
-            hideDisplayName: true
+            title: Title.getTitleConfig(),
+            hideDisplayName: true,
+            $container: $bar
         };
-        Toolbar.create($bar, null, null, null, null, configTb);
-        var $rightside = $bar.find('.' + Toolbar.constants.rightside);
+        var toolbar = APP.toolbar = Toolbar.create(configTb);
+
+        Title.setToolbar(toolbar);
+
+        if (uploadMode) { toolbar.title.hide(); }
+
+        var $rightside = toolbar.$rightside;
 
         var $export = Cryptpad.createButton('export', true, {}, exportFile);
         $rightside.append($export);
 
-        updateTitle(Cryptpad.initialName || getTitle() || defaultName);
+        Title.updateTitle(Cryptpad.initialName || getTitle() || Title.defaultTitle);
 
         if (!uploadMode) {
             var src = Cryptpad.getBlobPathFromHex(hexFileName);
@@ -219,7 +194,7 @@ define([
                     var title = document.title = data.metadata.name;
                     myFile = data.content;
                     myDataType = data.metadata.type;
-                    updateTitle(title || defaultName);
+                    Title.updateTitle(title || Title.defaultTitle);
                     Cryptpad.removeLoadingScreen();
                 });
             });

From 3c4b6a89d2ca7b7685a94474421ed571e58c5cc0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 14:48:15 +0200
Subject: [PATCH 5/8] Fix a conflict with the arrow keys and renaming a folder
 in the tree

---
 www/drive/main.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/drive/main.js b/www/drive/main.js
index 9e88fc5f0..97a48d79d 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -523,6 +523,10 @@ define([
                     placeholder: name,
                     value: name
                 }).data('path', path);
+
+                // Stop propagation on keydown to avoid issues with arrow keys
+                $input.on('keydown', function (e) { e.stopPropagation(); });
+
                 $input.on('keyup', function (e) {
                     if (e.which === 13) {
                         removeInput(true);

From 1e4fc5a979f5cedd35450d4ddbd0a15ee2b2217d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 14:56:50 +0200
Subject: [PATCH 6/8] lint

---
 www/file/main.js  | 2 +-
 www/slide/main.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/file/main.js b/www/file/main.js
index a8e7da517..ffb143b73 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -71,7 +71,7 @@ define([
                             console.log("encrypted blob is now available as %s", uri);
 
                             var b64Key = Nacl.util.encodeBase64(key);
-                            window.location.hash = Cryptpad.getFileHashFromKeys(id, ib64key);
+                            window.location.hash = Cryptpad.getFileHashFromKeys(id, b64key);
 
                             $form.hide();
 
diff --git a/www/slide/main.js b/www/slide/main.js
index ad80f03d7..b5dd26704 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -303,7 +303,7 @@ define([
                         editor.save();
                     },
                     $toolbar: $bar
-                }
+                };
                 var $hist = Cryptpad.createButton('history', true, {histConfig: histConfig});
                 $rightside.append($hist);
 

From 5c8586f8a32c4c0f50157145075716fca79bee11 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 15:00:05 +0200
Subject: [PATCH 7/8] Fix typo in file upload

---
 www/common/cryptpad-common.js | 1 +
 www/file/main.js              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index a1daa8b17..73b51e8b3 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -84,6 +84,7 @@ define([
 
     common.getEditHashFromKeys = Hash.getEditHashFromKeys;
     common.getViewHashFromKeys = Hash.getViewHashFromKeys;
+    common.getFileHashFromKeys = Hash.getFileHashFromKeys;
     common.getSecrets = Hash.getSecrets;
     common.getHashes = Hash.getHashes;
     common.createChannelId = Hash.createChannelId;
diff --git a/www/file/main.js b/www/file/main.js
index ffb143b73..66e0f6c25 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -71,7 +71,7 @@ define([
                             console.log("encrypted blob is now available as %s", uri);
 
                             var b64Key = Nacl.util.encodeBase64(key);
-                            window.location.hash = Cryptpad.getFileHashFromKeys(id, b64key);
+                            window.location.hash = Cryptpad.getFileHashFromKeys(id, b64Key);
 
                             $form.hide();
 

From 5a21be81123c53b5b633198ff7ac67ec8579f589 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 May 2017 15:54:09 +0200
Subject: [PATCH 8/8] Improve UI on mobile

---
 customize.dist/main.css              |   5 ++
 customize.dist/main.js               |  93 ++++++++++++-----------
 customize.dist/src/less/loading.less |   3 +
 www/drive/main.js                    |   4 +-
 www/login/main.js                    | 107 +++++++++++++-------------
 www/register/main.js                 | 108 ++++++++++++++-------------
 6 files changed, 171 insertions(+), 149 deletions(-)

diff --git a/customize.dist/main.css b/customize.dist/main.css
index 026649207..d54ec6a98 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -388,6 +388,11 @@
   right: 0;
   text-align: center;
 }
+@media screen and (max-height: 600px) {
+  .cp #loadingTip {
+    display: none;
+  }
+}
 .cp #loadingTip span {
   background-color: #302B28;
   color: #fafafa;
diff --git a/customize.dist/main.js b/customize.dist/main.js
index cdaeedfdb..088e1f51a 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -119,54 +119,57 @@ define([
         });
 
         $('button.login').click(function () {
-            Cryptpad.addLoadingScreen(Messages.login_hashing);
-            // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
+            // setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
             window.setTimeout(function () {
-                loginReady(function () {
-                    var uname = $uname.val();
-                    var passwd = $passwd.val();
-                    Login.loginOrRegister(uname, passwd, false, function (err, result) {
-                        if (!err) {
-                            var proxy = result.proxy;
-
-                            // successful validation and user already exists
-                            // set user hash in localStorage and redirect to drive
-                            if (proxy && !proxy.login_name) {
-                                proxy.login_name = result.userName;
-                            }
-
-                            proxy.edPrivate = result.edPrivate;
-                            proxy.edPublic = result.edPublic;
-
-                            Cryptpad.whenRealtimeSyncs(result.realtime, function () {
-                                Cryptpad.login(result.userHash, result.userName, function () {
-                                    document.location.href = '/drive/';
-                                });
-                            });
-                            return;
-                        }
-                        switch (err) {
-                            case 'NO_SUCH_USER':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_noSuchUser);
-                                });
-                                break;
-                            case 'INVAL_USER':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_invalUser);
+                Cryptpad.addLoadingScreen(Messages.login_hashing);
+                // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
+                window.setTimeout(function () {
+                    loginReady(function () {
+                        var uname = $uname.val();
+                        var passwd = $passwd.val();
+                        Login.loginOrRegister(uname, passwd, false, function (err, result) {
+                            if (!err) {
+                                var proxy = result.proxy;
+
+                                // successful validation and user already exists
+                                // set user hash in localStorage and redirect to drive
+                                if (proxy && !proxy.login_name) {
+                                    proxy.login_name = result.userName;
+                                }
+
+                                proxy.edPrivate = result.edPrivate;
+                                proxy.edPublic = result.edPublic;
+
+                                Cryptpad.whenRealtimeSyncs(result.realtime, function () {
+                                    Cryptpad.login(result.userHash, result.userName, function () {
+                                        document.location.href = '/drive/';
+                                    });
                                 });
-                                break;
-                            case 'INVAL_PASS':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_invalPass);
-                                });
-                                break;
-                            default: // UNHANDLED ERROR
-                                Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
-                        }
+                                return;
+                            }
+                            switch (err) {
+                                case 'NO_SUCH_USER':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_noSuchUser);
+                                    });
+                                    break;
+                                case 'INVAL_USER':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_invalUser);
+                                    });
+                                    break;
+                                case 'INVAL_PASS':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_invalPass);
+                                    });
+                                    break;
+                                default: // UNHANDLED ERROR
+                                    Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
+                            }
+                        });
                     });
-                });
-            }, 0);
+                }, 0);
+            }, 100);
         });
         /* End Log in UI */
 
diff --git a/customize.dist/src/less/loading.less b/customize.dist/src/less/loading.less
index b48045622..6dcf2491a 100644
--- a/customize.dist/src/less/loading.less
+++ b/customize.dist/src/less/loading.less
@@ -36,6 +36,9 @@
     left: 0;
     right: 0;
     text-align: center;
+    @media screen and (max-height: @media-medium-screen) {
+        display: none;
+    }
     span {
         background-color: @bg-loading;
         color: @color-loading;
diff --git a/www/drive/main.js b/www/drive/main.js
index 97a48d79d..d4ac6cce2 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -770,6 +770,7 @@ define([
 
         var displayMenu = function (e, $menu) {
             $menu.css({ display: "block" });
+            if (APP.mobile()) { return; }
             var h = $menu.outerHeight();
             var w = $menu.outerWidth();
             var wH = window.innerHeight;
@@ -1792,7 +1793,7 @@ define([
             module.resetTree();
 
             // in history mode we want to focus the version number input
-            if (!history.isHistoryMode) { $tree.find('#searchInput').focus(); }
+            if (!history.isHistoryMode && !APP.mobile()) { $tree.find('#searchInput').focus(); }
             $tree.find('#searchInput')[0].selectionStart = getSearchCursor();
             $tree.find('#searchInput')[0].selectionEnd = getSearchCursor();
 
@@ -2066,6 +2067,7 @@ define([
                     if (!filesOp.comparePath(newLocation, currentPath.slice())) { displayDirectory(newLocation); }
                     return;
                 }
+                if (APP.mobile()) { return; }
                 search.to = window.setTimeout(function () {
                     if (!isInSearchTmp) { search.oldLocation = currentPath.slice(); }
                     var newLocation = [SEARCH, $input.val()];
diff --git a/www/login/main.js b/www/login/main.js
index 973cd985f..7a677cebb 100644
--- a/www/login/main.js
+++ b/www/login/main.js
@@ -57,65 +57,68 @@ define([
         });
 
         $('button.login').click(function () {
-            Cryptpad.addLoadingScreen(Messages.login_hashing);
-            // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
+            // setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
             window.setTimeout(function () {
-                loginReady(function () {
-                    var uname = $uname.val();
-                    var passwd = $passwd.val();
-                    Login.loginOrRegister(uname, passwd, false, function (err, result) {
-                        if (!err) {
-                            var proxy = result.proxy;
+                Cryptpad.addLoadingScreen(Messages.login_hashing);
+                // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
+                window.setTimeout(function () {
+                    loginReady(function () {
+                        var uname = $uname.val();
+                        var passwd = $passwd.val();
+                        Login.loginOrRegister(uname, passwd, false, function (err, result) {
+                            if (!err) {
+                                var proxy = result.proxy;
 
-                            // successful validation and user already exists
-                            // set user hash in localStorage and redirect to drive
-                            if (!proxy.login_name) {
-                                result.proxy.login_name = result.userName;
-                            }
+                                // successful validation and user already exists
+                                // set user hash in localStorage and redirect to drive
+                                if (!proxy.login_name) {
+                                    result.proxy.login_name = result.userName;
+                                }
 
-                            proxy.edPrivate = result.edPrivate;
-                            proxy.edPublic = result.edPublic;
+                                proxy.edPrivate = result.edPrivate;
+                                proxy.edPublic = result.edPublic;
 
-                            Cryptpad.feedback('LOGIN', true);
-                            Cryptpad.whenRealtimeSyncs(result.realtime, function() {
-                                Cryptpad.login(result.userHash, result.userName, function () {
-                                    if (sessionStorage.redirectTo) {
-                                        var h = sessionStorage.redirectTo;
-                                        var parser = document.createElement('a');
-                                        parser.href = h;
-                                        if (parser.origin === window.location.origin) {
-                                            delete sessionStorage.redirectTo;
-                                            window.location.href = h;
-                                            return;
+                                Cryptpad.feedback('LOGIN', true);
+                                Cryptpad.whenRealtimeSyncs(result.realtime, function() {
+                                    Cryptpad.login(result.userHash, result.userName, function () {
+                                        if (sessionStorage.redirectTo) {
+                                            var h = sessionStorage.redirectTo;
+                                            var parser = document.createElement('a');
+                                            parser.href = h;
+                                            if (parser.origin === window.location.origin) {
+                                                delete sessionStorage.redirectTo;
+                                                window.location.href = h;
+                                                return;
+                                            }
                                         }
-                                    }
-                                    window.location.href = '/drive/';
-                                });
-                            });
-                            return;
-                        }
-                        switch (err) {
-                            case 'NO_SUCH_USER':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_noSuchUser);
-                                });
-                                break;
-                            case 'INVAL_USER':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_invalUser);
+                                        window.location.href = '/drive/';
+                                    });
                                 });
-                                break;
-                            case 'INVAL_PASS':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_invalPass);
-                                });
-                                break;
-                            default: // UNHANDLED ERROR
-                                Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
-                        }
+                                return;
+                            }
+                            switch (err) {
+                                case 'NO_SUCH_USER':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_noSuchUser);
+                                    });
+                                    break;
+                                case 'INVAL_USER':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_invalUser);
+                                    });
+                                    break;
+                                case 'INVAL_PASS':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_invalPass);
+                                    });
+                                    break;
+                                default: // UNHANDLED ERROR
+                                    Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
+                            }
+                        });
                     });
-                });
-            }, 0);
+                }, 0);
+            }, 100);
         });
     });
 });
diff --git a/www/register/main.js b/www/register/main.js
index 6e97e2a93..bafe55423 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -101,57 +101,63 @@ define([
             function (yes) {
                 if (!yes) { return; }
 
-                Cryptpad.addLoadingScreen(Messages.login_hashing);
-                Login.loginOrRegister(uname, passwd, true, function (err, result) {
-                    var proxy = result.proxy;
-
-                    if (err) {
-                        switch (err) {
-                            case 'NO_SUCH_USER':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_noSuchUser);
-                                });
-                                break;
-                            case 'INVAL_USER':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_invalUser);
-                                });
-                                break;
-                            case 'INVAL_PASS':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.alert(Messages.login_invalPass);
-                                });
-                                break;
-                            case 'ALREADY_REGISTERED':
-                                Cryptpad.removeLoadingScreen(function () {
-                                    Cryptpad.confirm(Messages.register_alreadyRegistered, function (yes) {
-                                        if (!yes) { return; }
-                                        proxy.login_name = uname;
-
-                                        if (!proxy[Cryptpad.displayNameKey]) {
-                                            proxy[Cryptpad.displayNameKey] = uname;
-                                        }
-                                        Cryptpad.eraseTempSessionValues();
-                                        logMeIn(result);
-                                    });
-                                });
-                                break;
-                            default: // UNHANDLED ERROR
-                                Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
-                        }
-                        return;
-                    }
-                    Cryptpad.eraseTempSessionValues();
-                    if (shouldImport) {
-                        sessionStorage.migrateAnonDrive = 1;
-                    }
-
-                    proxy.login_name = uname;
-                    proxy[Cryptpad.displayNameKey] = uname;
-                    sessionStorage.createReadme = 1;
-
-                    logMeIn(result);
-                });
+                // setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
+                window.setTimeout(function () {
+                    Cryptpad.addLoadingScreen(Messages.login_hashing);
+                    // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
+                    window.setTimeout(function () {
+                        Login.loginOrRegister(uname, passwd, true, function (err, result) {
+                            var proxy = result.proxy;
+
+                            if (err) {
+                                switch (err) {
+                                    case 'NO_SUCH_USER':
+                                        Cryptpad.removeLoadingScreen(function () {
+                                            Cryptpad.alert(Messages.login_noSuchUser);
+                                        });
+                                        break;
+                                    case 'INVAL_USER':
+                                        Cryptpad.removeLoadingScreen(function () {
+                                            Cryptpad.alert(Messages.login_invalUser);
+                                        });
+                                        break;
+                                    case 'INVAL_PASS':
+                                        Cryptpad.removeLoadingScreen(function () {
+                                            Cryptpad.alert(Messages.login_invalPass);
+                                        });
+                                        break;
+                                    case 'ALREADY_REGISTERED':
+                                        Cryptpad.removeLoadingScreen(function () {
+                                            Cryptpad.confirm(Messages.register_alreadyRegistered, function (yes) {
+                                                if (!yes) { return; }
+                                                proxy.login_name = uname;
+
+                                                if (!proxy[Cryptpad.displayNameKey]) {
+                                                    proxy[Cryptpad.displayNameKey] = uname;
+                                                }
+                                                Cryptpad.eraseTempSessionValues();
+                                                logMeIn(result);
+                                            });
+                                        });
+                                        break;
+                                    default: // UNHANDLED ERROR
+                                        Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
+                                }
+                                return;
+                            }
+                            Cryptpad.eraseTempSessionValues();
+                            if (shouldImport) {
+                                sessionStorage.migrateAnonDrive = 1;
+                            }
+
+                            proxy.login_name = uname;
+                            proxy[Cryptpad.displayNameKey] = uname;
+                            sessionStorage.createReadme = 1;
+
+                            logMeIn(result);
+                        });
+                    }, 0);
+                }, 100);
             }, {
                 ok: Messages.register_writtenPassword,
                 cancel: Messages.register_cancel,