From 29609212be9903a8bcebd6781a4e7450b95f48e6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 31 Aug 2023 16:34:57 +0200
Subject: [PATCH 01/87] Reorder DOM based on visual order in toolbar #1198

---
 customize.dist/src/less2/include/toolbar.less |  42 ------
 www/common/toolbar.js                         | 124 +++++++++---------
 www/file/inner.js                             |  14 +-
 3 files changed, 67 insertions(+), 113 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index b1eb49887..18599951c 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -439,13 +439,6 @@
                    screen and (max-height: 500px) {
                 flex-wrap: wrap;
                 height: @toolbar_line-height;
-                .cp-pad-not-pinned {
-                    line-height: 32px;
-                    flex: unset;
-                    padding: 0;
-                    align-self: auto;
-                    margin: 0 5px;
-                }
                 .cp-toolbar-top-filler {
                     height: 32px;
                 }
@@ -578,41 +571,6 @@
         position: relative;
         width: 100%;
 
-        .cp-pad-not-pinned {
-            order: 4;
-            flex: 1;
-
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-
-            line-height: @toolbar_top-height;
-            padding: 0;
-            margin: 0 5px;
-            font-size: @colortheme_app-font-size;
-            color: @cp_toolbar-warn;
-            .cp-pnp-msg {
-                padding-left: 5px;
-                font-family: @colortheme_font;
-                font-size: @colortheme_app-font-size;
-                a {
-                    font-size: @colortheme_app-font-size;
-                    font-family: @colortheme_font;
-                    font-weight: bold;
-                    color: @cp_toolbar-warn;
-                    &:hover {
-                        text-decoration: underline;
-                    }
-                }
-                @media screen and (max-width: (@browser_media-not-big)) {
-                    display: none;
-                }
-            }
-            @media screen and (max-width: (@browser_media-not-big)) {
-                overflow: visible;
-                max-width: 20px;
-            }
-        }
         .cp-toolbar-top-filler {
             height: @toolbar_top-height;
             display: inline-block;
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index c1595cd2c..227aba017 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -61,6 +61,50 @@ MessengerUI, Messages, Pages) {
         return 'cp-toolbar-uid-' + String(Math.random()).substring(2);
     };
 
+    var observeChildren = function ($content) {
+        var reorderDOM = Util.throttle(function ($content, observer) {
+            if (!$content.length) { return; }
+
+            // List all children based on their "order" property
+            var map = {};
+            $content[0].childNodes.forEach((node) => {
+                try {
+                    if (!node.attributes) { return; }
+                    var order = getComputedStyle(node).getPropertyValue("order");
+                    var a = map[order] = map[order] || [];
+                    a.push(node);
+                } catch (e) { console.error(e, node); }
+            });
+
+            // Disconnect the observer while we're reordering to avoid infinite loop
+            observer.disconnect();
+            Object.keys(map).sort(function (a, b) {
+                return Number(a) - Number(b);
+            }).forEach(function (k) {
+                var arr = map[k];
+                // Reorder
+                arr.forEach(function (node) {
+                    $content.append(node);
+                });
+            });
+            observer.start();
+        }, 100);
+
+        let observer = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
+                if (mutation.addedNodes.length) {
+                    reorderDOM($content, observer);
+                }
+            });
+        });
+        observer.start = function () {
+            observer.observe($content[0], {
+                childList: true
+            });
+        };
+        observer.start();
+    };
+
     var createRealtimeToolbar = function (config) {
         if (!config.$container) { return; }
         var $container = config.$container;
@@ -103,10 +147,7 @@ MessengerUI, Messages, Pages) {
                 h('i.fa.fa-file-o'),
                 h('span.cp-button-name', Messages.toolbar_file)
             ])).appendTo($file).hide();
-            var $drawerContent = $('<div>', {
-                'class': DRAWER_CLS,
-                'tabindex': 1
-            }).hide();
+            var $drawerContent = $(h('div.'+ DRAWER_CLS, {tabindex: 1})).hide();
             UI.createDrawer($drawer, $drawerContent);
         }
 
@@ -776,58 +817,6 @@ MessengerUI, Messages, Pages) {
         return $titleContainer;
     };
 
-    var createUnpinnedWarning0 = function (toolbar, config) {
-        if (true) { return; } // stub this call since it won't make it into the next release
-        if (Common.isLoggedIn()) { return; }
-        var pd = config.metadataMgr.getPrivateData();
-        var o = pd.origin;
-        var cid = pd.channel;
-        Common.sendAnonRpcMsg('IS_CHANNEL_PINNED', cid, function (x) {
-            if (x.error || !Array.isArray(x.response)) { return void console.log(x); }
-            if (x.response[0] === true) {
-                $('.cp-pad-not-pinned').remove();
-                return;
-            }
-
-            if (typeof(ApiConfig.inactiveTime) !== 'number') {
-                $('.cp-pad-not-pinned').remove();
-                return;
-            }
-
-            if ($('.cp-pad-not-pinned').length) { return; }
-            var pnpTitle = Messages._getKey('padNotPinnedVariable', ['','','','', ApiConfig.inactiveTime]);
-            var pnpMsg = Messages._getKey('padNotPinnedVariable', [
-                '<a href="' + o + '/login" class="cp-pnp-login" target="blank" title>',
-                '</a>',
-                '<a href="' + o + '/register" class="cp-pnp-register" target="blank" title>',
-                '</a>',
-                ApiConfig.inactiveTime
-            ]);
-            var $msg = $('<span>', {
-                'class': 'cp-pad-not-pinned'
-            }).append([
-                $('<span>', {'class': 'fa fa-exclamation-triangle', 'title': pnpTitle}),
-                $('<span>', {'class': 'cp-pnp-msg'}).append(pnpMsg)
-            ]);
-            $msg.find('a.cp-pnp-login').click(function (ev) {
-                ev.preventDefault();
-                Common.setLoginRedirect('login');
-            });
-            $msg.find('a.cp-pnp-register').click(function (ev) {
-                ev.preventDefault();
-                Common.setLoginRedirect('register');
-            });
-            $('.cp-toolbar-top').append($msg);
-            //UI.addTooltips();
-        });
-    };
-
-    var createUnpinnedWarning = function (toolbar, config) {
-        config.metadataMgr.onChange(function () {
-            createUnpinnedWarning0(toolbar, config);
-        });
-        createUnpinnedWarning0(toolbar, config);
-    };
 
     var createPageTitle = function (toolbar, config) {
         if (!config.pageTitle) { return; }
@@ -840,9 +829,13 @@ MessengerUI, Messages, Pages) {
         var $hoverable = $('<span>', {'class': 'cp-toolbar-title-hoverable'}).appendTo($titleContainer);
 
         // Buttons
-        $('<span>', {
+        var $b = $('<span>', {
             'class': 'cp-toolbar-title-value cp-toolbar-title-value-page'
         }).appendTo($hoverable).text(config.pageTitle);
+
+        toolbar.updatePageTitle = function (title) {
+            $b.text(title);
+        };
     };
 
     var createLinkToMain = function (toolbar, config) {
@@ -1328,6 +1321,17 @@ MessengerUI, Messages, Pages) {
         toolbar.$drawer = $toolbar.find('.'+Bar.constants.drawer);
         toolbar.$top = $toolbar.find('.'+Bar.constants.top);
         toolbar.$history = $toolbar.find('.'+Bar.constants.history);
+        toolbar.$user = $toolbar.find('.'+Bar.constants.userAdmin);
+
+        observeChildren(toolbar.$drawer);
+        observeChildren(toolbar.$bottomL);
+        observeChildren(toolbar.$bottomM);
+        observeChildren(toolbar.$bottomR);
+        observeChildren(toolbar.$top);
+        observeChildren(toolbar.$user);
+        if (config.$contentContainer) {
+            observeChildren(config.$contentContainer);
+        }
 
         toolbar.$userAdmin = $toolbar.find('.'+Bar.constants.userAdmin);
 
@@ -1342,14 +1346,10 @@ MessengerUI, Messages, Pages) {
         tb['title'] = createTitle;
         tb['pageTitle'] = createPageTitle;
         //tb['request'] = createRequest;
-        tb['lag'] = $.noop;
         tb['spinner'] = createSpinner;
-        tb['state'] = $.noop;
         tb['limit'] = createLimit; // TODO
-        tb['upgrade'] = $.noop;
         tb['newpad'] = createNewPad;
         tb['useradmin'] = createUserAdmin;
-        tb['unpinnedWarning'] = createUnpinnedWarning;
         tb['notifications'] = createNotifications;
         tb['maintenance'] = createMaintenance;
 
@@ -1359,7 +1359,7 @@ MessengerUI, Messages, Pages) {
                 'chat',
                 'collapse',
                 'userlist', 'title', 'useradmin', 'spinner',
-                'newpad', 'share', 'access', 'limit', 'unpinnedWarning',
+                'newpad', 'share', 'access', 'limit',
                 'notifications'
             ], {});
         };
diff --git a/www/file/inner.js b/www/file/inner.js
index 00e0a2fa9..b635b3e50 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -55,7 +55,7 @@ define([
         }
 
         var Title = common.createTitle({});
-        var displayed = ['useradmin', 'newpad', 'limit', 'upgrade', 'notifications'];
+        var displayed = ['useradmin', 'newpad', 'limit', 'upgrade', 'notifications', 'pageTitle'];
         if (!uploadMode) {
             displayed.push('fileshare');
             displayed.push('access');
@@ -64,12 +64,9 @@ define([
             displayed: displayed,
             $container: $bar,
             metadataMgr: metadataMgr,
+            pageTitle: Messages.upload_title,
             sfCommon: common,
         };
-        if (uploadMode) {
-            displayed.push('pageTitle');
-            configTb.pageTitle = Messages.upload_title;
-        }
         var toolbar = APP.toolbar = Toolbar.create(configTb);
 
         if (!uploadMode) {
@@ -136,10 +133,9 @@ define([
                         common.setPadAttribute('fileType', metadata.type);
                     }
 
-                    toolbar.addElement(['pageTitle'], {
-                        pageTitle: title,
-                        title: Title.getTitleConfig(),
-                    });
+                    if (toolbar.updatePageTitle) {
+                        toolbar.updatePageTitle(title);
+                    }
                     toolbar.$drawer.append(common.createButton('forget', true));
                     toolbar.$drawer.append(common.createButton('properties', true));
                     if (common.isLoggedIn()) {

From 784a833a0f6d784fd3889f87425850bc158ba3c5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 4 Sep 2023 12:03:37 +0200
Subject: [PATCH 02/87] Fix CkEditor issue with toolbar reordering

---
 www/common/toolbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 227aba017..19bb768ca 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -82,6 +82,7 @@ MessengerUI, Messages, Pages) {
                 return Number(a) - Number(b);
             }).forEach(function (k) {
                 var arr = map[k];
+                if (!Number(k)) { return; } // No need to "append" if order is 0
                 // Reorder
                 arr.forEach(function (node) {
                     $content.append(node);

From 1f6b1169938fa47628fdb910e89aefc4d72a0660 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 4 Sep 2023 16:09:32 +0300
Subject: [PATCH 03/87] user menu can be accessed using the keyboard on firefox
 #1209

---
 www/common/common-ui-elements.js | 35 +++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a8992250c..dfeaa8049 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1539,11 +1539,14 @@ define([
 
                 $el.appendTo($innerblock);
                 if (typeof(o.action) === 'function') {
-                    $el.click(function (e) {
-                        var close = o.action(e);
-                        if (close) { hide(); }
+                    $el.on('click keydown', function (e) {
+                        if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13)) {
+                            var close = o.action(e);
+                            if (close) { hide(); }
+                        }
                     });
                 }
+
             });
         };
         setOptions(config.options);
@@ -1821,7 +1824,7 @@ define([
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle'},
+                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '0'},
                 content: h('span', Messages.profileButton),
                 action: function () {
                     if (padType) {
@@ -1836,7 +1839,8 @@ define([
             options.push({
                 tag: 'a',
                 attributes: {
-                    'class': 'fa fa-hdd-o'
+                    'class': 'fa fa-hdd-o',
+                    'tabindex': '0'
                 },
                 content: h('span', Messages.type.drive),
                 action: function () {
@@ -1848,7 +1852,8 @@ define([
             options.push({
                 tag: 'a',
                 attributes: {
-                    'class': 'fa fa-users'
+                    'class': 'fa fa-users',
+                    'tabindex': '0'
                 },
                 content: h('span', Messages.type.teams),
                 action: function () {
@@ -1861,6 +1866,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-calendar',
+                    'tabindex': '0'
                 },
                 content: h('span', Messages.calendar),
                 action: function () {
@@ -1872,7 +1878,8 @@ define([
             options.push({
                 tag: 'a',
                 attributes: {
-                    'class': 'fa fa-address-book'
+                    'class': 'fa fa-address-book',
+                    'tabindex': '0'
                 },
                 content: h('span', Messages.type.contacts),
                 action: function () {
@@ -1883,7 +1890,7 @@ define([
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog'},
+                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '0'},
                 content: h('span', Messages.settingsButton),
                 action: function () {
                     if (padType) {
@@ -1900,7 +1907,7 @@ define([
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs'},
+                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '0'},
                 content: h('span', Messages.adminPage || 'Admin'),
                 action: function () {
                     if (padType) {
@@ -1940,6 +1947,7 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'cp-toolbar-about fa fa-info',
+                'tabindex': '0'
             },
             content: h('span', Messages.user_about),
             action: function () {
@@ -1950,7 +1958,8 @@ define([
         options.push({
             tag: 'a',
             attributes: {
-                'class': 'fa fa-home'
+                'class': 'fa fa-home',
+                'tabindex': '0'
             },
             content: h('span', Messages.homePage),
             action: function () {
@@ -1991,7 +2000,8 @@ define([
             options.push({
                 tag: 'a',
                 attributes: {
-                    'class': 'fa fa-gift'
+                    'class': 'fa fa-gift',
+                    'tabindex': '0'
                 },
                 content: h('span', Messages.crowdfunding_button2),
                 action: function () {
@@ -2022,6 +2032,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'cp-toolbar-menu-logout-everywhere fa fa-plug',
+                    'tabindex': '0'
                 },
                 content: h('span', Messages.logoutEverywhere),
                 action: function () {
@@ -2035,7 +2046,7 @@ define([
             });
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out'},
+                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '0'},
                 content: h('span', Messages.logoutButton),
                 action: function () {
                     Common.logout(function () {

From bd6de021e2df8d3956c707374bd4495ba6d449ce Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 5 Sep 2023 14:42:42 +0300
Subject: [PATCH 04/87] added focus to toolbar elements #1206 user menu can be
 also accessed on other browsers #1209

---
 customize.dist/src/less2/include/toolbar.less | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 18599951c..118fa8288 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -363,12 +363,14 @@
         * {
             outline-width: 0;
             &:focus {
-                outline-width: 0;
+                outline-width: 1rem;
+                // color shows on chrome/edge, but not firefox
+                outline-color: grey; // XXX temporary color to change
             }
         }
 
         box-sizing: border-box;
-        padding: 0px;
+        padding: 0;
         display: flex;
         flex-wrap: wrap;
         justify-content: space-between;
@@ -1219,3 +1221,4 @@
     }
 }
 
+

From 71ec6d50f92c44c4ce9586bf68b082dbac270ff2 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 5 Sep 2023 15:52:17 +0300
Subject: [PATCH 05/87] `Open Notification panel` can be accessed with the
 keyboard #1201

---
 customize.dist/src/less2/include/drive.less | 6 +++---
 www/common/toolbar.js                       | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 4fea4e43a..afb77243e 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -128,9 +128,9 @@
         }
     }
 
-    div:focus {
-        outline: none;
-    }
+    //div:focus {
+    //    outline: none;
+    //}
 
     .fa {
         font-family: FontAwesome;
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 19bb768ca..3ad574b40 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1068,9 +1068,11 @@ MessengerUI, Messages, Pages) {
 
     var createNotifications = function (toolbar, config) {
         var $notif = toolbar.$top.find('.'+NOTIFICATIONS_CLS).show();
-        var openNotifsApp = h('div.cp-notifications-gotoapp', h('p', Messages.openNotificationsApp || "Open notifications App"));
-        $(openNotifsApp).click(function () {
-            Common.openURL("/notifications/");
+        var openNotifsApp = h('div.cp-notifications-gotoapp',{ tabindex: '0' }, h('p', Messages.openNotificationsApp || "Open notifications App"));
+        $(openNotifsApp).on('click keypress', function (event) {
+            if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                Common.openURL("/notifications/");
+            }
         });
         var div = h('div.cp-notifications-container', [
             h('div.cp-notifications-empty', Messages.notifications_empty)

From 154a550b3e9eb93f914b462a971e94db9bee2259 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 5 Sep 2023 16:04:42 +0300
Subject: [PATCH 06/87] `Allow notifications` can be accessed with the keyboard
 #1201

---
 www/common/toolbar.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 3ad574b40..98d4531f6 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1082,15 +1082,18 @@ MessengerUI, Messages, Pages) {
         var metadataMgr = config.metadataMgr;
         var privateData = metadataMgr.getPrivateData();
         if (!privateData.notifications) {
-            var allowNotif = h('div.cp-notifications-gotoapp', h('p', Messages.allowNotifications));
+            var allowNotif = h('div.cp-notifications-gotoapp',{ tabindex: '0' }, h('p', Messages.allowNotifications));
             pads_options.unshift(h("hr"));
             pads_options.unshift(allowNotif);
-            var $allow = $(allowNotif).click(function () {
-                Common.getSframeChannel().event('Q_ASK_NOTIFICATION', null, function (e, allow) {
-                    if (!allow) { return; }
-                    $(allowNotif).remove();
-                });
+            $(allowNotif).on('click keypress', function (event) {
+                if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                    Common.getSframeChannel().event('Q_ASK_NOTIFICATION', null, function (e, allow) {
+                        if (!allow) { return; }
+                        $(allowNotif).remove();
+                    });
+                }
             });
+
             var onChange = function () {
                 var privateData = metadataMgr.getPrivateData();
                 if (!privateData.notifications) { return; }

From c8c46d11985a0e0e316de51e05fa86996704a62c Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 5 Sep 2023 16:36:12 +0300
Subject: [PATCH 07/87] notifications can be accessed with the keyboard #1201

---
 www/common/sframe-common-mailbox.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js
index 4b9fd9e85..625fc2f07 100644
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -85,13 +85,17 @@ define([
                 });
             }
             var order = -Math.floor((Util.find(data, ['content', 'msg', 'ctime']) || 0) / 1000);
+            const tabIndexValue = data.content.isDismissible ? undefined : '0';
             notif = h('div.cp-notification', {
                 style: 'order:'+order+';',
                 'data-hash': data.content.hash
             }, [
                 avatar,
-                h('div.cp-notification-content',
-                    h('p', formatData(data)))
+                h('div.cp-notification-content', {
+                    tabindex: tabIndexValue
+                }, [
+                    h('p', formatData(data))
+                ])
             ]);
 
             if (typeof(data.content.getFormatText) === "function") {
@@ -108,16 +112,24 @@ define([
             }
 
             if (data.content.isClickable) {
-                $(notif).find('.cp-notification-content').addClass("cp-clickable")
-                    .click(data.content.handler);
+                $(notif).find('.cp-notification-content').addClass("cp-clickable").on('click keypress', function (event) {
+                    if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                        data.content.handler();
+                    }
+                });
             }
             if (data.content.isDismissible) {
                 var dismissIcon = h('span.fa.fa-times');
                 var dismiss = h('div.cp-notification-dismiss', {
-                    title: Messages.notifications_dismiss
+                    title: Messages.notifications_dismiss,
+                    tabindex: '0'
                 }, dismissIcon);
                 $(dismiss).addClass("cp-clickable")
-                    .click(data.content.dismissHandler);
+                    .on('click keypress', function (event) {
+                        if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                            data.content.dismissHandler();
+                        }
+                    });
                 $(notif).append(dismiss);
             }
             return notif;

From dfa2da23071cd618ebff8b64b577b8124af36519 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 14 Sep 2023 15:26:27 +0300
Subject: [PATCH 08/87] changed `div` to `ul` #1192

---
 www/common/drive-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 11908cf38..0cc70ed12 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3452,7 +3452,7 @@ define([
 
         // Create the ghost icon to add pads/folders
         var createNewPadIcons = function ($block, isInRoot) {
-            var $container = $('<div>');
+            var $container = $('<ul>');
             getNewPadOptions(isInRoot).forEach(function (obj) {
                 if (obj.separator) { return; }
 

From f1ae0564ec4051efd4cd9399b8fba4b675e33af3 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 14 Sep 2023 16:39:29 +0300
Subject: [PATCH 09/87] modal can be accessed with the keyboard #1192

---
 www/common/common-interface.js |  5 +-
 www/common/drive-ui.js         | 97 ++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index cd3d1b406..d0f4a671a 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -568,9 +568,7 @@ define([
         if (!$blockContainer || !$blockContainer.length) {
             var id = '';
             if (cfg.id) { id = '#'+cfg.id; }
-            $blockContainer = $(h('div.cp-modal-container'+id, {
-                tabindex: 1
-            }));
+            $blockContainer = $(h('div.cp-modal-container'+id, {}));
         }
         var deleted = false;
         var hide = function () {
@@ -873,6 +871,7 @@ define([
         var attributes = merge({
             type: 'password',
             autocomplete: 'new-password', // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete#values
+            tabindex: '1',
         }, opts);
 
         var input = h('input.cp-password-input', attributes);
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 0cc70ed12..f8c60e71b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2783,7 +2783,7 @@ define([
             var content = h('div', [
                 h('h4', Messages.sharedFolders_create),
                 h('label', {for: 'cp-app-drive-sf-name'}, Messages.sharedFolders_create_name),
-                h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder}),
+                h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder,tabindex:'1'}),
                 h('label', {for: 'cp-app-drive-sf-password'}, Messages.fm_shareFolderPassword),
                 UI.passwordInput({id: 'cp-app-drive-sf-password'}),
                 h('span', {
@@ -2853,9 +2853,9 @@ define([
             ]);
             var content = h('p', [
                 h('label', {for: 'cp-app-drive-link-name'}, Messages.fm_link_name),
-                name = h('input#cp-app-drive-link-name', { autocomplete: 'off', placeholder: Messages.fm_link_name_placeholder }),
+                name = h('input#cp-app-drive-link-name', { autocomplete: 'off', placeholder: Messages.fm_link_name_placeholder, tabindex:'1'}),
                 h('label', {for: 'cp-app-drive-link-url'}, Messages.fm_link_url),
-                url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off', placeholder: Messages.form_input_ph_url }),
+                url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off', placeholder: Messages.form_input_ph_url,tabindex:'1'}),
                 warning,
             ]);
 
@@ -2928,29 +2928,57 @@ define([
                     refresh();
                 };
                 $block.find('a.cp-app-drive-new-folder, li.cp-app-drive-new-folder')
-                    .click(function () {
-                    manager.addFolder(currentPath, null, onCreated);
-                });
+                    .on('click keypress', function (event) {
+                        if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                            event.preventDefault();
+                            manager.addFolder(currentPath, null, onCreated);
+                            $block.hide();
+                        }
+                    });
                 if (!APP.disableSF && !manager.isInSharedFolder(currentPath)) {
                     $block.find('a.cp-app-drive-new-shared-folder, li.cp-app-drive-new-shared-folder')
-                        .click(function () {
-                        addSharedFolderModal(function (obj) {
-                            if (!obj) { return; }
-                            manager.addSharedFolder(currentPath, obj, refresh);
+                        .on('click keypress', function (event) {
+                            if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                                event.preventDefault();
+                                addSharedFolderModal(function (obj) {
+                                    if (!obj) { return; }
+                                    manager.addSharedFolder(currentPath, obj, refresh);
+                                });
+                            }
                         });
-                    });
                 }
-                $block.find('a.cp-app-drive-new-fileupload, li.cp-app-drive-new-fileupload').click(showUploadFilesModal);
-                $block.find('a.cp-app-drive-new-folderupload, li.cp-app-drive-new-folderupload').click(showUploadFolderModal);
-                $block.find('a.cp-app-drive-new-link, li.cp-app-drive-new-link').click(showLinkModal);
+                $block.find('a.cp-app-drive-new-fileupload, li.cp-app-drive-new-fileupload')
+                    .on('click keypress', function (event) {
+                        if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                            event.preventDefault();
+                            showUploadFilesModal();
+                        }
+                    });
+                $block.find('a.cp-app-drive-new-folderupload, li.cp-app-drive-new-folderupload')
+                    .on('click keypress', function (event) {
+                        if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                            event.preventDefault();
+                            showUploadFolderModal();
+                        }
+                    });
+                $block.find('a.cp-app-drive-new-link, li.cp-app-drive-new-link')
+                    .on('click keypress', function (event) {
+                        if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                            event.preventDefault();
+                            showLinkModal();
+                        }
+                    });
             }
             $block.find('a.cp-app-drive-new-doc, li.cp-app-drive-new-doc')
-                .on('click auxclick', function (e) {
-                e.preventDefault();
-                var type = $(this).attr('data-type') || 'pad';
-                var path = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
-                openIn(type, path, APP.team);
-            });
+                .on('click auxclick keypress', function (event) {
+                    if (event.type === 'click' || event.type === 'auxclick' || (event.type === 'keypress' && event.which === 13))
+                    {
+                        event.preventDefault();
+                        var type = $(this).attr('data-type') || 'pad';
+                        var path = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
+                        openIn(type, path, APP.team);
+                    }
+                });
         };
         var getNewPadOptions = function (isInRoot) {
             var options = [];
@@ -3451,22 +3479,23 @@ define([
         };
 
         // Create the ghost icon to add pads/folders
-        var createNewPadIcons = function ($block, isInRoot) {
-            var $container = $('<ul>');
-            getNewPadOptions(isInRoot).forEach(function (obj) {
-                if (obj.separator) { return; }
+            var createNewPadIcons = function ($block, isInRoot) {
+                var $container = $('<ul>');
+                getNewPadOptions(isInRoot).forEach(function (obj) {
+                    if (obj.separator) { return; }
 
-                var $element = $('<li>', {
-                    'class': obj.class + ' cp-app-drive-element-row ' +
-                             'cp-app-drive-element-grid'
-                }).prepend(obj.icon).appendTo($container);
-                $element.append($('<span>', { 'class': 'cp-app-drive-new-name' })
-                    .text(obj.name));
+                    var $element = $('<li>', {
+                        'class': obj.class + ' cp-app-drive-element-row ' +
+                                 'cp-app-drive-element-grid',
+                        'tabindex': 1
+                    }).prepend(obj.icon).appendTo($container);
+                    $element.append($('<span>', { 'class': 'cp-app-drive-new-name' })
+                        .text(obj.name));
 
-                if (obj.type) {
-                    $element.attr('data-type', obj.type);
-                }
-            });
+                    if (obj.type) {
+                        $element.attr('data-type', obj.type);
+                    }
+                });
 
             $container.find('.cp-app-drive-element-row').click(function () {
                 $block.hide();

From e855dd0c51e141e8b212c587308e6fd117343dd9 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 14 Sep 2023 17:03:06 +0300
Subject: [PATCH 10/87] elements before "sheet" are now accessible via keyboard
 #1191

---
 www/common/drive-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index f8c60e71b..f816492cf 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3064,7 +3064,7 @@ define([
                 if (obj.separator) { return { tag: 'hr' }; }
                 var newObj = {
                     tag: 'a',
-                    attributes: { 'class': obj.class },
+                    attributes: { 'class': obj.class, href:'#' },
                     content: [ obj.icon, obj.name ]
                 };
                 if (obj.type) {

From 3fd358faef33523109f3af7f9a2c1892344c7432 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 15 Sep 2023 13:41:45 +0300
Subject: [PATCH 11/87] added aria-expanded  #1191 changed div into ul

---
 www/common/common-ui-elements.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index dfeaa8049..cd4226076 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1509,7 +1509,7 @@ define([
         }
 
         // Menu
-        var $innerblock = $('<div>', {'class': 'cp-dropdown-content'});
+        var $innerblock = $('<ul>', {'class': 'cp-dropdown-content'});
         if (config.left) { $innerblock.addClass('cp-dropdown-left'); }
 
         var hide = function () {
@@ -1605,7 +1605,12 @@ define([
 
             var $c = $container.closest('.cp-toolbar-drawer-content');
             $c.removeClass('cp-dropdown-visible');
-            if (!state) { $c.addClass('cp-dropdown-visible'); }
+            if (!state) {
+                $c.addClass('cp-dropdown-visible');
+                $container.attr('aria-expanded', 'true');
+            } else {
+                $container.attr('aria-expanded', 'false');
+            }
 
             try {
                 $('iframe').each(function (idx, ifrw) {

From e4621c63c2c03da4c2419baa661fd014056721de Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 15 Sep 2023 13:49:54 +0300
Subject: [PATCH 12/87] can access Link from Filter dropdown

---
 www/common/drive-ui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index f816492cf..041fc4e68 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3140,7 +3140,8 @@ define([
                     tag: 'a',
                     attributes: {
                         'class': 'cp-app-drive-filter-doc',
-                        'data-type': 'link'
+                        'data-type': 'link',
+                        'href': '#'
                     },
                     content: [
                         getIcon('link')[0],

From abe961ae97fe793698fc0a86c27f4b7652bad3fa Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 15 Sep 2023 13:54:04 +0300
Subject: [PATCH 13/87] can access `Remove filter` from Filter dropdown

---
 www/common/drive-ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 041fc4e68..0160ef38b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3103,6 +3103,7 @@ define([
                     tag: 'a',
                     attributes: {
                         'class': 'cp-app-drive-rm-filter',
+                        'href': '#'
                     },
                     content: [
                         h('i.fa.fa-times'),

From 2d0e39589523b1b5c096fb3155dc3eecb2ba6cfd Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 18 Sep 2023 14:38:07 +0300
Subject: [PATCH 14/87] changed `span` into `h5` #1197

---
 www/notifications/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/notifications/inner.js b/www/notifications/inner.js
index 965f706a5..8e25a9d39 100644
--- a/www/notifications/inner.js
+++ b/www/notifications/inner.js
@@ -67,7 +67,7 @@ define([
         var notifsPanel, notifsList, dismissAll;
         notifsPanel = h("div.cp-app-notifications-panel", [
             h('div.cp-app-notifications-panel-titlebar', [
-                h("span.cp-app-notifications-panel-title",
+                h("h5.cp-app-notifications-panel-title",
                     (Messages.notificationsPage || "Notifications") + " - " + categoryName),
                 h("div.cp-app-notifications-panel-titlebar-buttons", [
                     dismissAll = h("div.cp-app-notifications-dismissall.cp-clickable", { title: Messages.notifications_dismissAll || "Dismiss All" }, h("span.fa.fa-trash")),

From f9995b3cef656624f5fda35a163e4d06d497524c Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 18 Sep 2023 15:54:28 +0300
Subject: [PATCH 15/87] sidebar in drive is accessible via keyboard #1203

---
 www/common/drive-ui.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 0160ef38b..181bdf4ad 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -4345,9 +4345,12 @@ define([
             $icon.css("color", isSharedFolder ? getFolderColor(path.slice(0, -1)) : getFolderColor(path));
             var $collapse;
             if (collapsable) {
-                $collapse = $expandIcon.clone();
+                $collapse = $expandIcon.clone().attr('tabindex', 0);;
             }
-            var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row'}).append($collapse).append($icon).append($name).click(function (e) {
+            var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row', 'tabindex': 0}).append($collapse).append($icon).append($name).on('click keypress', function (e) {
+                if (e.type === 'keypress' && e.which !== 13) {
+                    return;
+                }
                 e.stopPropagation();
                 if (isSharedFolder && !manager.folders[isSharedFolder]) {
                     UI.warn(Messages.fm_deletedFolder);
@@ -4370,7 +4373,10 @@ define([
             if (draggable) { $elementRow.attr('draggable', true); }
             if (collapsable) {
                 $element.addClass('cp-app-drive-element-collapsed');
-                $collapse.click(function(e) {
+                $collapse.on('click keypress', function(e) {
+                    if (e.type === 'keypress' && e.which !== 13) {
+                        return; // Ignore keypress events that are not Enter (key code 13)
+                    }
                     e.stopPropagation();
                     if ($element.hasClass('cp-app-drive-element-collapsed')) {
                         // It is closed, open it

From db85a855e8d1c0e63ab60b6ae177f1094c6ae1c4 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 12:00:41 +0300
Subject: [PATCH 16/87] calendar can be created correctly using the keyboard
 fixed #1250

---
 www/common/common-interface.js | 1 -
 www/common/drive-ui.js         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index d0f4a671a..172de3450 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -509,7 +509,6 @@ define([
                     todo();
                 });
             }
-            if (b.keys && b.keys.length) { $(button).attr('data-keys', JSON.stringify(b.keys)); }
             navs.push(button);
         });
         return dialog.nav(navs);
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 181bdf4ad..818f31469 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -4375,7 +4375,7 @@ define([
                 $element.addClass('cp-app-drive-element-collapsed');
                 $collapse.on('click keypress', function(e) {
                     if (e.type === 'keypress' && e.which !== 13) {
-                        return; // Ignore keypress events that are not Enter (key code 13)
+                        return;
                     }
                     e.stopPropagation();
                     if ($element.hasClass('cp-app-drive-element-collapsed')) {

From 424dc25277afe92cfabbb7b95e5bf6e6d6f0d011 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 12:16:19 +0300
Subject: [PATCH 17/87] team sidebar can be navigated using the keyboard #1162

---
 www/teams/inner.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index f52817fc9..9911d2b81 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -237,7 +237,7 @@ define([
         Object.keys(categories).forEach(function (key) {
             if (key === 'admin' && !teamAdmin) { return; }
 
-            var $category = $('<div>', {'class': 'cp-sidebarlayout-category cp-team-cat-'+key}).appendTo($categories);
+            var $category = $('<div>', {'class': 'cp-sidebarlayout-category cp-team-cat-'+key, 'tabindex': 0}).appendTo($categories);
             if (key === 'general') { $category.append($('<span>', {'class': 'fa fa-info-circle'})); }
             if (key === 'list') { $category.append($('<span>', {'class': 'fa fa-list cp-team-cat-list'})); }
             if (key === 'create') { $category.append($('<span>', {'class': 'fa fa-plus-circle'})); }
@@ -252,7 +252,8 @@ define([
                 $category.addClass('cp-leftside-active');
             }
 
-            $category.click(function () {
+            $category.on('click keypress', function (event) {
+                if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                 if (!Array.isArray(categories[key]) && categories[key].onClick) {
                     categories[key].onClick(common);
                     return;
@@ -273,7 +274,7 @@ define([
                 $categories.find('.cp-leftside-active').removeClass('cp-leftside-active');
                 $category.addClass('cp-leftside-active');
                 showCategories(categories[key]);
-            });
+            }});
 
             $category.append(h('span.cp-sidebarlayout-category-name', Messages['team_cat_'+key] || key));
         });

From e11487a1c289515e388759e8363284073ec4e9b7 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 12:35:03 +0300
Subject: [PATCH 18/87] teams can be navigated using the keyboard #1162

---
 www/teams/inner.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 9911d2b81..d6e496ba1 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -470,20 +470,26 @@ define([
                     created++;
                 }
                 if (team.empty) {
-                    var createTeamDiv = h('div.cp-team-list-team.empty'+createCls, [
+                    var createTeamDiv = h('div.cp-team-list-team.empty'+createCls,{
+                        tabindex: '0'
+                    }, [
                         h('span.cp-team-list-name.empty', Messages.team_listSlot),
                         createBtn
                     ]);
                     list.push(createTeamDiv);
                     if (createCls) {
-                        $(createTeamDiv).click(function () {
-                            $('div.cp-team-cat-create').click();
+                        $(createTeamDiv).on('click keypress', function (event) {
+                            if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                                $('div.cp-team-cat-create').click();
+                            }
                         });
                     }
                     return;
                 }
                 var avatar = h('span.cp-avatar');
-                var teamDiv = h('div.cp-team-list-team', [
+                var teamDiv = h('div.cp-team-list-team',{
+                        tabindex: '0'
+                    }, [
                     h('span.cp-team-list-avatar', avatar),
                     h('span.cp-team-list-name', {
                         title: team.metadata.name
@@ -491,12 +497,14 @@ define([
                 ]);
                 list.push(teamDiv);
                 common.displayAvatar($(avatar), team.metadata.avatar, team.metadata.name);
-                $(teamDiv).click(function () {
-                    if (team.error) {
-                        UI.warn(Messages.error); // FIXME better error message - roster bug, can't load the team for now
-                        return;
+                $(teamDiv).on('click keypress', function (event) {
+                    if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                        if (team.error) {
+                            UI.warn(Messages.error); // FIXME better error message - roster bug, can't load the team for now
+                            return;
+                        }
+                        openTeam(common, id, team);
                     }
-                    openTeam(common, id, team);
                 });
             });
             content.push(h('div.cp-team-list-container', list));

From f95c223e3f95729077b2d94076b72dc2a5404264 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 13:11:03 +0300
Subject: [PATCH 19/87] contacts can be navigated using the keyboard #1162

---
 www/common/messenger-ui.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index ddc812c60..6b7324fd7 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -70,7 +70,7 @@ define([
                 h('div.cp-app-contacts-category-content')
             ]),
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
-                h('button.cp-app-contacts-muted-button',[
+                h('button.cp-app-contacts-muted-button', {tabindex:0},[
                     h('i.fa.fa-bell-slash'),
                     Messages.contacts_manageMuted
                 ]), 
@@ -516,6 +516,7 @@ define([
 
         markup.room = function (id, room, userlist) {
             var roomEl = h('div.cp-app-contacts-friend.cp-avatar', {
+                'tabindex': '0',
                 'data-key': id,
                 'data-user': room.isFriendChat ? userlist[0].curvePublic : '',
             });
@@ -557,8 +558,10 @@ define([
 
             var friendData = room.isFriendChat ? userlist[0] : {};
 
-            var $room = $(roomEl).click(function () {
-                display(id);
+            var $room = $(roomEl).on('click keypress', function (event) {
+                if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                    display(id);
+                }
             }).dblclick(function () {
                 if (friendData.profile) { window.open(origin + '/profile/#' + friendData.profile); }
             });

From f7e0c6d9a607e9b5a2892f95a0491f64ed83fd43 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 13:20:32 +0300
Subject: [PATCH 20/87] settings sidebar can be navigated using the keyboard
 #1162

---
 www/settings/inner.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 39a49e43a..78d8d7fcc 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -2171,6 +2171,7 @@ define([
             }
 
             var $category = $(h('div.cp-sidebarlayout-category', {
+                'tabindex': 0,
                 'data-category': key
             }, [
                 icon,
@@ -2182,16 +2183,18 @@ define([
                 $category.addClass('cp-leftside-active');
             }
 
-            $category.click(function() {
-                if (!Array.isArray(categories[key]) && categories[key].onClick) {
-                    categories[key].onClick();
-                    return;
+            $category.on('click keypress', function (event) {
+                if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                    if (!Array.isArray(categories[key]) && categories[key].onClick) {
+                        categories[key].onClick();
+                        return;
+                    }
+                    active = key;
+                    common.setHash(key);
+                    $categories.find('.cp-leftside-active').removeClass('cp-leftside-active');
+                    $category.addClass('cp-leftside-active');
+                    showCategories(categories[key]);
                 }
-                active = key;
-                common.setHash(key);
-                $categories.find('.cp-leftside-active').removeClass('cp-leftside-active');
-                $category.addClass('cp-leftside-active');
-                showCategories(categories[key]);
             });
         });
         showCategories(categories[active]);

From a20a88620765d55a3f63961355c2adff37e454ad Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 13:26:06 +0300
Subject: [PATCH 21/87] admin sidebar can be navigated using the keyboard #1162

---
 www/admin/inner.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/www/admin/inner.js b/www/admin/inner.js
index abe82d839..2f153d9f9 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -3357,6 +3357,7 @@ Example
                 icon = h('span', { class: iconClass });
             }
             var $category = $(h('div', {
+                'tabindex': 0,
                 'class': 'cp-sidebarlayout-category'
             }, [
                 icon,
@@ -3366,16 +3367,18 @@ Example
                 $category.addClass('cp-leftside-active');
             }
 
-            $category.click(function () {
-                if (!Array.isArray(categories[key]) && categories[key].onClick) {
-                    categories[key].onClick();
-                    return;
+            $category.on('click keypress', function (event) {
+                if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                    if (!Array.isArray(categories[key]) && categories[key].onClick) {
+                        categories[key].onClick();
+                        return;
+                    }
+                    active = key;
+                    common.setHash(key);
+                    $categories.find('.cp-leftside-active').removeClass('cp-leftside-active');
+                    $category.addClass('cp-leftside-active');
+                    showCategories(categories[key]);
                 }
-                active = key;
-                common.setHash(key);
-                $categories.find('.cp-leftside-active').removeClass('cp-leftside-active');
-                $category.addClass('cp-leftside-active');
-                showCategories(categories[key]);
             });
 
         });

From 38db398ca9496ac693cde01477b62f1e0e91bda4 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 19 Sep 2023 13:41:44 +0300
Subject: [PATCH 22/87] `npm run lint`

---
 www/common/drive-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 818f31469..d94122f7e 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -4345,7 +4345,7 @@ define([
             $icon.css("color", isSharedFolder ? getFolderColor(path.slice(0, -1)) : getFolderColor(path));
             var $collapse;
             if (collapsable) {
-                $collapse = $expandIcon.clone().attr('tabindex', 0);;
+                $collapse = $expandIcon.clone().attr('tabindex', 0);
             }
             var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row', 'tabindex': 0}).append($collapse).append($icon).append($name).on('click keypress', function (e) {
                 if (e.type === 'keypress' && e.which !== 13) {

From c0741a6015d4a68904778f6fc964a417ce23fd6d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 21 Sep 2023 12:47:58 +0300
Subject: [PATCH 23/87] reverted db85a85

---
 www/common/common-interface.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 172de3450..d0f4a671a 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -509,6 +509,7 @@ define([
                     todo();
                 });
             }
+            if (b.keys && b.keys.length) { $(button).attr('data-keys', JSON.stringify(b.keys)); }
             navs.push(button);
         });
         return dialog.nav(navs);

From 3b21ca64b1fbc93f2b5c3a759b23bbf2fc0c8df0 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 21 Sep 2023 13:11:26 +0300
Subject: [PATCH 24/87] user menu(logged out) can be accessed with the keyboard
 #1209

---
 www/common/common-ui-elements.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index cd4226076..8d23c5e22 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2062,7 +2062,7 @@ define([
         } else {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in'},
+                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '0'},
                 content: h('span', Messages.login_login),
                 action: function () {
                     Common.setLoginRedirect('login');
@@ -2071,7 +2071,7 @@ define([
             if (!Config.restrictRegistration) {
                 options.push({
                     tag: 'a',
-                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus'},
+                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus','tabindex': '0'},
                     content: h('span', Messages.login_register),
                     action: function () {
                         Common.setLoginRedirect('register');

From 29ba64020ad3b22c1be08383ee37f88100c86c28 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 21 Sep 2023 13:18:08 +0300
Subject: [PATCH 25/87] fixed indentation

---
 www/common/drive-ui.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index d94122f7e..4456e9546 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3481,23 +3481,22 @@ define([
         };
 
         // Create the ghost icon to add pads/folders
-            var createNewPadIcons = function ($block, isInRoot) {
-                var $container = $('<ul>');
-                getNewPadOptions(isInRoot).forEach(function (obj) {
-                    if (obj.separator) { return; }
+        var createNewPadIcons = function ($block, isInRoot) {
+            var $container = $('<ul>');
+            getNewPadOptions(isInRoot).forEach(function (obj) {
+                if (obj.separator) { return; }
 
-                    var $element = $('<li>', {
-                        'class': obj.class + ' cp-app-drive-element-row ' +
-                                 'cp-app-drive-element-grid',
+                var $element = $('<li>', {
+                    'class': obj.class + ' cp-app-drive-element-row ' +
+                        'cp-app-drive-element-grid',
                         'tabindex': 1
-                    }).prepend(obj.icon).appendTo($container);
-                    $element.append($('<span>', { 'class': 'cp-app-drive-new-name' })
-                        .text(obj.name));
+                }).prepend(obj.icon).appendTo($container);
+                $element.append($('<span>', { 'class': 'cp-app-drive-new-name' }).text(obj.name));
 
-                    if (obj.type) {
-                        $element.attr('data-type', obj.type);
-                    }
-                });
+                if (obj.type) {
+                    $element.attr('data-type', obj.type);
+                }
+            });
 
             $container.find('.cp-app-drive-element-row').click(function () {
                 $block.hide();

From f5e8ad12f21880ae04ce4820b7fe8c52339b6292 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 22 Sep 2023 12:20:40 +0300
Subject: [PATCH 26/87] fixed button bug added in f1ae056

---
 www/common/drive-ui.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 4456e9546..6a6071263 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2932,7 +2932,6 @@ define([
                         if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                             event.preventDefault();
                             manager.addFolder(currentPath, null, onCreated);
-                            $block.hide();
                         }
                     });
                 if (!APP.disableSF && !manager.isInSharedFolder(currentPath)) {

From 089e49b723d7a52a87f6e022741fe9c1aad53d7d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 22 Sep 2023 12:42:50 +0300
Subject: [PATCH 27/87] document title can be changed using only the keyboard

---
 www/common/toolbar.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 98d4531f6..80201c2f0 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -722,7 +722,8 @@ MessengerUI, Messages, Pages) {
 
         // Buttons
         var $text = $('<span>', {
-            'class': 'cp-toolbar-title-value'
+            'class': 'cp-toolbar-title-value',
+            tabindex: 0
         }).appendTo($hoverable);
         var $pencilIcon = $('<span>', {
             'class': 'cp-toolbar-title-edit',
@@ -741,7 +742,7 @@ MessengerUI, Messages, Pages) {
             .text('('+Messages.readonly+')'));
         var $input = $('<input>', {
             type: 'text',
-            placeholder: placeholder
+            placeholder: placeholder,
         }).appendTo($hoverable).hide();
         if (config.readOnly !== 1) {
             $text.attr("title", Messages.clickToEdit);
@@ -813,8 +814,16 @@ MessengerUI, Messages, Pages) {
             $pencilIcon.hide();
             $saveIcon.show();
         };
-        $text.on('click', displayInput);
-        $pencilIcon.on('click', displayInput);
+        $text.on('click keypress', function (event) {
+            if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                displayInput();
+            }
+        });
+        $pencilIcon.on('click keypress', function (event) {
+            if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
+                displayInput();
+            }
+        });
         return $titleContainer;
     };
 

From 2f2a8192d19543c7388a63c20046cb4760911157 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 11 Oct 2023 10:56:53 +0300
Subject: [PATCH 28/87] focus starts on the toolbar

---
 www/common/drive-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 6a6071263..5f0634695 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -637,7 +637,7 @@ define([
         var $trashTreeContextMenu = $("#cp-app-drive-context-trashtree");
         var $trashContextMenu = $("#cp-app-drive-context-trash");
 
-
+        $content.attr("tabindex", "0");
         var splitter = h('div.cp-splitter', [
             h('i.fa.fa-ellipsis-v')
         ]);

From 84727b0a7b2a387699c5ed5d6719d16bdae07966 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 11 Oct 2023 11:10:45 +0300
Subject: [PATCH 29/87] added role to element for screen readers

---
 www/common/toolbar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 80201c2f0..90497914b 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -869,7 +869,8 @@ MessengerUI, Messages, Pages) {
         var $aTag = $('<a>', {
             href: href,
             title: buttonTitle,
-            'class': "cp-toolbar-link-logo"
+            'class': "cp-toolbar-link-logo",
+            'role': 'button'
         }).append(UI.getIcon(privateData.app));
 
         var onClick = function (e) {

From b8fae342b4cd42f38ebda32318193ad43eefec3d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 11 Oct 2023 11:30:43 +0300
Subject: [PATCH 30/87] added ARIA attributes to notifications button

---
 www/common/toolbar.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 90497914b..4aaa1e4a1 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1128,6 +1128,15 @@ MessengerUI, Messages, Pages) {
         var $newPadBlock = UIElements.createDropdown(dropdownConfig);
         var $button = $newPadBlock.find('button');
         $button.attr('title', Messages.notificationsPage);
+        $button.attr('aria-haspopup', 'menu');
+        $button.attr("aria-expanded", "false");
+        $button.click(function() {
+            if ($button.attr("aria-expanded") === "true") {
+                $button.attr("aria-expanded", "false");
+            } else {
+                $button.attr("aria-expanded", "true");
+            }
+        });
         $button.addClass('fa fa-bell-o cp-notifications-bell');
         var $n = $button.find('.cp-dropdown-button-title').hide();
         var $empty = $(div).find('.cp-notifications-empty');

From 3795204fdcc11106144438342b68433e91227f32 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 11 Oct 2023 11:42:31 +0300
Subject: [PATCH 31/87] added ARIA attributes to menu button

---
 www/common/common-ui-elements.js |  4 ----
 www/common/toolbar.js            | 12 ++++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8d23c5e22..f60e4129f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1607,11 +1607,7 @@ define([
             $c.removeClass('cp-dropdown-visible');
             if (!state) {
                 $c.addClass('cp-dropdown-visible');
-                $container.attr('aria-expanded', 'true');
-            } else {
-                $container.attr('aria-expanded', 'false');
             }
-
             try {
                 $('iframe').each(function (idx, ifrw) {
                     $(ifrw).contents().find('.cp-dropdown-content').hide();
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 4aaa1e4a1..fc444a43b 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1022,9 +1022,17 @@ MessengerUI, Messages, Pages) {
         Common.createUserAdminMenu(userMenuCfg);
         $userAdmin.find('> button').attr({
             title: Messages.userAccountButton,
-            alt: Messages.userAccountButton,
+            class: Messages.userAccountButton,
+            'aria-haspopup': 'menu',
+            'aria-expanded': 'false'
+        });
+        $userAdmin.find('> button').click(function() {
+            if ($userAdmin.find('> button').attr('aria-expanded') === 'true') {
+                $userAdmin.find('> button').attr('aria-expanded', 'false');
+            } else {
+                $userAdmin.find('> button').attr('aria-expanded', 'true');
+            }
         });
-
         return $userAdmin;
     };
 

From a0838f35b21d2bf030ef882494cd7d2dd8c4eb2f Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 11 Oct 2023 11:49:16 +0300
Subject: [PATCH 32/87] added ARIA attributes to +New button

---
 www/common/drive-ui.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 5f0634695..988e67238 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3086,6 +3086,15 @@ define([
 
             // Custom style:
             $block.find('button').addClass('cp-app-drive-toolbar-new');
+            $block.find('button').attr('aria-haspopup','menu');
+            $block.find('button').attr('aria-expanded', 'false');
+            $block.find('button').click(function() {
+                if ($block.find('button').attr('aria-expanded') === 'true') {
+                    $block.find('button').attr('aria-expanded', 'false');
+                } else {
+                    $block.find('button').attr('aria-expanded', 'true');
+                }
+            });
 
             addNewPadHandlers($block, isInRoot);
 

From 5a40a9fce64e3f85fa74c03c3c0752878caab1dd Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 11 Oct 2023 11:54:05 +0300
Subject: [PATCH 33/87] added ARIA attributes to Filter button

---
 www/common/drive-ui.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 988e67238..530a16f0b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3191,6 +3191,16 @@ define([
             }
             var $block = UIElements.createDropdown(dropdownConfig);
 
+            $block.find('button').attr('aria-haspopup','menu');
+            $block.find('button').attr('aria-expanded', 'false');
+            $block.find('button').click(function() {
+                if ($block.find('button').attr('aria-expanded') === 'true') {
+                    $block.find('button').attr('aria-expanded', 'false');
+                } else {
+                    $block.find('button').attr('aria-expanded', 'true');
+                }
+            });
+
             // Add style
             if (APP.store[FILTER_BY]) {
                 $block.find('button').addClass('cp-toolbar-button-active');

From ecc4b58a44d025954d0c0780d64575d4a87d5313 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 12 Oct 2023 10:42:20 +0300
Subject: [PATCH 34/87] wrapped element in li

---
 www/common/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index fc444a43b..975da63f9 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1086,7 +1086,7 @@ MessengerUI, Messages, Pages) {
 
     var createNotifications = function (toolbar, config) {
         var $notif = toolbar.$top.find('.'+NOTIFICATIONS_CLS).show();
-        var openNotifsApp = h('div.cp-notifications-gotoapp',{ tabindex: '0' }, h('p', Messages.openNotificationsApp || "Open notifications App"));
+        var openNotifsApp = h('li', {}, h('div.cp-notifications-gotoapp', { tabindex: '0' }, h('p', Messages.openNotificationsApp || "Open notifications App")));
         $(openNotifsApp).on('click keypress', function (event) {
             if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                 Common.openURL("/notifications/");

From c173c1329cfce5ae72fe6dbe63f41791b020d9ab Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 12 Oct 2023 11:27:17 +0300
Subject: [PATCH 35/87] wrapped element in li

---
 www/common/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 975da63f9..e477bae50 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1092,7 +1092,7 @@ MessengerUI, Messages, Pages) {
                 Common.openURL("/notifications/");
             }
         });
-        var div = h('div.cp-notifications-container', [
+        var div = h('li.cp-notifications-container', [
             h('div.cp-notifications-empty', Messages.notifications_empty)
         ]);
         var pads_options = [div];

From 790099723fb003a6f98524f6787a59385ba0dffe Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 17 Oct 2023 13:23:27 +0300
Subject: [PATCH 36/87] wrapped elements(account name + display name) in li
 (user menu)

---
 customize.dist/src/less2/include/toolbar.less | 10 +++++++++-
 www/common/common-ui-elements.js              |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 118fa8288..35e5a90ba 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -869,14 +869,22 @@
                     margin-left: 10px;
                 }
             }
-            p.cp-toolbar-account {
+            li.cp-toolbar-account {
                 &> span {
                     font-weight: bold;
                     span {
                         font-weight: normal;
                     }
                 }
+                min-width: 160px;
+                padding: 5px;
+                margin: 0;
+                white-space: normal;
+                text-align: left;
+                color: #EEEEEE;
+                font-size: 14px;
             }
+
             .cp-toolbar-backup {
                 margin: 0;
                 border-radius: 0;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f60e4129f..b6e54b174 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1785,7 +1785,7 @@ define([
 
         var options = [];
         options.push({
-            tag: 'div',
+            tag: 'li',
             attributes: {'class': 'cp-user-menu-logo'},
             content: h('span', [
                 h('img', {
@@ -1816,7 +1816,7 @@ define([
                 ]));
             }
             options.push({
-                tag: 'p',
+                tag: 'li',
                 attributes: {'class': 'cp-toolbar-account'},
                 content: userAdminContent,
             });

From dbc9cca1ff8131aad4398569525f556d48c68ad2 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 17 Oct 2023 15:07:34 +0300
Subject: [PATCH 37/87] created list in user menu dropdown

---
 .../src/less2/include/dropdown.less           | 57 +++++++++++++++++++
 www/common/common-ui-elements.js              | 21 ++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index f6304db05..e3f1ef827 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -77,6 +77,63 @@
                 display: block;
             }
 
+            li:not([class]) {
+                & > a, & > span {
+                    color: @cp_dropdown-fg;
+                    border-radius: @variables_radius;
+                    padding: 5px;
+                    text-decoration: none;
+                    display: flex;
+                    cursor: pointer;
+                    -webkit-user-select: none;
+                    -moz-user-select: none;
+                    -ms-user-select: none;
+                    user-select: none;
+                    float: none;
+                    text-align: left;
+                    line-height: 1em;
+                    align-items: center;
+
+                    &:not(.fa) {
+                        font: @dropdown_font;
+                    }
+                    &.fa, &.cptools {
+                        font-size: 18px;
+                        &::before {
+                            width: 40px;
+                            margin-left: -10px;
+                            text-align: center;
+                        }
+                        * {
+                            font: @dropdown_font;
+                        }
+                    }
+
+                    .fa, .cptools {
+                        width: 20px;
+                        text-align: center;
+                        margin-right: 5px !important;
+                    }
+
+                    &:hover {
+                        background-color: @cp_dropdown-bg-hover;
+                        color: @cp_dropdown-fg;
+                    }
+
+                    &.cp-dropdown-element-active {
+                        background-color: @cp_dropdown-bg-active;
+                        color: @cp_dropdown-fg;
+                    }
+
+                    &.cp-app-hidden {
+                        display: none;
+                    }
+                    &.cp-app-disabled {
+                        cursor: not-allowed !important;
+                        opacity: 0.5;
+                    }
+                }
+            }
             & > a, & > span {
                 color: @cp_dropdown-fg;
                 border-radius: @variables_radius;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3e1624d42..ff7bc3c49 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1539,6 +1539,16 @@ define([
                         if (typeof(item) === 'string') {
                             $el[0].appendChild(document.createTextNode(item));
                         }
+                        if (typeof item === 'object') {
+                            //  case where item is an object, eg: an <a> tag
+                            var $subElement = $(h(item.tag, item.attributes || {}));
+                            if (typeof item.content === 'string') {
+                                $subElement.text(item.content);
+                            } else if (item.content instanceof Element) {
+                                $subElement.append(item.content);
+                            }
+                            $el.append($subElement);
+                        }
                     });
                     // array of elements or text nodes
                 }
@@ -2102,9 +2112,18 @@ define([
                 return true;
             };
         });
+        var liOptions = options.map(function (option) {
+            if (option.tag === 'hr' || option.tag === 'li') {
+                return option;
+            }
+            return {
+                tag: 'li',
+                content: [option]
+            };
+        });
         var dropdownConfigUser = {
             buttonContent: $userButton[0],
-            options: options, // Entries displayed in the menu
+            options: liOptions, // Entries displayed in the menu
             left: true, // Open to the left of the button
             container: config.$initBlock, // optional
             feedback: "USER_ADMIN",

From fc1f60ff6aa5461a4cffe29885bc2ede9571b9e2 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 20 Oct 2023 15:30:56 +0300
Subject: [PATCH 38/87] added roles to menu items

---
 www/common/common-ui-elements.js | 50 ++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ff7bc3c49..a94ac084e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1515,7 +1515,7 @@ define([
         }
 
         // Menu
-        var $innerblock = $('<ul>', {'class': 'cp-dropdown-content'});
+        var $innerblock = $('<ul>', {'class': 'cp-dropdown-content', 'role': 'menu'});
         if (config.left) { $innerblock.addClass('cp-dropdown-left'); }
 
         var hide = function () {
@@ -1803,7 +1803,8 @@ define([
         var options = [];
         options.push({
             tag: 'li',
-            attributes: {'class': 'cp-user-menu-logo'},
+            role: 'presentation',
+            attributes: {'class': 'cp-user-menu-logo','role':'menuitem'},
             content: h('span', [
                 h('img', {
                     src: '/customize/CryptPad_logo_grey.svg',
@@ -1834,7 +1835,8 @@ define([
             }
             options.push({
                 tag: 'li',
-                attributes: {'class': 'cp-toolbar-account'},
+                role: 'presentation',
+                attributes: {'class': 'cp-toolbar-account','role':'menuitem'},
                 content: userAdminContent,
             });
         }
@@ -1842,7 +1844,7 @@ define([
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '0'},
+                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '0','role':'menuitem'},
                 content: h('span', Messages.profileButton),
                 action: function () {
                     if (padType) {
@@ -1858,7 +1860,8 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-hdd-o',
-                    'tabindex': '0'
+                    'tabindex': '0',
+                    'role': 'menuitem'
                 },
                 content: h('span', Messages.type.drive),
                 action: function () {
@@ -1871,7 +1874,8 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-users',
-                    'tabindex': '0'
+                    'tabindex': '0',
+                    'role': 'menuitem'
                 },
                 content: h('span', Messages.type.teams),
                 action: function () {
@@ -1884,7 +1888,8 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-calendar',
-                    'tabindex': '0'
+                    'tabindex': '0',
+                    'role': 'menuitem'
                 },
                 content: h('span', Messages.calendar),
                 action: function () {
@@ -1897,7 +1902,8 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-address-book',
-                    'tabindex': '0'
+                    'tabindex': '0',
+                    'role': 'menuitem'
                 },
                 content: h('span', Messages.type.contacts),
                 action: function () {
@@ -1908,7 +1914,7 @@ define([
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '0'},
+                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '0','role':'menuitem'},
                 content: h('span', Messages.settingsButton),
                 action: function () {
                     if (padType) {
@@ -1925,7 +1931,7 @@ define([
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '0'},
+                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '0', 'role':'menuitem'},
                 content: h('span', Messages.adminPage || 'Admin'),
                 action: function () {
                     if (padType) {
@@ -1942,7 +1948,8 @@ define([
                 'target': '_blank',
                 'rel': 'noopener',
                 'href': 'https://docs.cryptpad.org',
-                'class': 'fa fa-book'
+                'class': 'fa fa-book',
+                'role': 'menuitem'
             },
             content: h('span', Messages.docs_link)
         });
@@ -1965,7 +1972,8 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'cp-toolbar-about fa fa-info',
-                'tabindex': '0'
+                'tabindex': '0',
+                'role': 'menuitem'
             },
             content: h('span', Messages.user_about),
             action: function () {
@@ -1977,7 +1985,8 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'fa fa-home',
-                'tabindex': '0'
+                'tabindex': '0',
+                'role': 'menuitem'
             },
             content: h('span', Messages.homePage),
             action: function () {
@@ -2019,7 +2028,8 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-gift',
-                    'tabindex': '0'
+                    'tabindex': '0',
+                    'role': 'menuitem'
                 },
                 content: h('span', Messages.crowdfunding_button2),
                 action: function () {
@@ -2050,7 +2060,8 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'cp-toolbar-menu-logout-everywhere fa fa-plug',
-                    'tabindex': '0'
+                    'tabindex': '0',
+                    'role': 'menuitem'
                 },
                 content: h('span', Messages.logoutEverywhere),
                 action: function () {
@@ -2064,7 +2075,7 @@ define([
             });
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '0'},
+                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '0','role':'menuitem'},
                 content: h('span', Messages.logoutButton),
                 action: function () {
                     Common.logout(function () {
@@ -2075,7 +2086,7 @@ define([
         } else {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '0'},
+                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '0','role':'menuitem'},
                 content: h('span', Messages.login_login),
                 action: function () {
                     Common.setLoginRedirect('login');
@@ -2084,7 +2095,7 @@ define([
             if (!Config.restrictRegistration) {
                 options.push({
                     tag: 'a',
-                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus','tabindex': '0'},
+                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus','tabindex': '0', 'role':'menuitem'},
                     content: h('span', Messages.login_register),
                     action: function () {
                         Common.setLoginRedirect('register');
@@ -2118,7 +2129,8 @@ define([
             }
             return {
                 tag: 'li',
-                content: [option]
+                content: [option],
+                attributes: { 'role': 'presentation'}
             };
         });
         var dropdownConfigUser = {

From 4ae780ec414fdfc29343930aff122770c443769a Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 23 Oct 2023 15:53:38 +0300
Subject: [PATCH 39/87] dropdown prototype tabbing out not allowed, can use
 arrow keys through dropdown elements (no exceptions yet)

---
 www/common/common-ui-elements.js | 31 ++++++++++++++++---------------
 www/common/toolbar.js            | 26 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a94ac084e..ba13f2b41 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1844,7 +1844,7 @@ define([
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '0','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.profileButton),
                 action: function () {
                     if (padType) {
@@ -1860,7 +1860,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-hdd-o',
-                    'tabindex': '0',
+                    'tabindex': '-1',
                     'role': 'menuitem'
                 },
                 content: h('span', Messages.type.drive),
@@ -1874,7 +1874,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-users',
-                    'tabindex': '0',
+                    'tabindex': '-1',
                     'role': 'menuitem'
                 },
                 content: h('span', Messages.type.teams),
@@ -1888,7 +1888,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-calendar',
-                    'tabindex': '0',
+                    'tabindex': '-1',
                     'role': 'menuitem'
                 },
                 content: h('span', Messages.calendar),
@@ -1902,7 +1902,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-address-book',
-                    'tabindex': '0',
+                    'tabindex': '-1',
                     'role': 'menuitem'
                 },
                 content: h('span', Messages.type.contacts),
@@ -1914,7 +1914,7 @@ define([
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '0','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.settingsButton),
                 action: function () {
                     if (padType) {
@@ -1931,7 +1931,7 @@ define([
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '0', 'role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '-1', 'role':'menuitem'},
                 content: h('span', Messages.adminPage || 'Admin'),
                 action: function () {
                     if (padType) {
@@ -1949,7 +1949,8 @@ define([
                 'rel': 'noopener',
                 'href': 'https://docs.cryptpad.org',
                 'class': 'fa fa-book',
-                'role': 'menuitem'
+                'role': 'menuitem',
+                'tabindex': -1
             },
             content: h('span', Messages.docs_link)
         });
@@ -1972,7 +1973,7 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'cp-toolbar-about fa fa-info',
-                'tabindex': '0',
+                'tabindex': '-1',
                 'role': 'menuitem'
             },
             content: h('span', Messages.user_about),
@@ -1985,7 +1986,7 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'fa fa-home',
-                'tabindex': '0',
+                'tabindex': '-1',
                 'role': 'menuitem'
             },
             content: h('span', Messages.homePage),
@@ -2028,7 +2029,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-gift',
-                    'tabindex': '0',
+                    'tabindex': '-1',
                     'role': 'menuitem'
                 },
                 content: h('span', Messages.crowdfunding_button2),
@@ -2060,7 +2061,7 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'cp-toolbar-menu-logout-everywhere fa fa-plug',
-                    'tabindex': '0',
+                    'tabindex': '-1',
                     'role': 'menuitem'
                 },
                 content: h('span', Messages.logoutEverywhere),
@@ -2075,7 +2076,7 @@ define([
             });
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '0','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.logoutButton),
                 action: function () {
                     Common.logout(function () {
@@ -2086,7 +2087,7 @@ define([
         } else {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '0','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.login_login),
                 action: function () {
                     Common.setLoginRedirect('login');
@@ -2124,7 +2125,7 @@ define([
             };
         });
         var liOptions = options.map(function (option) {
-            if (option.tag === 'hr' || option.tag === 'li') {
+            if (option.tag === 'li') {
                 return option;
             }
             return {
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index cab311332..7eb10413d 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1030,8 +1030,34 @@ MessengerUI, Messages, Pages) {
         $userAdmin.find('> button').click(function() {
             if ($userAdmin.find('> button').attr('aria-expanded') === 'true') {
                 $userAdmin.find('> button').attr('aria-expanded', 'false');
+                $(document).off('keydown');
             } else {
                 $userAdmin.find('> button').attr('aria-expanded', 'true');
+                var dropdownActive = $(".cp-dropdown-content");
+                if (dropdownActive.length > 0) {
+                    dropdownActive.attr('tabindex', '0').focus();
+                    $(document).on('keydown', function(e) {
+                        if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
+                            var items = dropdownActive.find('li');
+                            var focusedItem = items.filter(':focus');
+                            items.attr('tabindex', '-1');
+                            if (e.key === 'Tab') {
+                                e.preventDefault();
+                            } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+                                if (e.key === 'ArrowUp') {
+                                    var prevItem = focusedItem.prev().length ? focusedItem.prev() : items.last();
+                                    prevItem.attr('tabindex', '0').focus();
+                                } else if (e.key === 'ArrowDown') {
+                                    var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
+                                    nextItem.attr('tabindex', '0').focus();
+                                }
+                            }
+                        } else if (e.key === 'Escape') {
+                            $(document).off('keydown');
+                            $userAdmin.find('> button').attr('aria-expanded', 'false');
+                        }
+                    });
+                }
             }
         });
         return $userAdmin;

From 90bb9a64b97765c82adcc7a31ebfbd165ece523d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 24 Oct 2023 15:14:24 +0300
Subject: [PATCH 40/87] certain li elements are ignored in dropdown

---
 www/common/toolbar.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 7eb10413d..10934bf7e 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1043,12 +1043,19 @@ MessengerUI, Messages, Pages) {
                             items.attr('tabindex', '-1');
                             if (e.key === 'Tab') {
                                 e.preventDefault();
-                            } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+                            }
+                            else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
                                 if (e.key === 'ArrowUp') {
                                     var prevItem = focusedItem.prev().length ? focusedItem.prev() : items.last();
+                                    while (prevItem.find('hr').length > 0 || prevItem.hasClass('cp-user-menu-logo') || prevItem.hasClass('cp-toolbar-account')) {
+                                        prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
+                                    }
                                     prevItem.attr('tabindex', '0').focus();
                                 } else if (e.key === 'ArrowDown') {
                                     var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
+                                    while (nextItem.find('hr').length > 0 || nextItem.hasClass('cp-user-menu-logo') || nextItem.hasClass('cp-toolbar-account')) {
+                                        nextItem = nextItem.next().length ? nextItem.next() : items.first();
+                                    }
                                     nextItem.attr('tabindex', '0').focus();
                                 }
                             }

From 762a781067556155e2a57c4905185097874dd5a7 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 24 Oct 2023 15:49:01 +0300
Subject: [PATCH 41/87] menu button regains focus when dropdown is closed

---
 www/common/toolbar.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 10934bf7e..88b2de659 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1027,7 +1027,7 @@ MessengerUI, Messages, Pages) {
             'aria-expanded': 'false',
             'aria-label': Messages.userAccountButton
         });
-        $userAdmin.find('> button').click(function() {
+        $userAdmin.find('> button').click(function () {
             if ($userAdmin.find('> button').attr('aria-expanded') === 'true') {
                 $userAdmin.find('> button').attr('aria-expanded', 'false');
                 $(document).off('keydown');
@@ -1036,20 +1036,20 @@ MessengerUI, Messages, Pages) {
                 var dropdownActive = $(".cp-dropdown-content");
                 if (dropdownActive.length > 0) {
                     dropdownActive.attr('tabindex', '0').focus();
-                    $(document).on('keydown', function(e) {
+                    $(document).on('keydown', function (e) {
                         if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
                             var items = dropdownActive.find('li');
                             var focusedItem = items.filter(':focus');
                             items.attr('tabindex', '-1');
                             if (e.key === 'Tab') {
                                 e.preventDefault();
-                            }
-                            else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+                            } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
                                 if (e.key === 'ArrowUp') {
                                     var prevItem = focusedItem.prev().length ? focusedItem.prev() : items.last();
                                     while (prevItem.find('hr').length > 0 || prevItem.hasClass('cp-user-menu-logo') || prevItem.hasClass('cp-toolbar-account')) {
                                         prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
                                     }
+                                    console.log(prevItem);
                                     prevItem.attr('tabindex', '0').focus();
                                 } else if (e.key === 'ArrowDown') {
                                     var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
@@ -1057,11 +1057,14 @@ MessengerUI, Messages, Pages) {
                                         nextItem = nextItem.next().length ? nextItem.next() : items.first();
                                     }
                                     nextItem.attr('tabindex', '0').focus();
+                                    console.log(nextItem);
                                 }
                             }
                         } else if (e.key === 'Escape') {
+                            dropdownActive.find('li').attr('tabindex', '-1');
                             $(document).off('keydown');
                             $userAdmin.find('> button').attr('aria-expanded', 'false');
+                            $userAdmin.find('> button').focus();
                         }
                     });
                 }

From e8c7f1b20e6a943068734e1b5b69b52c785ebe6f Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 24 Oct 2023 17:27:19 +0300
Subject: [PATCH 42/87] menu button regains focus when dropdown is closed bug
 fixed

---
 www/common/toolbar.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 88b2de659..fa448e34b 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1060,11 +1060,14 @@ MessengerUI, Messages, Pages) {
                                     console.log(nextItem);
                                 }
                             }
-                        } else if (e.key === 'Escape') {
-                            dropdownActive.find('li').attr('tabindex', '-1');
-                            $(document).off('keydown');
-                            $userAdmin.find('> button').attr('aria-expanded', 'false');
-                            $userAdmin.find('> button').focus();
+                            else if (e.key === 'Escape') {
+                                dropdownActive.find('li').attr('tabindex', '-1');
+                                dropdownActive.attr('tabindex', '-1');
+                                $(document).off('keydown');
+                                $userAdmin.find('> button').attr('aria-expanded', 'false');
+                                $userAdmin.find('> button').focus();
+                                console.log("AM INTRAT");
+                            }
                         }
                     });
                 }

From 0eb051b7e5c49dfa1a005c86657f36b723aebafc Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 24 Oct 2023 18:01:29 +0300
Subject: [PATCH 43/87] focus shifts from button to dropdown when trying to
 open the dropdown

---
 www/common/toolbar.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index fa448e34b..7be4d5fbd 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1033,9 +1033,13 @@ MessengerUI, Messages, Pages) {
                 $(document).off('keydown');
             } else {
                 $userAdmin.find('> button').attr('aria-expanded', 'true');
+                $userAdmin.find('> button').blur();
                 var dropdownActive = $(".cp-dropdown-content");
                 if (dropdownActive.length > 0) {
-                    dropdownActive.attr('tabindex', '0').focus();
+                    dropdownActive.attr('tabindex', '0');
+                    setTimeout(function() {
+                        dropdownActive.focus();
+                    }, 0);
                     $(document).on('keydown', function (e) {
                         if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
                             var items = dropdownActive.find('li');

From ebfafea3267d71bfd71e033edc61d68bedec4d91 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 30 Oct 2023 13:53:58 +0200
Subject: [PATCH 44/87] navigation inside dropdown works correctly + focus gets
 on the first element in the dropdown

---
 package-lock.json     | 465 +++++++++++++-----------------------------
 www/common/toolbar.js | 410 ++++++++++++++++++++++++-------------
 2 files changed, 411 insertions(+), 464 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 189259d0b..51f93cf61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,9 +106,9 @@
       }
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.12",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz",
-      "integrity": "sha512-kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw==",
+      "version": "1.17.13",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
+      "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -120,9 +120,12 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.6.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz",
-      "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA=="
+      "version": "20.8.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz",
+      "integrity": "sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.10",
@@ -792,12 +795,13 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -945,66 +949,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/cli": {
@@ -1221,6 +1176,19 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
@@ -1344,9 +1312,9 @@
       }
     },
     "node_modules/drawio": {
-      "name": "drawio-cp",
+      "name": "drawio-cp-npm",
       "version": "21.7.5",
-      "resolved": "git+ssh://git@github.com/cryptpad/drawio-npm.git#b430ab78be9944f19721c3489c9ce95bc1abe2ca"
+      "resolved": "git+ssh://git@github.com/cryptpad/drawio-npm.git#3d33ff2b65289dd92c03be16dfcde4cdaf77e516"
     },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
@@ -1461,66 +1429,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/express": {
@@ -1886,9 +1805,12 @@
       "dev": true
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/gar": {
       "version": "1.0.4",
@@ -1908,14 +1830,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2014,20 +1936,31 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz",
       "integrity": "sha512-zGRpnr2l5w/s8PxkrquUJoVeR06KvqPelrYqiSyQV7QEBqCYivpb6UzXYWC6JDBVtNFOT0rzJRFhkfJgxzmILA=="
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dependencies": {
-        "function-bind": "^1.1.1"
+        "get-intrinsic": "^1.2.2"
       },
-      "engines": {
-        "node": ">= 0.4.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
@@ -2115,6 +2048,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/html2canvas": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
@@ -2272,22 +2216,14 @@
       }
     },
     "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "hasown": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10"
       }
     },
     "node_modules/is-arrayish": {
@@ -2302,43 +2238,26 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "hasown": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/is-directory": {
@@ -3128,47 +3047,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/object-copy/node_modules/kind-of": {
@@ -3183,9 +3071,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3940,6 +3828,20 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-getter": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
@@ -4081,66 +3983,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/snapdragon/node_modules/source-map": {
@@ -4261,61 +4114,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/statuses": {
@@ -4589,6 +4397,11 @@
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 7be4d5fbd..1aa6514f0 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -14,7 +14,7 @@ define([
     '/customize/messages.js',
     '/customize/pages.js',
 ], function ($, Config, ApiConfig, Broadcast, UIElements, UI, Hash, Util, Feedback, MT, h,
-MessengerUI, Messages, Pages) {
+             MessengerUI, Messages, Pages) {
     var Common;
 
     var Bar = {
@@ -52,7 +52,8 @@ MessengerUI, Messages, Pages) {
     // User admin menu
     var USERADMIN_CLS = Bar.constants.user = 'cp-toolbar-user-dropdown';
     var USERNAME_CLS = Bar.constants.username = 'cp-toolbar-user-name';
-    /*var READONLY_CLS = */Bar.constants.readonly = 'cp-toolbar-readonly';
+    /*var READONLY_CLS = */
+    Bar.constants.readonly = 'cp-toolbar-readonly';
     var USERBUTTON_CLS = Bar.constants.changeUsername = "cp-toolbar-user-rename";
 
     // Create the toolbar element
@@ -63,17 +64,23 @@ MessengerUI, Messages, Pages) {
 
     var observeChildren = function ($content) {
         var reorderDOM = Util.throttle(function ($content, observer) {
-            if (!$content.length) { return; }
+            if (!$content.length) {
+                return;
+            }
 
             // List all children based on their "order" property
             var map = {};
             $content[0].childNodes.forEach((node) => {
                 try {
-                    if (!node.attributes) { return; }
+                    if (!node.attributes) {
+                        return;
+                    }
                     var order = getComputedStyle(node).getPropertyValue("order");
                     var a = map[order] = map[order] || [];
                     a.push(node);
-                } catch (e) { console.error(e, node); }
+                } catch (e) {
+                    console.error(e, node);
+                }
             });
 
             // Disconnect the observer while we're reordering to avoid infinite loop
@@ -82,7 +89,9 @@ MessengerUI, Messages, Pages) {
                 return Number(a) - Number(b);
             }).forEach(function (k) {
                 var arr = map[k];
-                if (!Number(k)) { return; } // No need to "append" if order is 0
+                if (!Number(k)) {
+                    return;
+                } // No need to "append" if order is 0
                 // Reorder
                 arr.forEach(function (node) {
                     $content.append(node);
@@ -91,8 +100,8 @@ MessengerUI, Messages, Pages) {
             observer.start();
         }, 100);
 
-        let observer = new MutationObserver(function(mutations) {
-            mutations.forEach(function(mutation) {
+        let observer = new MutationObserver(function (mutations) {
+            mutations.forEach(function (mutation) {
                 if (mutation.addedNodes.length) {
                     reorderDOM($content, observer);
                 }
@@ -107,12 +116,14 @@ MessengerUI, Messages, Pages) {
     };
 
     var createRealtimeToolbar = function (config) {
-        if (!config.$container) { return; }
+        if (!config.$container) {
+            return;
+        }
         var $container = config.$container;
 
         var priv = config.metadataMgr.getPrivateData();
         var isEmbed = Bar.isEmbed = priv.isEmbed ||
-                (priv.app === 'form' && priv.readOnly && !priv.form_auditorHash);
+            (priv.app === 'form' && priv.readOnly && !priv.form_auditorHash);
         if (isEmbed) {
             $container.hide();
         }
@@ -133,22 +144,22 @@ MessengerUI, Messages, Pages) {
         $('<span>', {'class': USERADMIN_CLS + ' cp-dropdown-container'}).hide().appendTo($userContainer);
 
         $toolbar.append($topContainer);
-        var $bottom = $(h('div.'+BOTTOM_CLS, [
-            h('div.'+BOTTOM_LEFT_CLS),
-            h('div.'+BOTTOM_MID_CLS),
-            h('div.'+BOTTOM_RIGHT_CLS)
+        var $bottom = $(h('div.' + BOTTOM_CLS, [
+            h('div.' + BOTTOM_LEFT_CLS),
+            h('div.' + BOTTOM_MID_CLS),
+            h('div.' + BOTTOM_RIGHT_CLS)
         ])).appendTo($toolbar);
-        $toolbar.append(h('div.'+HISTORY_CLS));
-        $toolbar.append(h('div.'+SNAPSHOTS_CLS));
+        $toolbar.append(h('div.' + HISTORY_CLS));
+        $toolbar.append(h('div.' + SNAPSHOTS_CLS));
 
-        var $file = $toolbar.find('.'+BOTTOM_LEFT_CLS);
+        var $file = $toolbar.find('.' + BOTTOM_LEFT_CLS);
 
         if (!config.hideDrawer) {
             var $drawer = $(h('button.' + FILE_CLS, [
                 h('i.fa.fa-file-o'),
                 h('span.cp-button-name', Messages.toolbar_file)
             ])).appendTo($file).hide();
-            var $drawerContent = $(h('div.'+ DRAWER_CLS, {tabindex: 1})).hide();
+            var $drawerContent = $(h('div.' + DRAWER_CLS, {tabindex: 1})).hide();
             UI.createDrawer($drawer, $drawerContent);
         }
 
@@ -168,7 +179,7 @@ MessengerUI, Messages, Pages) {
 
     // Userlist elements
 
-    var getOtherUsers = function(config) {
+    var getOtherUsers = function (config) {
         //var userList = config.userList.getUserlist();
         var userData = config.metadataMgr.getMetadata().users;
 
@@ -177,16 +188,20 @@ MessengerUI, Messages, Pages) {
 
         // Display only one time each user (if he is connected in multiple tabs)
         var uids = [];
-        Object.keys(userData).forEach(function(user) {
+        Object.keys(userData).forEach(function (user) {
             //if (user !== userNetfluxId) {
-                var data = userData[user] || {};
-                var userId = data.uid;
-                if (!userId) { return; }
-                //data.netfluxId = user;
-                if (uids.indexOf(userId) === -1) {// && (!myUid || userId !== myUid)) {
-                    uids.push(userId);
-                    list.push(data);
-                } else { i++; }
+            var data = userData[user] || {};
+            var userId = data.uid;
+            if (!userId) {
+                return;
+            }
+            //data.netfluxId = user;
+            if (uids.indexOf(userId) === -1) {// && (!myUid || userId !== myUid)) {
+                uids.push(userId);
+                list.push(data);
+            } else {
+                i++;
+            }
             //}
         });
         return {
@@ -209,8 +224,12 @@ MessengerUI, Messages, Pages) {
     };
     var showColors = false;
     var updateUserList = function (toolbar, config, forceOffline) {
-        if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
-        if (toolbar.isAlone) { return; }
+        if (!config.displayed || config.displayed.indexOf('userlist') === -1) {
+            return;
+        }
+        if (toolbar.isAlone) {
+            return;
+        }
         // Make sure the elements are displayed
         var $userButtons = toolbar.userlist;
         var $userlistContent = toolbar.userlistContent;
@@ -254,12 +273,11 @@ MessengerUI, Messages, Pages) {
         }
 
 
-
         // Update the userlist
         var $editUsers = $userlistContent.find('.' + USERLIST_CLS).html('');
 
         var $editUsersList = $('<div>', {'class': 'cp-toolbar-userlist-others'})
-                                .appendTo($editUsers);
+            .appendTo($editUsers);
 
         var degradedLimit = Config.degradedLimit || 8;
         if (toolbar.isDeleted) {
@@ -282,9 +300,13 @@ MessengerUI, Messages, Pages) {
         var $spansmall = $('<span>').html(fa_editusers + ' ' + numberOfEditUsers + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers);
         $userButtons.find('.cp-dropdown-button-title').html('').append($spansmall);
 
-        if (!online || toolbar.isDeleted) { return; }
+        if (!online || toolbar.isDeleted) {
+            return;
+        }
 
-        if (metadataMgr.isDegraded() === true) { return; }
+        if (metadataMgr.isDegraded() === true) {
+            return;
+        }
 
         // Display the userlist
 
@@ -310,7 +332,10 @@ MessengerUI, Messages, Pages) {
                         'class': 'fa fa-pencil cp-toolbar-userlist-button',
                         title: Messages.user_rename
                     }).appendTo($nameSpan);
-                    $button.hover(function (e) { e.preventDefault(); e.stopPropagation(); });
+                    $button.hover(function (e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    });
                     $button.mouseenter(function (e) {
                         e.preventDefault();
                         e.stopPropagation();
@@ -353,8 +378,10 @@ MessengerUI, Messages, Pages) {
                         $button.click();
                         $nameInput.val(editingUserName.value);
                         $nameInput[0].setSelectionRange(editingUserName.select[0],
-                                                     editingUserName.select[1]);
-                        setTimeout(function () { $nameInput.focus(); });
+                            editingUserName.select[1]);
+                        setTimeout(function () {
+                            $nameInput.focus();
+                        });
                     }
                 }
             } else if (Common.isLoggedIn() && data.curvePublic && !friends[data.curvePublic]
@@ -405,7 +432,7 @@ MessengerUI, Messages, Pages) {
                 $span.addClass('cp-userlist-clickable');
                 $span.attr('title', Messages._getKey('userlist_visitProfile', [name]));
                 $span.click(function () {
-                    Common.openURL(origin+'/profile/#' + data.profile);
+                    Common.openURL(origin + '/profile/#' + data.profile);
                 });
             }
             Common.displayAvatar($span, data.avatar, name, function () {
@@ -428,8 +455,12 @@ MessengerUI, Messages, Pages) {
         if (config.metadataMgr) {
             var metadataMgr = config.metadataMgr;
             metadataMgr.onChange(function () {
-                if (metadataMgr.isConnected()) {toolbar.connected = true;}
-                if (!toolbar.connected) { return; }
+                if (metadataMgr.isConnected()) {
+                    toolbar.connected = true;
+                }
+                if (!toolbar.connected) {
+                    return;
+                }
                 updateUserList(toolbar, config);
             });
             setTimeout(function () {
@@ -459,7 +490,7 @@ MessengerUI, Messages, Pages) {
         var $container = $('<span>', {id: 'cp-toolbar-userlist-drawer-open', title: Messages.userListButton});
 
         var $button = $('<button>').appendTo($container);
-        $('<span>',{'class': 'cp-dropdown-button-title'}).appendTo($button);
+        $('<span>', {'class': 'cp-dropdown-button-title'}).appendTo($button);
 
         toolbar.$bottomR.prepend($container);
 
@@ -472,7 +503,10 @@ MessengerUI, Messages, Pages) {
             $button.removeClass('cp-toolbar-button-active');
         };
         var show = function () {
-            if (Bar.isEmbed) { $content.hide(); return; }
+            if (Bar.isEmbed) {
+                $content.hide();
+                return;
+            }
             $content.show();
             $button.addClass('cp-toolbar-button-active');
         };
@@ -484,15 +518,18 @@ MessengerUI, Messages, Pages) {
         */
         $button.click(function () {
             var visible = $content.is(':visible');
-            if (visible) { hide(); }
-            else { show(); }
+            if (visible) {
+                hide();
+            } else {
+                show();
+            }
             visible = !visible;
             Common.setAttribute(['toolbar', 'userlist-drawer'], visible);
-            Feedback.send(visible?'USERLIST_SHOW': 'USERLIST_HIDE');
+            Feedback.send(visible ? 'USERLIST_SHOW' : 'USERLIST_HIDE');
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || window.innerWidth < 800)  {
+            if (val === false || window.innerWidth < 800) {
                 return void hide();
             }
             show();
@@ -507,7 +544,7 @@ MessengerUI, Messages, Pages) {
         var down = h('i.fa.fa-chevron-down', {title: Messages.toolbar_expand});
         var notif = h('span.cp-collapsed-notif');
 
-        var $button = $(h('button.cp-toolbar-collapse',[
+        var $button = $(h('button.cp-toolbar-collapse', [
             up,
             down,
             notif
@@ -543,7 +580,9 @@ MessengerUI, Messages, Pages) {
         if (!config.metadataMgr) {
             throw new Error("You must provide a `metadataMgr` to display the chat");
         }
-        if (Config.availablePadTypes.indexOf('contacts') === -1) { return; }
+        if (Config.availablePadTypes.indexOf('contacts') === -1) {
+            return;
+        }
         var $content = $('<div>', {'class': 'cp-toolbar-chat-drawer'});
         $content.on('drop dragover', function (e) {
             e.preventDefault();
@@ -578,7 +617,10 @@ MessengerUI, Messages, Pages) {
             config.$contentContainer.removeClass('cp-chat-visible');
         };
         var show = function () {
-            if (Bar.isEmbed) { $content.hide(); return; }
+            if (Bar.isEmbed) {
+                $content.hide();
+                return;
+            }
             $content.show();
             // scroll down chat
             var $messagebox = $content.find('.cp-app-contacts-messages');
@@ -598,8 +640,11 @@ MessengerUI, Messages, Pages) {
         */
         $button.click(function () {
             var visible = $content.is(':visible');
-            if (visible) { hide(true); }
-            else { show(); }
+            if (visible) {
+                hide(true);
+            } else {
+                show();
+            }
             visible = !visible;
             Common.setAttribute(['toolbar', 'chat-drawer'], visible);
         });
@@ -636,8 +681,8 @@ MessengerUI, Messages, Pages) {
             }
             var privateData = config.metadataMgr.getPrivateData();
             var title = (config.title && config.title.getTitle && config.title.getTitle())
-                        || (config.title && config.title.defaultName)
-                        || "";
+                || (config.title && config.title.defaultName)
+                || "";
             Common.getSframeChannel().event('EV_SHARE_OPEN', {
                 title: title,
                 auditorHash: privateData.form_auditorHash
@@ -666,8 +711,8 @@ MessengerUI, Messages, Pages) {
                 return void UI.warn(Messages.deletedFromServer);
             }
             var title = (config.title && config.title.getTitle && config.title.getTitle())
-                        || (config.title && config.title.defaultName)
-                        || "";
+                || (config.title && config.title.defaultName)
+                || "";
             Common.getSframeChannel().event('EV_ACCESS_OPEN', {
                 title: title
             });
@@ -694,7 +739,7 @@ MessengerUI, Messages, Pages) {
         });
         $shareBlock.click(function () {
             var title = (config.title && config.title.getTitle && config.title.getTitle())
-                        || "";
+                || "";
             Common.getSframeChannel().event('EV_SHARE_OPEN', {
                 title: title,
                 file: true
@@ -735,11 +780,11 @@ MessengerUI, Messages, Pages) {
         }).hide();
         if (config.readOnly === 1) {
             $hoverable.append($('<span>', {'class': 'cp-toolbar-title-readonly'})
-                .text('('+Messages.readonly+')'));
+                .text('(' + Messages.readonly + ')'));
             return $titleContainer;
         }
         $hoverable.append($('<span>', {'class': 'cp-toolbar-title-readonly cp-toolbar-title-unsync'})
-            .text('('+Messages.readonly+')'));
+            .text('(' + Messages.readonly + ')'));
         var $input = $('<input>', {
             type: 'text',
             placeholder: placeholder,
@@ -768,13 +813,17 @@ MessengerUI, Messages, Pages) {
             return true;
         });
         var save = function () {
-            if (toolbar.history) { return; }
+            if (toolbar.history) {
+                return;
+            }
             var name = $input.val().trim();
             if (name === "") {
                 name = $input.attr('placeholder');
             }
             updateTitle(name, function (err/*, newtitle*/) {
-                if (err) { return console.error(err); }
+                if (err) {
+                    return console.error(err);
+                }
                 //$text.text(newtitle);
                 $input.hide();
                 $text.show();
@@ -798,9 +847,13 @@ MessengerUI, Messages, Pages) {
         $saveIcon.click(save);
 
         var displayInput = function () {
-            if (toolbar.connected === false) { return; }
-            if (toolbar.history) { return; }
-            $input.width(Math.max(($text.width() + 10), 300)+'px');
+            if (toolbar.connected === false) {
+                return;
+            }
+            if (toolbar.history) {
+                return;
+            }
+            $input.width(Math.max(($text.width() + 10), 300) + 'px');
             $text.hide();
             //$pencilIcon.css('display', 'none');
             var inputVal = suggestName() || "";
@@ -829,7 +882,9 @@ MessengerUI, Messages, Pages) {
 
 
     var createPageTitle = function (toolbar, config) {
-        if (!config.pageTitle) { return; }
+        if (!config.pageTitle) {
+            return;
+        }
         var $titleContainer = $('<span>', {
             'class': TITLE_CLS
         }).appendTo(toolbar.$top);
@@ -863,7 +918,7 @@ MessengerUI, Messages, Pages) {
         var isAnonSF = privateData.newSharedFolder && !privateData.accountName;
         var toMain = inDrive.test(pathname) && !isAnonSF;
 
-        var href = toMain ? origin+'/index.html' : origin+'/drive/';
+        var href = toMain ? origin + '/index.html' : origin + '/drive/';
         var buttonTitle = toMain ? Messages.header_homeTitle : Messages.header_logoTitle;
         var $aTag = $('<a>', {
             href: href,
@@ -882,7 +937,9 @@ MessengerUI, Messages, Pages) {
             Common.gotoURL(href);
         };
 
-        var onContext = function (e) { e.stopPropagation(); };
+        var onContext = function (e) {
+            e.stopPropagation();
+        };
 
         $aTag.click(onClick).contextmenu(onContext);
 
@@ -893,25 +950,37 @@ MessengerUI, Messages, Pages) {
 
     var typing = -1;
     var kickSpinner = function (toolbar, config/*, local*/) {
-        if (!toolbar.spinner) { return; }
-        if (toolbar.isErrorState) { return; }
+        if (!toolbar.spinner) {
+            return;
+        }
+        if (toolbar.isErrorState) {
+            return;
+        }
         var $spin = toolbar.spinner;
 
         if (typing === -1) {
             typing = 1;
             $spin.text(Messages.typing);
             $spin.interval = window.setInterval(function () {
-                if (toolbar.isErrorState) { return; }
-                var dots = Array(typing+1).join('.');
+                if (toolbar.isErrorState) {
+                    return;
+                }
+                var dots = Array(typing + 1).join('.');
                 $spin.text(Messages.typing + dots);
                 typing++;
-                if (typing > 3) { typing = 0; }
+                if (typing > 3) {
+                    typing = 0;
+                }
             }, 500);
         }
         var onSynced = function () {
-            if ($spin.timeout) { clearTimeout($spin.timeout); }
+            if ($spin.timeout) {
+                clearTimeout($spin.timeout);
+            }
             $spin.timeout = setTimeout(function () {
-                if (toolbar.isErrorState) { return; }
+                if (toolbar.isErrorState) {
+                    return;
+                }
                 window.clearInterval($spin.interval);
                 typing = -1;
                 $spin.text(Messages.saved);
@@ -920,7 +989,11 @@ MessengerUI, Messages, Pages) {
         if (config.spinner) {
             var h = function () {
                 onSynced();
-                try { config.spinner.onSync.unreg(h); } catch (e) { console.error(e); }
+                try {
+                    config.spinner.onSync.unreg(h);
+                } catch (e) {
+                    console.error(e);
+                }
             };
             config.spinner.onSync.reg(h);
             return;
@@ -929,11 +1002,15 @@ MessengerUI, Messages, Pages) {
     };
     var ks = function (toolbar, config, local) {
         return function () {
-            if (toolbar.connected) { kickSpinner(toolbar, config, local); }
+            if (toolbar.connected) {
+                kickSpinner(toolbar, config, local);
+            }
         };
     };
     var createSpinner = function (toolbar, config) {
-        if (config.readOnly === 1) { return; }
+        if (config.readOnly === 1) {
+            return;
+        }
         var $spin = $('<span>', {'class': SPINNER_CLS}).appendTo(toolbar.title);
         $spin.text(Messages.synchronizing);
 
@@ -961,7 +1038,7 @@ MessengerUI, Messages, Pages) {
 
     var createLimit = function (toolbar, config) {
         var $limitIcon = $('<span>', {'class': 'fa fa-exclamation-triangle'});
-        var $limit = toolbar.$userAdmin.find('.'+LIMIT_CLS).attr({
+        var $limit = toolbar.$userAdmin.find('.' + LIMIT_CLS).attr({
             'title': Messages.pinLimitReached
         }).append($limitIcon).hide();
 
@@ -971,7 +1048,9 @@ MessengerUI, Messages, Pages) {
         l.href = origin;
 
         var todo = function (e, overLimit) {
-            if (e) { return void console.error("Unable to get the pinned usage", e); }
+            if (e) {
+                return void console.error("Unable to get the pinned usage", e);
+            }
             if (overLimit) {
                 $limit.show().click(function () {
                     if (ApiConfig.allowSubscriptions && Config.upgradeURL) {
@@ -1005,7 +1084,7 @@ MessengerUI, Messages, Pages) {
             throw new Error("You must provide a `metadataMgr` to display the user menu");
         }
         var metadataMgr = config.metadataMgr;
-        var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
+        var $userAdmin = toolbar.$userAdmin.find('.' + USERADMIN_CLS).show();
         var userMenuCfg = {
             $initBlock: $userAdmin,
         };
@@ -1036,13 +1115,16 @@ MessengerUI, Messages, Pages) {
                 $userAdmin.find('> button').blur();
                 var dropdownActive = $(".cp-dropdown-content");
                 if (dropdownActive.length > 0) {
-                    dropdownActive.attr('tabindex', '0');
-                    setTimeout(function() {
-                        dropdownActive.focus();
+                    setTimeout(function () {
+                        let items = dropdownActive.find('li:visible');
+                        const firstVisibleItem = items.filter(function () {
+                            return !($(this).find('hr').length > 0 || $(this).hasClass('cp-user-menu-logo') || $(this).hasClass('cp-toolbar-account'));
+                        }).first();
+                        firstVisibleItem.attr('tabindex', '0').focus();
                     }, 0);
                     $(document).on('keydown', function (e) {
                         if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
-                            var items = dropdownActive.find('li');
+                            var items = dropdownActive.find('li:visible');
                             var focusedItem = items.filter(':focus');
                             items.attr('tabindex', '-1');
                             if (e.key === 'Tab') {
@@ -1061,10 +1143,9 @@ MessengerUI, Messages, Pages) {
                                         nextItem = nextItem.next().length ? nextItem.next() : items.first();
                                     }
                                     nextItem.attr('tabindex', '0').focus();
-                                    console.log(nextItem);
+                                    console.log("ce " + nextItem);
                                 }
-                            }
-                            else if (e.key === 'Escape') {
+                            } else if (e.key === 'Escape') {
                                 dropdownActive.find('li').attr('tabindex', '-1');
                                 dropdownActive.attr('tabindex', '-1');
                                 $(document).off('keydown');
@@ -1081,14 +1162,16 @@ MessengerUI, Messages, Pages) {
     };
 
     var createMaintenance = function (toolbar, config) {
-        var $notif = toolbar.$top.find('.'+MAINTENANCE_CLS);
+        var $notif = toolbar.$top.find('.' + MAINTENANCE_CLS);
         var button = h('button.cp-maintenance-wrench.fa.fa-wrench');
         $notif.append(button);
 
 
         var m = Broadcast.maintenance;
         $(button).click(function () {
-            if (!m || !m.start || !m.end) { return; }
+            if (!m || !m.start || !m.end) {
+                return;
+            }
             UI.alert(Messages._getKey('broadcast_maintenance', [
                 new Date(m.start).toLocaleString(),
                 new Date(m.end).toLocaleString(),
@@ -1099,7 +1182,9 @@ MessengerUI, Messages, Pages) {
         Common.makeUniversal('broadcast', {
             onEvent: function (obj) {
                 var cmd = obj.ev;
-                if (cmd !== "MAINTENANCE") { return; }
+                if (cmd !== "MAINTENANCE") {
+                    return;
+                }
                 var data = obj.data;
                 if (!data) {
                     return void $notif.hide();
@@ -1112,7 +1197,7 @@ MessengerUI, Messages, Pages) {
                 to = setTimeout(function () {
                     m = undefined;
                     $notif.hide();
-                }, m.end-(+new Date()));
+                }, m.end - (+new Date()));
                 $notif.css('display', '');
             }
         });
@@ -1122,15 +1207,15 @@ MessengerUI, Messages, Pages) {
             to = setTimeout(function () {
                 m = undefined;
                 $notif.hide();
-            }, m.end-(+new Date()));
+            }, m.end - (+new Date()));
         } else {
             $notif.hide();
         }
     };
 
     var createNotifications = function (toolbar, config) {
-        var $notif = toolbar.$top.find('.'+NOTIFICATIONS_CLS).show();
-        var openNotifsApp = h('li', {}, h('div.cp-notifications-gotoapp', { tabindex: '0' }, h('p', Messages.openNotificationsApp || "Open notifications App")));
+        var $notif = toolbar.$top.find('.' + NOTIFICATIONS_CLS).show();
+        var openNotifsApp = h('li', {}, h('div.cp-notifications-gotoapp', {tabindex: '0'}, h('p', Messages.openNotificationsApp || "Open notifications App")));
         $(openNotifsApp).on('click keypress', function (event) {
             if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                 Common.openURL("/notifications/");
@@ -1144,13 +1229,15 @@ MessengerUI, Messages, Pages) {
         var metadataMgr = config.metadataMgr;
         var privateData = metadataMgr.getPrivateData();
         if (!privateData.notifications) {
-            var allowNotif = h('div.cp-notifications-gotoapp',{ tabindex: '0' }, h('p', Messages.allowNotifications));
+            var allowNotif = h('div.cp-notifications-gotoapp', {tabindex: '0'}, h('p', Messages.allowNotifications));
             pads_options.unshift(h("hr"));
             pads_options.unshift(allowNotif);
             $(allowNotif).on('click keypress', function (event) {
                 if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                     Common.getSframeChannel().event('Q_ASK_NOTIFICATION', null, function (e, allow) {
-                        if (!allow) { return; }
+                        if (!allow) {
+                            return;
+                        }
                         $(allowNotif).remove();
                     });
                 }
@@ -1158,7 +1245,9 @@ MessengerUI, Messages, Pages) {
 
             var onChange = function () {
                 var privateData = metadataMgr.getPrivateData();
-                if (!privateData.notifications) { return; }
+                if (!privateData.notifications) {
+                    return;
+                }
                 $allow.remove();
                 metadataMgr.off('change', onChange);
             };
@@ -1182,7 +1271,7 @@ MessengerUI, Messages, Pages) {
         $button.attr('title', Messages.notificationsPage);
         $button.attr('aria-haspopup', 'menu');
         $button.attr("aria-expanded", "false");
-        $button.click(function() {
+        $button.click(function () {
             if ($button.attr("aria-expanded") === "true") {
                 $button.attr("aria-expanded", "false");
             } else {
@@ -1234,7 +1323,7 @@ MessengerUI, Messages, Pages) {
 
     // Events
     var initClickEvents = function (toolbar) {
-        var removeDropdowns =  function () {
+        var removeDropdowns = function () {
             window.setTimeout(function () {
                 $('body').find('.cp-dropdown-content').hide();
             });
@@ -1245,7 +1334,9 @@ MessengerUI, Messages, Pages) {
                 return;
             }
             var $title = toolbar.title;
-            if (!$title.find('input').is(':visible')) { return; }
+            if (!$title.find('input').is(':visible')) {
+                return;
+            }
 
             // Press enter
             var ev = $.Event("keyup");
@@ -1284,17 +1375,25 @@ MessengerUI, Messages, Pages) {
     var initNotifications = function (toolbar, config) {
         // Display notifications when users are joining/leaving the session
         var oldUserData;
-        if (!config.metadataMgr) { return; }
+        if (!config.metadataMgr) {
+            return;
+        }
         var metadataMgr = config.metadataMgr;
-        var notify = function(type, name, oldname, uid) {
-            if (toolbar.isAlone) { return; }
+        var notify = function (type, name, oldname, uid) {
+            if (toolbar.isAlone) {
+                return;
+            }
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
-            if (typeof name === "undefined") { return; }
-            if (Config.disableUserlistNotifications) { return; }
+            if (typeof name === "undefined") {
+                return;
+            }
+            if (Config.disableUserlistNotifications) {
+                return;
+            }
             name = getFancyGuestName(name, uid);
             oldname = getFancyGuestName(oldname, uid);
 
-            switch(type) {
+            switch (type) {
                 case 1:
                     UI.log(Messages._getKey("notifyJoined", [name]));
                     break;
@@ -1323,7 +1422,9 @@ MessengerUI, Messages, Pages) {
 
             var count = 0;
             Object.keys(data).forEach(function (k) {
-                if (data[k] && data[k].uid === user.uid) { count++; }
+                if (data[k] && data[k].uid === user.uid) {
+                    count++;
+                }
             });
             return count;
         };
@@ -1340,7 +1441,9 @@ MessengerUI, Messages, Pages) {
                     if (netfluxIds.indexOf(u) === -1) {
                         var temp = JSON.parse(JSON.stringify(oldUserData[u]));
                         delete oldUserData[u];
-                        if (temp && newdata[userNetfluxId] && temp.uid === newdata[userNetfluxId].uid) { return; }
+                        if (temp && newdata[userNetfluxId] && temp.uid === newdata[userNetfluxId].uid) {
+                            return;
+                        }
                         if (userPresent(u, temp, newdata || oldUserData) < 1) {
                             notify(-1, temp.name, undefined, temp.uid);
                         }
@@ -1348,7 +1451,9 @@ MessengerUI, Messages, Pages) {
                 }
             }
             // Update the "oldUserData" object and notify for new users and names changed
-            if (typeof newdata === "undefined") { return; }
+            if (typeof newdata === "undefined") {
+                return;
+            }
             if (typeof oldUserData === "undefined") {
                 oldUserData = JSON.parse(JSON.stringify(newdata));
                 return;
@@ -1375,7 +1480,6 @@ MessengerUI, Messages, Pages) {
     };
 
 
-
     // Main
 
     Bar.create = function (cfg) {
@@ -1390,17 +1494,17 @@ MessengerUI, Messages, Pages) {
         toolbar.firstConnection = true;
 
         var $toolbar = toolbar.$toolbar = createRealtimeToolbar(config);
-        toolbar.$bottom = $toolbar.find('.'+Bar.constants.bottom);
-        toolbar.$bottomL = $toolbar.find('.'+Bar.constants.bottomL);
-        toolbar.$bottomM = $toolbar.find('.'+Bar.constants.bottomM);
-        toolbar.$bottomR = $toolbar.find('.'+Bar.constants.bottomR);
-        toolbar.$leftside = $toolbar.find('.'+Bar.constants.leftside);
-        toolbar.$rightside = $toolbar.find('.'+Bar.constants.rightside);
-        toolbar.$file = $toolbar.find('.'+Bar.constants.file);
-        toolbar.$drawer = $toolbar.find('.'+Bar.constants.drawer);
-        toolbar.$top = $toolbar.find('.'+Bar.constants.top);
-        toolbar.$history = $toolbar.find('.'+Bar.constants.history);
-        toolbar.$user = $toolbar.find('.'+Bar.constants.userAdmin);
+        toolbar.$bottom = $toolbar.find('.' + Bar.constants.bottom);
+        toolbar.$bottomL = $toolbar.find('.' + Bar.constants.bottomL);
+        toolbar.$bottomM = $toolbar.find('.' + Bar.constants.bottomM);
+        toolbar.$bottomR = $toolbar.find('.' + Bar.constants.bottomR);
+        toolbar.$leftside = $toolbar.find('.' + Bar.constants.leftside);
+        toolbar.$rightside = $toolbar.find('.' + Bar.constants.rightside);
+        toolbar.$file = $toolbar.find('.' + Bar.constants.file);
+        toolbar.$drawer = $toolbar.find('.' + Bar.constants.drawer);
+        toolbar.$top = $toolbar.find('.' + Bar.constants.top);
+        toolbar.$history = $toolbar.find('.' + Bar.constants.history);
+        toolbar.$user = $toolbar.find('.' + Bar.constants.userAdmin);
 
         observeChildren(toolbar.$drawer);
         observeChildren(toolbar.$bottomL);
@@ -1412,7 +1516,7 @@ MessengerUI, Messages, Pages) {
             observeChildren(config.$contentContainer);
         }
 
-        toolbar.$userAdmin = $toolbar.find('.'+Bar.constants.userAdmin);
+        toolbar.$userAdmin = $toolbar.find('.' + Bar.constants.userAdmin);
 
         // Create the subelements
         var tb = {};
@@ -1447,7 +1551,7 @@ MessengerUI, Messages, Pages) {
             toolbar.$bottom.removeClass('cp-toolbar-small');
             var w = $(window).width();
             var size = toolbar.$bottomL.width() + toolbar.$bottomM.width() +
-                       toolbar.$bottomR.width();
+                toolbar.$bottomR.width();
             if (size > w) {
                 toolbar.$bottom.addClass('cp-toolbar-small');
             }
@@ -1456,12 +1560,20 @@ MessengerUI, Messages, Pages) {
         $(window).on('resize', checkSize);
 
         var addElement = toolbar.addElement = function (arr, additionalCfg, init) {
-            if (typeof additionalCfg === "object") { $.extend(true, config, additionalCfg); }
+            if (typeof additionalCfg === "object") {
+                $.extend(true, config, additionalCfg);
+            }
             arr.forEach(function (el) {
-                if (typeof el !== "string" || !el.trim()) { return; }
+                if (typeof el !== "string" || !el.trim()) {
+                    return;
+                }
                 if (typeof tb[el] === "function") {
-                    if (!init && config.displayed.indexOf(el) !== -1) { return; } // Already done
-                    if (!init) { config.displayed.push(el); }
+                    if (!init && config.displayed.indexOf(el) !== -1) {
+                        return;
+                    } // Already done
+                    if (!init) {
+                        config.displayed.push(el);
+                    }
                     toolbar[el] = tb[el](toolbar, config);
                 }
             });
@@ -1474,7 +1586,9 @@ MessengerUI, Messages, Pages) {
 
         toolbar['linkToMain'] = createLinkToMain(toolbar, config);
 
-        if (!config.realtime) { toolbar.connected = true; }
+        if (!config.realtime) {
+            toolbar.connected = true;
+        }
 
         initClickEvents(toolbar, config);
         initNotifications(toolbar, config);
@@ -1491,22 +1605,30 @@ MessengerUI, Messages, Pages) {
             //checkLag(toolbar, config);
         };
         toolbar.initializing = function (/*userId*/) {
-            if (toolbar.history) { return; }
+            if (toolbar.history) {
+                return;
+            }
             toolbar.connected = false;
             if (toolbar.spinner) {
                 toolbar.spinner.text(Messages.initializing);
             }
         };
         toolbar.reconnecting = function (/*userId*/) {
-            if (toolbar.history) { return; }
+            if (toolbar.history) {
+                return;
+            }
             toolbar.connected = false;
             if (toolbar.spinner) {
                 var state = -1;
                 var interval = window.setInterval(function () {
-                    if (toolbar.connected) { clearInterval(interval); }
-                    var dots = Array(state+1).join('.');
+                    if (toolbar.connected) {
+                        clearInterval(interval);
+                    }
+                    var dots = Array(state + 1).join('.');
                     toolbar.spinner.text(Messages.reconnecting + dots);
-                    if (++state > 3) { state = 0; }
+                    if (++state > 3) {
+                        state = 0;
+                    }
                 }, 500);
                 toolbar.spinner.text(Messages.reconnecting);
             }
@@ -1518,7 +1640,9 @@ MessengerUI, Messages, Pages) {
 
         toolbar.errorState = function (state, error) {
             toolbar.isErrorState = state;
-            if (state) { toolbar.connected = false; }
+            if (state) {
+                toolbar.connected = false;
+            }
             if (toolbar.spinner) {
                 if (!state) {
                     return void kickSpinner(toolbar, config);
@@ -1551,16 +1675,22 @@ MessengerUI, Messages, Pages) {
         // Show user colors in the userlist only if the app is compatible and if the user
         // wants to see the cursors
         toolbar.showColors = function () {
-            if (!config.metadataMgr) { return; }
+            if (!config.metadataMgr) {
+                return;
+            }
             var privateData = config.metadataMgr.getPrivateData();
             var show = Util.find(privateData, ['settings', 'general', 'cursor', 'show']);
-            if (show === false) { return; }
+            if (show === false) {
+                return;
+            }
             showColors = true;
         };
 
         // If we had to create a new chainpad instance, reset the one used in the toolbar
         toolbar.resetChainpad = function (chainpad) {
-            if (config.readOnly === 1) { return; }
+            if (config.readOnly === 1) {
+                return;
+            }
             if (config.realtime !== chainpad) {
                 config.realtime = chainpad;
                 config.realtime.onPatch(ks(toolbar, config));
@@ -1611,8 +1741,12 @@ MessengerUI, Messages, Pages) {
         // On log out, remove permanently the realtime elements of the toolbar
         Common.onLogout(function () {
             failed();
-            if (toolbar.useradmin) { toolbar.useradmin.hide(); }
-            if (toolbar.userlist) { toolbar.userlist.hide(); }
+            if (toolbar.useradmin) {
+                toolbar.useradmin.hide();
+            }
+            if (toolbar.userlist) {
+                toolbar.userlist.hide();
+            }
         });
 
         return toolbar;

From d5c1479fde5874ccf892df2598506eb9f352075d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 30 Oct 2023 14:35:17 +0200
Subject: [PATCH 45/87] cleaned up

---
 www/common/toolbar.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 1aa6514f0..a6f14acd9 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1135,7 +1135,6 @@ define([
                                     while (prevItem.find('hr').length > 0 || prevItem.hasClass('cp-user-menu-logo') || prevItem.hasClass('cp-toolbar-account')) {
                                         prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
                                     }
-                                    console.log(prevItem);
                                     prevItem.attr('tabindex', '0').focus();
                                 } else if (e.key === 'ArrowDown') {
                                     var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
@@ -1143,7 +1142,7 @@ define([
                                         nextItem = nextItem.next().length ? nextItem.next() : items.first();
                                     }
                                     nextItem.attr('tabindex', '0').focus();
-                                    console.log("ce " + nextItem);
+
                                 }
                             } else if (e.key === 'Escape') {
                                 dropdownActive.find('li').attr('tabindex', '-1');
@@ -1151,7 +1150,6 @@ define([
                                 $(document).off('keydown');
                                 $userAdmin.find('> button').attr('aria-expanded', 'false');
                                 $userAdmin.find('> button').focus();
-                                console.log("AM INTRAT");
                             }
                         }
                     });

From 6b5eb38070fe5fc35080f2cc65be2834f94e3aa1 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 31 Oct 2023 15:18:58 +0200
Subject: [PATCH 46/87] can access every link on user menu

---
 www/common/common-ui-elements.js | 1248 +++++++++++++++++++-----------
 1 file changed, 797 insertions(+), 451 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ba13f2b41..502fb1a59 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -24,24 +24,25 @@ define([
     var urlArgs = Config.requireConf.urlArgs;
 
     UIElements.getSvgLogo = function () {
-        var svg = (function(){/*
+        var svg = (function () {/*
 <svg width="45" height="50" version="1.1" viewBox="0 0 11.906 13.229" xmlns="http://www.w3.org/2000/svg">
  <path id="background" d="m1.0914 0.43939h6.464l3.2642 3.0329v3.6261c0 3.8106-3.1186 4.6934-4.8229 5.5936-1.8663-0.85843-4.7759-1.7955-4.8229-5.5936z" style="stroke-width:0"/>
  <path id="squares" transform="matrix(.26458 0 0 .26458 -5.37e-5 0)" d="m4.125 1.6582 0.30469 21.82h18.242l0.001953-21.82h-18.549zm18.555 21.822 0.001953 24.188c7.0591-3.2362 18.032-9.399 18.232-23.754l0.007813-0.43359h-18.242z" style="fill-opacity:.4;stroke-width:.55042"/>
  <path id="outline" transform="matrix(.26458 0 0 .26458 -5.37e-5 0)" d="m2.6504 0.19922 0.021484 1.4766 0.31055 25.172c0.093479 7.5478 3.1451 12.529 7.0488 15.826 3.9038 3.297 8.5769 5.029 12.025 6.6152l0.65039 0.30274 0.63477-0.33984c3.0702-1.6216 7.7769-3.3403 11.773-6.5996 3.9966-3.2593 7.2344-8.2277 7.2344-15.826v-14.336l-13.221-12.291zm2.9453 2.916h20.381v12.379h13.457v11.332c0 6.8038-2.6491 10.706-6.1562 13.566-3.2982 2.6898-7.3426 4.2502-10.623 5.9141-3.4806-1.5714-7.5236-3.1369-10.74-5.8535-3.4025-2.8737-5.9391-6.8355-6.0234-13.643zm23.289 0.83789 9.2871 8.6328h-9.2871zm-6.5176 14.223a4.9632 4.9632 0 0 0-4.8496 4.9629 4.9632 4.9632 0 0 0 2.8184 4.4746l-1.7324 9.1504h7.7598l-1.7324-9.1523a4.9632 4.9632 0 0 0 2.8145-4.4727 4.9632 4.9632 0 0 0-4.9629-4.9629 4.9632 4.9632 0 0 0-0.11523 0z" style="color-rendering:auto;color:#000000;dominant-baseline:auto;font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;image-rendering:auto;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;shape-rendering:auto;solid-color:#000000;stop-color:#000000;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
-*/}).toString().slice(14,-3);
+*/
+        }).toString().slice(14, -3);
         return svg;
     };
 
     UIElements.prettySize = function (bytes) {
         var unit = Util.magnitudeOfBytes(bytes);
         if (unit === 'GB') {
-            return Messages._getKey('formattedGB', [ Util.bytesToGigabytes(bytes)]);
+            return Messages._getKey('formattedGB', [Util.bytesToGigabytes(bytes)]);
         } else if (unit === 'MB') {
-            return Messages._getKey('formattedMB', [ Util.bytesToMegabytes(bytes)]);
+            return Messages._getKey('formattedMB', [Util.bytesToMegabytes(bytes)]);
         } else {
-            return Messages._getKey('formattedKB', [ Util.bytesToKilobytes(bytes)]);
+            return Messages._getKey('formattedKB', [Util.bytesToKilobytes(bytes)]);
         }
     };
 
@@ -51,9 +52,11 @@ define([
         if (!hrefs || typeof (hrefs) === "string") {
             hrefs = [hrefs];
         }
-        NThen(function(waitFor) {
-            common.getSframeChannel().query("Q_GET_ALL_TAGS", null, waitFor(function(err, res) {
-                if (err || res.error) { return void console.error(err || res.error); }
+        NThen(function (waitFor) {
+            common.getSframeChannel().query("Q_GET_ALL_TAGS", null, waitFor(function (err, res) {
+                if (err || res.error) {
+                    return void console.error(err || res.error);
+                }
                 existing = Object.keys(res.tags).sort();
             }));
         }).nThen(function (waitFor) {
@@ -76,13 +79,15 @@ define([
                             return tags.indexOf(tag) !== -1;
                         });
                     } else {
-                        tags = res || [];
+                        tags = res || [];
                     }
                 }), href);
             });
         }).nThen(function () {
             UI.dialog.tagPrompt(tags, existing, function (newTags) {
-                if (!Array.isArray(newTags)) { return; }
+                if (!Array.isArray(newTags)) {
+                    return;
+                }
                 var added = [];
                 var removed = [];
                 newTags.forEach(function (tag) {
@@ -114,11 +119,15 @@ define([
 
     var dcAlert;
     UIElements.disconnectAlert = function () {
-        if (dcAlert && $(dcAlert.element).length) { return; }
+        if (dcAlert && $(dcAlert.element).length) {
+            return;
+        }
         dcAlert = UI.alert(Messages.common_connectionLost, undefined, true);
     };
     UIElements.reconnectAlert = function () {
-        if (!dcAlert) { return; }
+        if (!dcAlert) {
+            return;
+        }
         if (!dcAlert.delete) {
             dcAlert = undefined;
             return;
@@ -133,17 +142,21 @@ define([
                 var reader = new FileReader();
                 var parsed = file && file.name && /.+\.([^.]+)$/.exec(file.name);
                 var ext = parsed && parsed[1];
-                reader.onload = function (e) { f(e.target.result, file, ext); };
+                reader.onload = function (e) {
+                    f(e.target.result, file, ext);
+                };
                 if (cfg && cfg.binary && cfg.binary.indexOf(ext) !== -1) {
-                   reader.readAsArrayBuffer(file, type);
+                    reader.readAsArrayBuffer(file, type);
                 } else {
-                   reader.readAsText(file, type);
+                    reader.readAsText(file, type);
                 }
             };
 
-            if (_file) { return void todo(_file); }
+            if (_file) {
+                return void todo(_file);
+            }
 
-            var $files = $('<input>', {type:"file"});
+            var $files = $('<input>', {type: "file"});
             if (cfg && cfg.accept) {
                 $files.attr('accept', cfg.accept);
             }
@@ -158,7 +171,9 @@ define([
     UIElements.getUserGrid = function (label, config, onSelect) {
         var common = config.common;
         var users = config.data;
-        if (!users) { return; }
+        if (!users) {
+            return;
+        }
 
         var icons = Object.keys(users).map(function (key, i) {
             var data = users[key];
@@ -175,23 +190,25 @@ define([
                 });
             }
 
-            el = h('div.cp-usergrid-user'+(data.selected?'.cp-selected':'')+(config.large?'.large':''), {
+            el = h('div.cp-usergrid-user' + (data.selected ? '.cp-selected' : '') + (config.large ? '.large' : ''), {
                 'data-ed': data.edPublic,
                 'data-teamid': data.teamId,
                 'data-curve': data.curvePublic || '',
                 'data-name': name.toLowerCase(),
                 'data-order': i,
-                style: 'order:'+i+';'
-            },[
+                style: 'order:' + i + ';'
+            }, [
                 avatar,
                 h('span.cp-usergrid-user-name', name),
                 data.notRemovable ? undefined : removeBtn
             ]);
             return el;
-        }).filter(function (x) { return x; });
+        }).filter(function (x) {
+            return x;
+        });
 
         var noOthers = icons.length === 0 ? '.cp-usergrid-empty' : '';
-        var classes = noOthers + (config.large?'.large':'') + (config.list?'.list':'');
+        var classes = noOthers + (config.large ? '.large' : '') + (config.list ? '.list' : '');
 
         var inputFilter = h('input', {
             placeholder: Messages.share_filterFriend
@@ -210,7 +227,7 @@ define([
             var name = $(inputFilter).val().trim().replace(/"/g, '').toLowerCase();
             $div.find('.cp-usergrid-user').show();
             if (name) {
-                $div.find('.cp-usergrid-user:not(.cp-selected):not([data-name*="'+name+'"])').hide();
+                $div.find('.cp-usergrid-user:not(.cp-selected):not([data-name*="' + name + '"])').hide();
             }
         };
         $(inputFilter).on('keydown keyup change', redraw);
@@ -223,7 +240,7 @@ define([
                     $(this).addClass('cp-selected');
                 } else {
                     var order = $(this).attr('data-order');
-                    order = order ? 'order:'+order : '';
+                    order = order ? 'order:' + order : '';
                     $(this).removeClass('cp-selected').attr('style', order);
                 }
                 onSelect();
@@ -250,10 +267,12 @@ define([
                     onClick: function () {
                         var profile = data.profile ? (origin + '/profile/#' + data.profile) : '';
                         var success = Clipboard.copy(profile);
-                        if (success) { UI.log(Messages.shareSuccess); }
+                        if (success) {
+                            UI.log(Messages.shareSuccess);
+                        }
                     },
                     keys: [13]
-                  }]
+                }]
             };
         } else {
             return {
@@ -264,24 +283,26 @@ define([
                     onClick: function () {
                         common.setLoginRedirect('register');
                     }
-                  }, {
+                }, {
                     className: 'secondary',
                     name: Messages.login_login,
                     onClick: function () {
                         common.setLoginRedirect('login');
                     }
-                  }]
+                }]
             };
         }
     };
 
     UIElements.createInviteTeamModal = function (config) {
         var common = config.common;
-        var hasFriends = Object.keys(config.friends || {}).length !== 0;
+        var hasFriends = Object.keys(config.friends || {}).length !== 0;
 
         var privateData = common.getMetadataMgr().getPrivateData();
         var team = privateData.teams[config.teamId];
-        if (!team) { return void UI.warn(Messages.error); }
+        if (!team) {
+            return void UI.warn(Messages.error);
+        }
 
         var origin = privateData.origin;
 
@@ -290,7 +311,9 @@ define([
         // Invite contacts
         var $div;
         var refreshButton = function () {
-            if (!$div) { return; }
+            if (!$div) {
+                return;
+            }
             var $modal = $div.closest('.alertify');
             var $nav = $modal.find('nav');
             var $btn = $nav.find('button.primary');
@@ -316,7 +339,9 @@ define([
                 onClick: function () {
                     var $sel = $div.find('.cp-usergrid-user.cp-selected');
                     var sel = $sel.toArray();
-                    if (!sel.length) { return; }
+                    if (!sel.length) {
+                        return;
+                    }
 
                     sel.forEach(function (el) {
                         var curve = $(el).attr('data-curve');
@@ -345,7 +370,8 @@ define([
         contactsButtons.unshift({
             className: 'cancel',
             name: Messages.cancel,
-            onClick: function () {},
+            onClick: function () {
+            },
             keys: [27]
         });
 
@@ -364,26 +390,26 @@ define([
         var dismissButton = h('span.fa.fa-times');
 
         var roleViewer = UI.createRadio('cp-team-role', 'cp-team-role-viewer',
-                Messages.team_viewers, true, {
-                    input: { value: 'VIEWER' },
-                });
+            Messages.team_viewers, true, {
+                input: {value: 'VIEWER'},
+            });
         var roleMember = UI.createRadio('cp-team-role', 'cp-team-role-member',
-                Messages.team_members, false, {
-                    input: { value: 'MEMBER' },
-                });
+            Messages.team_members, false, {
+                input: {value: 'MEMBER'},
+            });
 
 
         var linkContent = h('div.cp-share-modal', [
-            h('p', Messages.team_inviteLinkTitle ),
-            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}),
+            h('p', Messages.team_inviteLinkTitle),
+            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style: 'display: none;'}),
             linkForm = h('div.cp-teams-invite-form', [
                 // autofill: 'off' was insufficient
                 // adding these two fake inputs confuses firefox and prevents unwanted form autofill
-                h('input', { type: 'text', style: 'display: none'}),
-                h('input', { type: 'password', style: 'display: none'}),
+                h('input', {type: 'text', style: 'display: none'}),
+                h('input', {type: 'password', style: 'display: none'}),
 
                 linkName = h('input', {
-                    placeholder:  Messages.team_inviteLinkTempName
+                    placeholder: Messages.team_inviteLinkTempName
                 }),
                 h('br'),
                 h('div.cp-teams-invite-block', [
@@ -438,15 +464,21 @@ define([
                 dismissButton
             ])
         ]);
-        $(linkUses).on('change keyup', function(e) {
-            if (e.target.value === '') { e.target.value = 0; }
+        $(linkUses).on('change keyup', function (e) {
+            if (e.target.value === '') {
+                e.target.value = 0;
+            }
         });
         $(linkMessage).keydown(function (e) {
-            if (e.which === 13) { e.stopPropagation(); }
+            if (e.which === 13) {
+                e.stopPropagation();
+            }
         });
         var localStore = window.cryptpadStore;
         localStore.get('hide-alert-teamInvite', function (val) {
-            if (val === '1') { return; }
+            if (val === '1') {
+                return;
+            }
             $(linkWarning).css('display', 'flex');
 
             $(dismissButton).on('click', function () {
@@ -462,7 +494,9 @@ define([
             var name = $(linkName).val();
 
             var uses = Number($(linkUses).val());
-            if (isNaN(uses) || !uses) { uses = -1; }
+            if (isNaN(uses) || !uses) {
+                uses = -1;
+            }
 
             var role = $(linkRole).find("input[name='cp-team-role']:checked").val() || 'VIEWER';
 
@@ -521,7 +555,8 @@ define([
         var linkButtons = [{
             className: 'cancel',
             name: Messages.cancel,
-            onClick: function () {},
+            onClick: function () {
+            },
             keys: [27]
         }, {
             className: 'primary cp-teams-invite-create',
@@ -534,9 +569,13 @@ define([
             className: 'primary cp-teams-invite-copy',
             name: Messages.team_inviteLinkCopy,
             onClick: function () {
-                if (!href) { return; }
+                if (!href) {
+                    return;
+                }
                 var success = Clipboard.copy(href);
-                if (success) { UI.log(Messages.shareSuccess); }
+                if (success) {
+                    UI.log(Messages.shareSuccess);
+                }
             },
             keys: []
         }];
@@ -566,7 +605,9 @@ define([
     UIElements.openDirectlyConfirmation = function (common, cb) {
         cb = cb || Util.noop;
         UI.confirm(h('p', Messages.ui_openDirectly), yes => {
-            if (!yes) { return void cb(yes); }
+            if (!yes) {
+                return void cb(yes);
+            }
             common.openDirectly();
             cb(yes);
         });
@@ -626,19 +667,19 @@ define([
                     }
                 }
                 else if (callback) {*/
-                    // Old import button, used in settings
-                    var importer = importContent((data && data.binary) ? 'application/octet-stream' : 'text/plain', callback, {
-                        accept: data ? data.accept : undefined,
-                        binary: data ? data.binary : undefined
+                // Old import button, used in settings
+                var importer = importContent((data && data.binary) ? 'application/octet-stream' : 'text/plain', callback, {
+                    accept: data ? data.accept : undefined,
+                    binary: data ? data.binary : undefined
+                });
+
+                var handler = data.first ? function () {
+                    data.first(function () {
+                        importer(); // Make sure we don't pass arguments to importer
                     });
+                } : importer; //importContent;
 
-                    var handler = data.first? function () {
-                        data.first(function () {
-                            importer(); // Make sure we don't pass arguments to importer
-                        });
-                    }: importer; //importContent;
-
-                    button
+                button
                     .click(common.prepareFeedback(type))
                     .click(function () {
                         handler();
@@ -649,8 +690,10 @@ define([
                 button = $('<button>', {
                     'class': 'btn btn-primary new',
                     title: Messages.uploadButtonTitle,
-                }).append($('<span>', {'class':'fa fa-upload'})).append(' '+Messages.uploadButton);
-                if (!data.FM) { return; }
+                }).append($('<span>', {'class': 'fa fa-upload'})).append(' ' + Messages.uploadButton);
+                if (!data.FM) {
+                    return;
+                }
                 var $input = $('<input>', {
                     'type': 'file',
                     'style': 'display: none;',
@@ -672,131 +715,154 @@ define([
                         }
                         data.FM.handleFile(file, ev);
                     });
-                    if (callback) { callback(); }
+                    if (callback) {
+                        callback();
+                    }
+                });
+                if (data.accept) {
+                    $input.attr('accept', data.accept);
+                }
+                button.click(function () {
+                    $input.click();
                 });
-                if (data.accept) { $input.attr('accept', data.accept); }
-                button.click(function () { $input.click(); });
                 break;
             case 'copy':
                 button = $('<button>', {
                     'class': 'fa fa-files-o cp-toolbar-icon-import',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.makeACopy));
                 button
-                .click(common.prepareFeedback(type))
-                .click(function () {
-                    sframeChan.query('EV_MAKE_A_COPY');
-                });
+                    .click(common.prepareFeedback(type))
+                    .click(function () {
+                        sframeChan.query('EV_MAKE_A_COPY');
+                    });
                 break;
             case 'importtemplate':
-                if (!AppConfig.enableTemplates) { return; }
-                if (!common.isLoggedIn()) { return; }
+                if (!AppConfig.enableTemplates) {
+                    return;
+                }
+                if (!common.isLoggedIn()) {
+                    return;
+                }
                 button = $('<button>', {
                     'class': 'fa fa-upload cp-toolbar-icon-import',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.template_import));
                 button
-                .click(common.prepareFeedback(type))
-                .click(function () {
-                    if (callback) { return void callback(); }
-                    UIElements.openTemplatePicker(common, true);
-                });
+                    .click(common.prepareFeedback(type))
+                    .click(function () {
+                        if (callback) {
+                            return void callback();
+                        }
+                        UIElements.openTemplatePicker(common, true);
+                    });
                 break;
             case 'template':
-                if (!AppConfig.enableTemplates) { return; }
-                if (!common.isLoggedIn()) { return; }
+                if (!AppConfig.enableTemplates) {
+                    return;
+                }
+                if (!common.isLoggedIn()) {
+                    return;
+                }
                 button = $('<button>', {
                     'class': 'cptools cptools-new-template cp-toolbar-icon-template',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.saveTemplateButton));
                 if (data.rt || data.callback) {
                     button
-                    .click(function () {
-                        var title = data.getTitle() || document.title;
-                        var todo = function (val) {
-                            if (typeof(val) !== "string") { return; }
-                            if (data.callback) {
-                                return void data.callback(val);
-                            }
-                            var toSave = data.rt.getUserDoc();
-                            if (val.trim()) {
-                                val = val.trim();
-                                title = val;
-                                try {
-                                    var parsed = JSON.parse(toSave);
-                                    var meta;
-                                    if (Array.isArray(parsed) && typeof(parsed[3]) === "object") {
-                                        meta = parsed[3].metadata; // pad
-                                    } else if (parsed.info) {
-                                        meta = parsed.info; // poll
-                                    } else {
-                                        meta = parsed.metadata;
-                                    }
-                                    if (typeof(meta) === "object") {
-                                        meta.title = val;
-                                        meta.defaultTitle = val;
-                                        delete meta.users;
-                                    }
-                                    toSave = JSON.stringify(parsed);
-                                } catch(e) {
-                                    console.error("Parse error while setting the title", e);
+                        .click(function () {
+                            var title = data.getTitle() || document.title;
+                            var todo = function (val) {
+                                if (typeof (val) !== "string") {
+                                    return;
                                 }
-                            }
-                            sframeChan.query('Q_SAVE_AS_TEMPLATE', {
-                                toSave: toSave,
-                                title: title
-                            }, function () {
-                                UI.alert(Messages.templateSaved);
-                                Feedback.send('TEMPLATE_CREATED');
-                            });
-                        };
-                        UI.prompt(Messages.saveTemplatePrompt, title, todo);
-                    });
+                                if (data.callback) {
+                                    return void data.callback(val);
+                                }
+                                var toSave = data.rt.getUserDoc();
+                                if (val.trim()) {
+                                    val = val.trim();
+                                    title = val;
+                                    try {
+                                        var parsed = JSON.parse(toSave);
+                                        var meta;
+                                        if (Array.isArray(parsed) && typeof (parsed[3]) === "object") {
+                                            meta = parsed[3].metadata; // pad
+                                        } else if (parsed.info) {
+                                            meta = parsed.info; // poll
+                                        } else {
+                                            meta = parsed.metadata;
+                                        }
+                                        if (typeof (meta) === "object") {
+                                            meta.title = val;
+                                            meta.defaultTitle = val;
+                                            delete meta.users;
+                                        }
+                                        toSave = JSON.stringify(parsed);
+                                    } catch (e) {
+                                        console.error("Parse error while setting the title", e);
+                                    }
+                                }
+                                sframeChan.query('Q_SAVE_AS_TEMPLATE', {
+                                    toSave: toSave,
+                                    title: title
+                                }, function () {
+                                    UI.alert(Messages.templateSaved);
+                                    Feedback.send('TEMPLATE_CREATED');
+                                });
+                            };
+                            UI.prompt(Messages.saveTemplatePrompt, title, todo);
+                        });
                 }
                 break;
             case 'forget':
                 button = $('<button>', {
                     'class': "fa fa-trash cp-toolbar-icon-forget"
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.fc_delete));
-                callback = typeof callback === "function" ? callback : function () {};
+                callback = typeof callback === "function" ? callback : function () {
+                };
                 button
-                .click(common.prepareFeedback(type))
-                .click(function() {
-                    common.isPadStored(function (err, data) {
-                        if (!data) {
-                            return void UI.alert(Messages.autostore_notAvailable);
-                        }
-                        sframeChan.query('Q_IS_ONLY_IN_SHARED_FOLDER', null, function (err, res) {
-                            if (err || res.error) { return void console.log(err || res.error); }
-                            var msg = Messages.forgetPrompt;
-                            if (res) {
-                                UI.alert(Messages.sharedFolders_forget);
-                                return;
-                            } else if (!common.isLoggedIn()) {
-                                msg = Messages.fm_removePermanentlyDialog;
+                    .click(common.prepareFeedback(type))
+                    .click(function () {
+                        common.isPadStored(function (err, data) {
+                            if (!data) {
+                                return void UI.alert(Messages.autostore_notAvailable);
                             }
-                            UI.confirm(msg, function (yes) {
-                                if (!yes) { return; }
-                                sframeChan.query('Q_MOVE_TO_TRASH', null, function (err, obj) {
-                                    err = err || (obj && obj.error);
-                                    if (err) {
-                                        callback(err);
-                                        return void UI.warn(Messages.fm_forbidden);
-                                    }
-                                    var msg;
-                                    if (common.isLoggedIn()) {
-                                        msg = Pages.setHTML(h('div'), Messages.movedToTrash);
-                                        $(msg).find('a').attr('href', '/drive/');
-                                        common.fixLinks(msg);
-                                    } else {
-                                        msg = h('div', Messages.deleted);
-                                    }
-                                    UI.alert(msg);
-                                    callback();
+                            sframeChan.query('Q_IS_ONLY_IN_SHARED_FOLDER', null, function (err, res) {
+                                if (err || res.error) {
+                                    return void console.log(err || res.error);
+                                }
+                                var msg = Messages.forgetPrompt;
+                                if (res) {
+                                    UI.alert(Messages.sharedFolders_forget);
                                     return;
+                                } else if (!common.isLoggedIn()) {
+                                    msg = Messages.fm_removePermanentlyDialog;
+                                }
+                                UI.confirm(msg, function (yes) {
+                                    if (!yes) {
+                                        return;
+                                    }
+                                    sframeChan.query('Q_MOVE_TO_TRASH', null, function (err, obj) {
+                                        err = err || (obj && obj.error);
+                                        if (err) {
+                                            callback(err);
+                                            return void UI.warn(Messages.fm_forbidden);
+                                        }
+                                        var msg;
+                                        if (common.isLoggedIn()) {
+                                            msg = Pages.setHTML(h('div'), Messages.movedToTrash);
+                                            $(msg).find('a').attr('href', '/drive/');
+                                            common.fixLinks(msg);
+                                        } else {
+                                            msg = h('div', Messages.deleted);
+                                        }
+                                        UI.alert(msg);
+                                        callback();
+                                        return;
+                                    });
                                 });
-                            });
 
+                            });
                         });
                     });
-                });
                 break;
             case 'present':
                 button = $(h('button', {
@@ -834,8 +900,8 @@ define([
                     button
                         .click(common.prepareFeedback(type))
                         .on('click', function () {
-                        common.getHistory(data.histConfig);
-                    });
+                            common.getHistory(data.histConfig);
+                        });
                 }
                 break;
             case 'mediatag':
@@ -884,14 +950,14 @@ define([
                     title: Messages.tags_title,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.fc_hashtag));
                 button.click(common.prepareFeedback(type))
-                .click(function () {
-                    common.isPadStored(function (err, data) {
-                        if (!data) {
-                            return void UI.alert(Messages.autostore_notAvailable);
-                        }
-                        UIElements.updateTags(common, null);
+                    .click(function () {
+                        common.isPadStored(function (err, data) {
+                            if (!data) {
+                                return void UI.alert(Messages.autostore_notAvailable);
+                            }
+                            UIElements.updateTags(common, null);
+                        });
                     });
-                });
                 break;
             case 'toggle':
                 button = $(h('button.cp-toolbar-tools', {
@@ -913,13 +979,19 @@ define([
                 button.click(function (e) {
                     data.element.toggle();
                     var isVisible = data.element.is(':visible');
-                    if (callback) { callback(isVisible); }
+                    if (callback) {
+                        callback(isVisible);
+                    }
                     if (isVisible) {
                         button.addClass('cp-toolbar-button-active');
-                        if (e.originalEvent) { Feedback.send('TOGGLE_SHOW_' + appType); }
+                        if (e.originalEvent) {
+                            Feedback.send('TOGGLE_SHOW_' + appType);
+                        }
                     } else {
                         button.removeClass('cp-toolbar-button-active');
-                        if (e.originalEvent) { Feedback.send('TOGGLE_HIDE_' + appType); }
+                        if (e.originalEvent) {
+                            Feedback.send('TOGGLE_HIDE_' + appType);
+                        }
                     }
                     //updateIcon(isVisible);
                 });
@@ -930,28 +1002,32 @@ define([
                     'class': 'fa fa-info-circle cp-toolbar-icon-properties',
                     title: Messages.propertiesButtonTitle,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
-                .text(Messages.propertiesButton))
-                .click(common.prepareFeedback(type))
-                .click(function () {
-                    var isTop;
-                    try {
-                        isTop = common.getMetadataMgr().getPrivateData().isTop;
-                    } catch (err) { console.error(err); }
-                    if (!isTop) {
-                        return void UIElements.openDirectlyConfirmation(common);
-                    }
+                    .text(Messages.propertiesButton))
+                    .click(common.prepareFeedback(type))
+                    .click(function () {
+                        var isTop;
+                        try {
+                            isTop = common.getMetadataMgr().getPrivateData().isTop;
+                        } catch (err) {
+                            console.error(err);
+                        }
+                        if (!isTop) {
+                            return void UIElements.openDirectlyConfirmation(common);
+                        }
 
-                    sframeChan.event('EV_PROPERTIES_OPEN');
-                });
+                        sframeChan.event('EV_PROPERTIES_OPEN');
+                    });
                 break;
             case 'save': // OnlyOffice save
                 button = $('<button>', {
                     'class': 'fa fa-save',
                     title: Messages.settings_save,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
-                .text(Messages.settings_save))
-                .click(common.prepareFeedback(type));
-                if (callback) { button.click(callback); }
+                    .text(Messages.settings_save))
+                    .click(common.prepareFeedback(type));
+                if (callback) {
+                    button.click(callback);
+                }
                 break;
             case 'newpad':
                 button = $('<button>', {
@@ -959,10 +1035,10 @@ define([
                     'class': 'fa fa-plus cp-toolbar-icon-newpad',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.newButton));
                 button
-                .click(common.prepareFeedback(type))
-                .click(function () {
-                    common.createNewPadModal();
-                });
+                    .click(common.prepareFeedback(type))
+                    .click(function () {
+                        common.createNewPadModal();
+                    });
                 break;
             case 'snapshots':
                 button = $('<button>', {
@@ -970,13 +1046,13 @@ define([
                     'class': 'fa fa-camera cp-toolbar-icon-snapshots',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.snapshots_button));
                 button
-                .click(common.prepareFeedback(type))
-                .click(function () {
-                    if (typeof(data.load) !== "function" || typeof(data.make) !== "function") {
-                        return;
-                    }
-                    UIElements.openSnapshotsModal(common, data.load, data.make, data.remove);
-                });
+                    .click(common.prepareFeedback(type))
+                    .click(function () {
+                        if (typeof (data.load) !== "function" || typeof (data.make) !== "function") {
+                            return;
+                        }
+                        UIElements.openSnapshotsModal(common, data.load, data.make, data.remove);
+                    });
                 break;
             default:
                 var drawerCls = data.drawer === false ? '' : '.cp-toolbar-drawer-element';
@@ -986,19 +1062,27 @@ define([
                     //title: data.title || '',
                 }, [
                     h('i.fa.' + icon),
-                    h('span.cp-toolbar-name'+drawerCls, data.text)
+                    h('span.cp-toolbar-name' + drawerCls, data.text)
                 ]));
                 var feedbackHandler = common.prepareFeedback(data.name || 'DEFAULT');
                 button[0].addEventListener('click', function () {
                     feedbackHandler();
-                    if (typeof(callback) !== 'function') { return; }
+                    if (typeof (callback) !== 'function') {
+                        return;
+                    }
                     callback();
                 });
-                if (data.style) { button.attr('style', data.style); }
-                if (data.id) { button.attr('id', data.id); }
-                if (data.hiddenReadOnly) { button.addClass('cp-hidden-if-readonly'); }
+                if (data.style) {
+                    button.attr('style', data.style);
+                }
+                if (data.id) {
+                    button.attr('id', data.id);
+                }
+                if (data.hiddenReadOnly) {
+                    button.addClass('cp-hidden-if-readonly');
+                }
                 if (data.name) {
-                    button.addClass('cp-toolbar-icon-'+data.name);
+                    button.addClass('cp-toolbar-icon-' + data.name);
                 }
         }
         if (rightside) {
@@ -1034,9 +1118,9 @@ define([
             'heading': {
                 // Msg.mdToolbar_heading
                 apply: function (str) {
-                    return '\n'+clean(str).split('\n').map(function (line) {
-                        return '# '+line;
-                    }).join('\n')+'\n';
+                    return '\n' + clean(str).split('\n').map(function (line) {
+                        return '# ' + line;
+                    }).join('\n') + '\n';
                 },
                 icon: 'fa-header'
             },
@@ -1048,27 +1132,27 @@ define([
             'quote': {
                 // Msg.mdToolbar_quote
                 apply: function (str) {
-                    return '\n\n'+str.split('\n').map(function (line) {
-                        return '> '+line;
-                    }).join('\n')+'\n\n';
+                    return '\n\n' + str.split('\n').map(function (line) {
+                        return '> ' + line;
+                    }).join('\n') + '\n\n';
                 },
                 icon: 'fa-quote-right'
             },
             'nlist': {
                 // Msg.mdToolbar_nlist
                 apply: function (str) {
-                    return '\n'+clean(str).split('\n').map(function (line) {
-                        return '1. '+line;
-                    }).join('\n')+'\n';
+                    return '\n' + clean(str).split('\n').map(function (line) {
+                        return '1. ' + line;
+                    }).join('\n') + '\n';
                 },
                 icon: 'fa-list-ol'
             },
             'list': {
                 // Msg.mdToolbar_list
                 apply: function (str) {
-                    return '\n'+clean(str).split('\n').map(function (line) {
-                        return '* '+line;
-                    }).join('\n')+'\n';
+                    return '\n' + clean(str).split('\n').map(function (line) {
+                        return '* ' + line;
+                    }).join('\n') + '\n';
                 },
                 icon: 'fa-list-ul'
             },
@@ -1098,7 +1182,7 @@ define([
             }
         };
 
-        if (typeof(cfg.embed) === "function") {
+        if (typeof (cfg.embed) === "function") {
             actions.embed = { // Messages.mdToolbar_embed
                 icon: 'fa-picture-o',
                 action: function () {
@@ -1120,11 +1204,14 @@ define([
                             console.log("Unexpected data type picked " + data.type);
                             return;
                         }
-                        if (data.type !== 'file') { console.log('unhandled embed type ' + data.type); return; }
+                        if (data.type !== 'file') {
+                            console.log('unhandled embed type ' + data.type);
+                            return;
+                        }
                         common.setPadAttribute('atime', +new Date(), null, data.href);
                         var privateDat = common.getMetadataMgr().getPrivateData();
                         var origin = privateDat.fileHost || privateDat.origin;
-                        var src = data.src = data.src.slice(0,1) === '/' ? origin + data.src : data.src;
+                        var src = data.src = data.src.slice(0, 1) === '/' ? origin + data.src : data.src;
                         cfg.embed(h('media-tag', {
                             src: src,
                             'data-crypto-key': 'cryptpad:' + data.key,
@@ -1157,8 +1244,11 @@ define([
                 'class': 'pure-button fa ' + actions[k].icon,
                 title: Messages['mdToolbar_' + k] || k
             }).click(onClick);
-            if (k === "embed") { $toolbar.prepend($b); }
-            else { $toolbar.append($b); }
+            if (k === "embed") {
+                $toolbar.prepend($b);
+            } else {
+                $toolbar.append($b);
+            }
         }
         $('<button>', {
             'class': 'pure-button fa fa-question cp-markdown-help',
@@ -1175,7 +1265,8 @@ define([
             return {
                 toolbar: $(),
                 button: $(),
-                setState: function () {}
+                setState: function () {
+                }
             };
         }
 
@@ -1186,15 +1277,21 @@ define([
         };
         var onClick = function (visible) {
             common.setAttribute(['general', 'markdown-help'], visible, function (e) {
-                if (e) { return void console.error(e); }
+                if (e) {
+                    return void console.error(e);
+                }
             });
         };
 
         var $toolbarButton = common.createButton('toggle', true, cfg, onClick);
         var tbState = true;
         common.getAttribute(['general', 'markdown-help'], function (e, data) {
-            if (e) { return void console.error(e); }
-            if ($(window).height() < 800 && $(window).width() < 800) { return; }
+            if (e) {
+                return void console.error(e);
+            }
+            if ($(window).height() < 800 && $(window).width() < 800) {
+                return;
+            }
             if (data === true && $toolbarButton.length && tbState) {
                 $toolbarButton.click();
             }
@@ -1210,8 +1307,12 @@ define([
                 return;
             }
             common.getAttribute(['general', 'markdown-help'], function (e, data) {
-                if (e) { return void console.error(e); }
-                if ($(window).height() < 800 && $(window).width() < 800) { return; }
+                if (e) {
+                    return void console.error(e);
+                }
+                if ($(window).height() < 800 && $(window).width() < 800) {
+                    return;
+                }
                 if (data === true && $toolbarButton) {
                     // Show the toolbar using the button to make sure the icon in the button is
                     // correct (caret-down / caret-up)
@@ -1323,11 +1424,15 @@ define([
     // NOTE: The callback must stay SYNCHRONOUS
     var LIMIT_REFRESH_RATE = 30000; // milliseconds
     UIElements.createUsageBar = function (common, teamId, cb) {
-        if (AppConfig.hideUsageBar) { return cb('USAGE_BAR_HIDDEN'); }
-        if (!common.isLoggedIn()) { return cb("NOT_LOGGED_IN"); }
+        if (AppConfig.hideUsageBar) {
+            return cb('USAGE_BAR_HIDDEN');
+        }
+        if (!common.isLoggedIn()) {
+            return cb("NOT_LOGGED_IN");
+        }
         // getPinnedUsage updates common.account.usage, and other values
         // so we can just use those and only check for errors
-        var $container = $('<span>', {'class':'cp-limit-container'});
+        var $container = $('<span>', {'class': 'cp-limit-container'});
         var to;
         var todo = function (err, data) {
             if (to) {
@@ -1340,7 +1445,9 @@ define([
                 }, 1000);
                 return;
             }
-            if (err || !data) { return void console.error(err || 'No data'); }
+            if (err || !data) {
+                return void console.error(err || 'No data');
+            }
 
             var usage = data.usage;
             var limit = data.limit;
@@ -1348,14 +1455,14 @@ define([
             $container.html('');
             var unit = Util.magnitudeOfBytes(limit);
 
-            usage = unit === 'GB'? Util.bytesToGigabytes(usage):
+            usage = unit === 'GB' ? Util.bytesToGigabytes(usage) :
                 Util.bytesToMegabytes(usage);
-            limit = unit === 'GB'? Util.bytesToGigabytes(limit):
+            limit = unit === 'GB' ? Util.bytesToGigabytes(limit) :
                 Util.bytesToMegabytes(limit);
 
             var $limit = $('<span>', {'class': 'cp-limit-bar'}).appendTo($container);
-            var quota = limit === 0 ? 1 : usage/limit;
-            var $usage = $('<span>', {'class': 'cp-limit-usage'}).css('width', quota*100+'%');
+            var quota = limit === 0 ? 1 : usage / limit;
+            var $usage = $('<span>', {'class': 'cp-limit-usage'}).css('width', quota * 100 + '%');
             var $buttons = $(h('span.cp-limit-buttons')).appendTo($container);
 
             var urls = common.getMetadataMgr().getPrivateData().accounts;
@@ -1408,9 +1515,13 @@ define([
                 prettyLimit = Messages._getKey('formattedMB', [limit]);
             }
 
-            if (quota < 0.8) { $usage.addClass('cp-limit-usage-normal'); }
-            else if (quota < 1) { $usage.addClass('cp-limit-usage-warning'); }
-            else { $usage.addClass('cp-limit-usage-above'); }
+            if (quota < 0.8) {
+                $usage.addClass('cp-limit-usage-normal');
+            } else if (quota < 1) {
+                $usage.addClass('cp-limit-usage-warning');
+            } else {
+                $usage.addClass('cp-limit-usage-above');
+            }
             var $text = $('<span>', {'class': 'cp-limit-usage-text'});
             $text.html(Messages._getKey('storageStatus', [prettyUsage, prettyLimit])); // TODO avoid use of .html() if possible
             $container.prepend($text);
@@ -1457,18 +1568,28 @@ define([
     //
     // allowed options tags: ['a', 'hr', 'p']
     UIElements.createDropdown = function (config) {
-        if (typeof config !== "object" || !Array.isArray(config.options)) { return; }
-        if (config.feedback && !config.common) { return void console.error("feedback in a dropdown requires sframe-common"); }
+        if (typeof config !== "object" || !Array.isArray(config.options)) {
+            return;
+        }
+        if (config.feedback && !config.common) {
+            return void console.error("feedback in a dropdown requires sframe-common");
+        }
 
         var isElement = function (o) {
             return /HTML/.test(Object.prototype.toString.call(o)) &&
-                typeof(o.tagName) === 'string';
+                typeof (o.tagName) === 'string';
         };
         var allowedTags = ['a', 'li', 'p', 'hr', 'div'];
         var isValidOption = function (o) {
-            if (typeof o !== "object") { return false; }
-            if (isElement(o)) { return true; }
-            if (!o.tag || allowedTags.indexOf(o.tag) === -1) { return false; }
+            if (typeof o !== "object") {
+                return false;
+            }
+            if (isElement(o)) {
+                return true;
+            }
+            if (!o.tag || allowedTags.indexOf(o.tag) === -1) {
+                return false;
+            }
             return true;
         };
 
@@ -1516,19 +1637,27 @@ define([
 
         // Menu
         var $innerblock = $('<ul>', {'class': 'cp-dropdown-content', 'role': 'menu'});
-        if (config.left) { $innerblock.addClass('cp-dropdown-left'); }
+        if (config.left) {
+            $innerblock.addClass('cp-dropdown-left');
+        }
 
         var hide = function () {
-            window.setTimeout(function () { $innerblock.hide(); }, 0);
+            window.setTimeout(function () {
+                $innerblock.hide();
+            }, 0);
         };
 
         var setOptions = function (options) {
             options.forEach(function (o) {
-                if (!isValidOption(o)) { return; }
-                if (isElement(o)) { return $innerblock.append(o); }
+                if (!isValidOption(o)) {
+                    return;
+                }
+                if (isElement(o)) {
+                    return $innerblock.append(o);
+                }
                 var $el = $(h(o.tag, (o.attributes || {})));
 
-                if (typeof(o.content) === 'string' || (o.content instanceof Element)) {
+                if (typeof (o.content) === 'string' || (o.content instanceof Element)) {
                     o.content = [o.content];
                 }
                 if (Array.isArray(o.content)) {
@@ -1536,7 +1665,7 @@ define([
                         if (item instanceof Element) {
                             return void $el.append(item);
                         }
-                        if (typeof(item) === 'string') {
+                        if (typeof (item) === 'string') {
                             $el[0].appendChild(document.createTextNode(item));
                         }
                         if (typeof item === 'object') {
@@ -1554,15 +1683,25 @@ define([
                 }
 
                 $el.appendTo($innerblock);
-                if (typeof(o.action) === 'function') {
-                    $el.on('click keydown', function (e) {
-                        if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13)) {
+                $el.on('click keydown', function (e) {
+                    if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13)) {
+                        if (Array.isArray(o.content)) {
+                            o.content.forEach(function (item) {
+                                if (typeof item === 'object') {
+                                    var close = item.action(e);
+                                    if (close) {
+                                        hide();
+                                    }
+                                }
+                            });
+                        } else {
                             var close = o.action(e);
-                            if (close) { hide(); }
+                            if (close) {
+                                hide();
+                            }
                         }
-                    });
-                }
-
+                    }
+                });
             });
         };
         setOptions(config.options);
@@ -1576,14 +1715,16 @@ define([
         var value = config.initialValue || '';
 
         var setActive = function ($el) {
-            if ($el.length !== 1) { return; }
+            if ($el.length !== 1) {
+                return;
+            }
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
             $el.addClass('cp-dropdown-element-active');
             var scroll = $el.position().top + $innerblock.scrollTop();
             if (scroll < $innerblock.scrollTop()) {
                 $innerblock.scrollTop(scroll);
             } else if (scroll > ($innerblock.scrollTop() + 280)) {
-                $innerblock.scrollTop(scroll-270);
+                $innerblock.scrollTop(scroll - 270);
             }
         };
 
@@ -1595,23 +1736,28 @@ define([
             if (config.noscroll) {
                 var h = $innerblock.outerHeight();
                 if ((topPos + h) > wh) {
-                    $innerblock.css('bottom', button.height+'px');
+                    $innerblock.css('bottom', button.height + 'px');
                 }
             } else {
-                $innerblock.css('max-height', Math.floor(wh - topPos - 1)+'px');
+                $innerblock.css('max-height', Math.floor(wh - topPos - 1) + 'px');
             }
             $innerblock.show();
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
             if (config.isSelect && value) {
                 // We use JSON.stringify here to escape quotes
-                if (typeof(value) === "object") { value = JSON.stringify(value); }
-                var $val = $innerblock.find('[data-value='+JSON.stringify(value)+']');
+                if (typeof (value) === "object") {
+                    value = JSON.stringify(value);
+                }
+                var $val = $innerblock.find('[data-value=' + JSON.stringify(value) + ']');
                 setActive($val);
                 try {
                     $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
-                } catch (e) {}
+                } catch (e) {
+                }
+            }
+            if (config.feedback) {
+                Feedback.send(config.feedback);
             }
-            if (config.feedback) { Feedback.send(config.feedback); }
         };
 
         $container.click(function (e) {
@@ -1694,7 +1840,7 @@ define([
                 var c = String.fromCharCode(e.which);
                 pressed += c;
                 // We use JSON.stringify here to escape quotes
-                var $value = $innerblock.find('[data-value^='+JSON.stringify(pressed)+']:first');
+                var $value = $innerblock.find('[data-value^=' + JSON.stringify(pressed) + ']:first');
                 if ($value.length) {
                     setActive($value);
                     $innerblock.scrollTop($value.position().top + $innerblock.scrollTop());
@@ -1707,17 +1853,19 @@ define([
             $container.setValue = function (val, name, sync) {
                 value = val;
                 // We use JSON.stringify here to escape quotes
-                var $val = $innerblock.find('[data-value='+JSON.stringify(val)+']');
+                var $val = $innerblock.find('[data-value=' + JSON.stringify(val) + ']');
                 var textValue = name || $val.text() || val;
                 var f = function () {
                     $button.find('.cp-dropdown-button-title').text(textValue);
                 };
 
-                if (sync) { return void f(); }
+                if (sync) {
+                    return void f();
+                }
                 setTimeout(f);
             };
             $container.getValue = function () {
-                return typeof(value) === "undefined" ? '' : value;
+                return typeof (value) === "undefined" ? '' : value;
             };
         }
 
@@ -1733,7 +1881,9 @@ define([
         // https://github.com/cryptpad/cryptpad/releases/latest/ ?
 
         var template = function (line, link) {
-            if (!line || !link) { return; }
+            if (!line || !link) {
+                return;
+            }
             var p = Pages.setHTML(h('p'), line);
             var sub = link.cloneNode(true);
             var href;
@@ -1743,7 +1893,9 @@ define([
                 return; // don't return anything to display if their href causes URL to throw
             }
             var a = p.querySelector('a');
-            if (!a) { return; }
+            if (!a) {
+                return;
+            }
             sub.innerText = a.innerText;
             sub.setAttribute('href', href);
             p.replaceChild(sub, a);
@@ -1757,11 +1909,11 @@ define([
         var sourceLine = template(Messages.info_sourceFlavour, Pages.sourceLink);
 
         var content = h('div.cp-info-menu-container', [
-                h('div.logo-block', [
-                    h('img', {
-                        src: '/customize/CryptPad_logo.svg?' + urlArgs,
-                        alt: Messages.label_logo
-                    }),
+            h('div.logo-block', [
+                h('img', {
+                    src: '/customize/CryptPad_logo.svg?' + urlArgs,
+                    alt: Messages.label_logo
+                }),
                 h('h6', "CryptPad"),
                 h('span', Pages.versionString)
             ]),
@@ -1781,12 +1933,13 @@ define([
             {
                 className: 'primary',
                 name: Messages.filePicker_close,
-                onClick: function () {},
+                onClick: function () {
+                },
                 keys: [27],
             },
         ];
 
-        var modal = UI.dialog.customModal(content, {scrollable: true, buttons: buttons });
+        var modal = UI.dialog.customModal(content, {scrollable: true, buttons: buttons});
         UI.openCustomModal(modal);
     };
 
@@ -1804,7 +1957,7 @@ define([
         options.push({
             tag: 'li',
             role: 'presentation',
-            attributes: {'class': 'cp-user-menu-logo','role':'menuitem'},
+            attributes: {'class': 'cp-user-menu-logo', 'role': 'menuitem'},
             content: h('span', [
                 h('img', {
                     src: '/customize/CryptPad_logo_grey.svg',
@@ -1836,7 +1989,7 @@ define([
             options.push({
                 tag: 'li',
                 role: 'presentation',
-                attributes: {'class': 'cp-toolbar-account','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-account', 'role': 'menuitem'},
                 content: userAdminContent,
             });
         }
@@ -1844,13 +1997,17 @@ define([
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '-1','role':'menuitem'},
+                attributes: {
+                    'class': 'cp-toolbar-menu-profile fa fa-user-circle',
+                    'tabindex': '-1',
+                    'role': 'menuitem'
+                },
                 content: h('span', Messages.profileButton),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin+'/profile/');
+                        Common.openURL(origin + '/profile/');
                     } else {
-                        Common.gotoURL(origin+'/profile/');
+                        Common.gotoURL(origin + '/profile/');
                     }
                 },
             });
@@ -1865,7 +2022,7 @@ define([
                 },
                 content: h('span', Messages.type.drive),
                 action: function () {
-                    Common.openURL(origin+'/drive/');
+                    Common.openURL(origin + '/drive/');
                 },
             });
         }
@@ -1914,30 +2071,30 @@ define([
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog', 'tabindex': '-1', 'role': 'menuitem'},
                 content: h('span', Messages.settingsButton),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin+'/settings/');
+                        Common.openURL(origin + '/settings/');
                     } else {
-                        Common.gotoURL(origin+'/settings/');
+                        Common.gotoURL(origin + '/settings/');
                     }
                 },
             });
         }
 
-        options.push({ tag: 'hr' });
+        options.push({tag: 'hr'});
         // Add administration panel link if the user is an admin
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '-1', 'role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs', 'tabindex': '-1', 'role': 'menuitem'},
                 content: h('span', Messages.adminPage || 'Admin'),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin+'/admin/');
+                        Common.openURL(origin + '/admin/');
                     } else {
-                        Common.gotoURL(origin+'/admin/');
+                        Common.gotoURL(origin + '/admin/');
                     }
                 },
             });
@@ -1961,9 +2118,9 @@ define([
                 content: h('span', Messages.supportPage || 'Support'),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin+'/support/');
+                        Common.openURL(origin + '/support/');
                     } else {
-                        Common.gotoURL(origin+'/support/');
+                        Common.gotoURL(origin + '/support/');
                     }
                 },
             });
@@ -2003,7 +2160,7 @@ define([
                 content: h('span', Messages.user_rename)
             });
         }*/
-        options.push({ tag: 'hr' });
+        options.push({tag: 'hr'});
 
         // We have code to hide 2 separators in a row, but in the case of survey, they may be
         // in the DOM but hidden. We need to know if there are other elements in this
@@ -2019,7 +2176,7 @@ define([
                 },
                 content: h('span', priv.plan ? Messages.settings_cat_subscription : Messages.pricing),
                 action: function () {
-                    Common.openURL(priv.plan ? priv.accounts.upgradeURL :'/features.html');
+                    Common.openURL(priv.plan ? priv.accounts.upgradeURL : '/features.html');
                 },
             });
         }
@@ -2040,8 +2197,8 @@ define([
         }
 
         // If you set "" in the admin panel, it will remove the AppConfig survey
-        var surveyURL = typeof(Broadcast.surveyURL) !== "undefined" ? Broadcast.surveyURL
-                                        : AppConfig.surveyURL;
+        var surveyURL = typeof (Broadcast.surveyURL) !== "undefined" ? Broadcast.surveyURL
+            : AppConfig.surveyURL;
         options.push({
             tag: 'a',
             attributes: {
@@ -2054,7 +2211,7 @@ define([
             },
         });
 
-        options.push({ tag: 'hr' });
+        options.push({tag: 'hr'});
         // Add login or logout button depending on the current status
         if (priv.loggedIn) {
             options.push({
@@ -2067,7 +2224,9 @@ define([
                 content: h('span', Messages.logoutEverywhere),
                 action: function () {
                     UI.confirm(Messages.settings_logoutEverywhereConfirm, function (yes) {
-                        if (!yes) { return; }
+                        if (!yes) {
+                            return;
+                        }
                         Common.getSframeChannel().query('Q_LOGOUT_EVERYWHERE', null, function () {
                             Common.gotoURL(origin + '/');
                         });
@@ -2076,18 +2235,18 @@ define([
             });
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out', 'tabindex': '-1', 'role': 'menuitem'},
                 content: h('span', Messages.logoutButton),
                 action: function () {
                     Common.logout(function () {
-                        Common.gotoURL(origin+'/');
+                        Common.gotoURL(origin + '/');
                     });
                 },
             });
         } else {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in', 'tabindex': '-1', 'role': 'menuitem'},
                 content: h('span', Messages.login_login),
                 action: function () {
                     Common.setLoginRedirect('login');
@@ -2096,7 +2255,11 @@ define([
             if (!Config.restrictRegistration) {
                 options.push({
                     tag: 'a',
-                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus','tabindex': '0', 'role':'menuitem'},
+                    attributes: {
+                        'class': 'cp-toolbar-menu-register fa fa-user-plus',
+                        'tabindex': '0',
+                        'role': 'menuitem'
+                    },
                     content: h('span', Messages.login_register),
                     action: function () {
                         Common.setLoginRedirect('register');
@@ -2118,7 +2281,9 @@ define([
 
         options.forEach(function (option) {
             var f = option.action;
-            if (!f) { return; }
+            if (!f) {
+                return;
+            }
             option.action = function () {
                 f();
                 return true;
@@ -2131,7 +2296,7 @@ define([
             return {
                 tag: 'li',
                 content: [option],
-                attributes: { 'role': 'presentation'}
+                attributes: {'role': 'presentation'}
             };
         });
         var dropdownConfigUser = {
@@ -2147,23 +2312,35 @@ define([
         var $survey = $userAdmin.find('.cp-toolbar-survey');
         if (!surveyURL) {
             $survey.hide();
-            if (surveyAlone) { $survey.next('hr').hide(); }
+            if (surveyAlone) {
+                $survey.next('hr').hide();
+            }
         }
         Common.makeUniversal('broadcast', {
             onEvent: function (obj) {
                 var cmd = obj.ev;
-                if (cmd !== "SURVEY") { return; }
+                if (cmd !== "SURVEY") {
+                    return;
+                }
                 var url = obj.data;
-                if (url === surveyURL) { return; }
-                if (url && !Util.isValidURL(url)) { return; }
+                if (url === surveyURL) {
+                    return;
+                }
+                if (url && !Util.isValidURL(url)) {
+                    return;
+                }
                 surveyURL = url;
                 if (!url) {
                     $survey.hide();
-                    if (surveyAlone) { $survey.next('hr').hide(); }
+                    if (surveyAlone) {
+                        $survey.next('hr').hide();
+                    }
                     return;
                 }
                 $survey.show();
-                if (surveyAlone) { $survey.next('hr').show(); }
+                if (surveyAlone) {
+                    $survey.next('hr').show();
+                }
             }
         });
 
@@ -2174,7 +2351,7 @@ define([
         $userAdmin.find('.cp-dropdown-content').append($lang);
         */
 
-        var $displayName = $userAdmin.find('.'+displayNameCls);
+        var $displayName = $userAdmin.find('.' + displayNameCls);
 
         var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
         var loadingAvatar;
@@ -2192,7 +2369,9 @@ define([
                 UIElements.createUserAdminMenu(Common, config);
                 return;
             }
-            if (!myData) { return; }
+            if (!myData) {
+                return;
+            }
             if (loadingAvatar) {
                 // Try again in 200ms
                 window.clearTimeout(to);
@@ -2210,7 +2389,9 @@ define([
                     oldUid = uid;
                     oldName = newName;
                     $userAdmin.find('> button').removeClass('cp-avatar');
-                    if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
+                    if ($img) {
+                        $userAdmin.find('> button').addClass('cp-avatar');
+                    }
                     loadingAvatar = false;
                 }, uid);
                 return;
@@ -2263,7 +2444,6 @@ define([
     };
 
 
-
     UIElements.createNewPadModal = function (common) {
         // if in drive, show new pad modal instead
         if ($(".cp-app-drive-element-row.cp-app-drive-new-ghost").length !== 0) {
@@ -2275,7 +2455,7 @@ define([
             $body: $('body')
         });
         var $modal = modal.$modal;
-        var $title = $(h('h3', [ h('i.fa.fa-plus'), ' ', Messages.fm_newButton ]));
+        var $title = $(h('h3', [h('i.fa.fa-plus'), ' ', Messages.fm_newButton]));
 
         var $description = $(Pages.setHTML(h('p'), Messages.creation_newPadModalDescription));
         $modal.find('.cp-modal').append($title);
@@ -2285,16 +2465,20 @@ define([
         var i = 0;
 
         var types = AppConfig.availablePadTypes.filter(function (p) {
-            if (AppConfig.hiddenTypes.indexOf(p) !== -1) { return; }
+            if (AppConfig.hiddenTypes.indexOf(p) !== -1) {
+                return;
+            }
             if (!common.isLoggedIn() && AppConfig.registeredOnlyTypes &&
-                AppConfig.registeredOnlyTypes.indexOf(p) !== -1) { return; }
+                AppConfig.registeredOnlyTypes.indexOf(p) !== -1) {
+                return;
+            }
             return true;
         });
 
         types.forEach(function (p) {
             var $element = $('<li>', {
                 'class': 'cp-icons-element',
-                'id': 'cp-newpad-icons-'+ (i++)
+                'id': 'cp-newpad-icons-' + (i++)
             }).prepend(UI.getIcon(p)).appendTo($container);
             $element.append($('<span>', {'class': 'cp-icons-name'})
                 .text(Messages.type[p]));
@@ -2315,7 +2499,7 @@ define([
         var next = function () {
             selected = ++selected % types.length;
             $container.find('.cp-icons-element-selected').removeClass('cp-icons-element-selected');
-            $container.find('#cp-newpad-icons-'+selected).addClass('cp-icons-element-selected');
+            $container.find('#cp-newpad-icons-' + selected).addClass('cp-icons-element-selected');
         };
 
         $modal.off('keydown');
@@ -2345,7 +2529,9 @@ define([
     UIElements.openFilePicker = function (common, types, cb) {
         var sframeChan = common.getSframeChannel();
         sframeChan.query("Q_FILE_PICKER_OPEN", types, function (err, data) {
-            if (err) { return; }
+            if (err) {
+                return;
+            }
             cb(data);
         });
     };
@@ -2367,7 +2553,9 @@ define([
         };
         var onConfirm = function (yes) {
             if (!yes) {
-                if (focus) { focus.focus(); }
+                if (focus) {
+                    focus.focus();
+                }
                 return;
             }
             delete pickerCfg.hidden;
@@ -2386,7 +2574,9 @@ define([
                         UI.removeLoadingScreen();
                         Feedback.send('TEMPLATE_USED');
                     });
-                    if (focus) { focus.focus(); }
+                    if (focus) {
+                        focus.focus();
+                    }
                     return;
                 }
             });
@@ -2396,7 +2586,9 @@ define([
             if (data) {
                 common.openFilePicker(pickerCfgInit);
                 focus = document.activeElement;
-                if (force) { return void onConfirm(true); }
+                if (force) {
+                    return void onConfirm(true);
+                }
                 UI.confirm(Messages.useTemplate, onConfirm, {
                     ok: Messages.useTemplateOK,
                     cancel: Messages.useTemplateCancel,
@@ -2434,7 +2626,9 @@ define([
     */
     UIElements.getPadCreationScreen = function (common, cfg, appCfg, cb) {
         appCfg = appCfg || {};
-        if (!common.isLoggedIn()) { return void cb(); }
+        if (!common.isLoggedIn()) {
+            return void cb();
+        }
         var sframeChan = common.getSframeChannel();
         var metadataMgr = common.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
@@ -2442,7 +2636,9 @@ define([
         if (privateData.offline) {
             var onChange = function () {
                 var privateData = metadataMgr.getPrivateData();
-                if (privateData.offline) { return; }
+                if (privateData.offline) {
+                    return;
+                }
                 UIElements.getPadCreationScreen(common, cfg, appCfg, cb);
                 metadataMgr.off('change', onChange);
             };
@@ -2455,13 +2651,13 @@ define([
         var fromContent = privateData.fromContent;
 
         var $body = $('body');
-        var $creationContainer = $('<div>', { id: 'cp-creation-container' }).appendTo($body);
+        var $creationContainer = $('<div>', {id: 'cp-creation-container'}).appendTo($body);
         var urlArgs = (Config.requireConf && Config.requireConf.urlArgs) || '';
 
-        var logo = h('img', { src: '/customize/CryptPad_logo.svg?' + urlArgs });
+        var logo = h('img', {src: '/customize/CryptPad_logo.svg?' + urlArgs});
         var fill1 = h('div.cp-creation-fill.cp-creation-logo', logo);
         var fill2 = h('div.cp-creation-fill');
-        var $creation = $('<div>', { id: 'cp-creation', tabindex:1 });
+        var $creation = $('<div>', {id: 'cp-creation', tabindex: 1});
         $creationContainer.append([fill1, $creation, fill2]);
 
         var createHelper = function (href, text) {
@@ -2472,11 +2668,13 @@ define([
 
         // Title
         //$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle));
-        var newPadH3Title = Messages._getKey('creation_new',[Messages.type[type]]);
+        var newPadH3Title = Messages._getKey('creation_new', [Messages.type[type]]);
 
         var early = common.checkRestrictedApp(type);
         var domain = Config.httpUnsafeOrigin || 'CryptPad';
-        if (/^http/.test(domain)) { domain = domain.replace(/^https?\:\/\//, ''); }
+        if (/^http/.test(domain)) {
+            domain = domain.replace(/^https?\:\/\//, '');
+        }
 
         var title = h('div.cp-creation-title', [
             UI.getFileIcon({type: type})[0],
@@ -2520,7 +2718,7 @@ define([
                 return h('div.cp-creation-team', {
                     'data-id': id,
                     title: data.name,
-                },[
+                }, [
                     avatar,
                     h('span.cp-creation-team-name', data.name)
                 ]);
@@ -2548,7 +2746,7 @@ define([
                 teamValue = $(this).attr('data-id');
             });
             if (privateData.storeInTeam) {
-                $team.find('[data-id="'+privateData.storeInTeam+'"]').addClass('cp-selected');
+                $team.find('[data-id="' + privateData.storeInTeam + '"]').addClass('cp-selected');
                 teamValue = privateData.storeInTeam;
             }
         }
@@ -2573,8 +2771,8 @@ define([
                     value: 3
                 }),
                 h('select#cp-creation-expire-unit', [
-                    h('option', { value: 'hour' }, Messages.creation_expireHours),
-                    h('option', { value: 'day' }, Messages.creation_expireDays),
+                    h('option', {value: 'hour'}, Messages.creation_expireHours),
+                    h('option', {value: 'day'}, Messages.creation_expireDays),
                     h('option', {
                         value: 'month',
                         selected: 'selected'
@@ -2630,7 +2828,8 @@ define([
 
         var selected = 0; // Selected template in the list (highlighted)
         var TEMPLATES_DISPLAYED = big ? 6 : 3; // Max templates displayed per page
-        var next = function () {}; // Function called when pressing tab to highlight the next template
+        var next = function () {
+        }; // Function called when pressing tab to highlight the next template
         var i = 0; // Index of the first template displayed in the current page
         sframeChan.query("Q_CREATE_TEMPLATES", type, function (err, res) {
             if (!res.data || !Array.isArray(res.data)) {
@@ -2639,7 +2838,9 @@ define([
             var allData = res.data.slice().sort(function (a, b) {
                 if (a.used === b.used) {
                     // Sort by name
-                    if (a.name === b.name) { return 0; }
+                    if (a.name === b.name) {
+                        return 0;
+                    }
                     return a.name < b.name ? -1 : 1;
                 }
                 return b.used - a.used;
@@ -2659,9 +2860,13 @@ define([
                 icon: UI.getFileIcon({type: type})
             });
             var redraw = function (index) {
-                if (index < 0) { i = 0; }
-                else if (index > allData.length - 1) { return; }
-                else { i = index; }
+                if (index < 0) {
+                    i = 0;
+                } else if (index > allData.length - 1) {
+                    return;
+                } else {
+                    i = index;
+                }
                 var data = allData.slice(i, i + TEMPLATES_DISPLAYED);
                 var $container = $(templates).find('.cp-creation-template-container').html('');
                 data.forEach(function (obj, idx) {
@@ -2671,8 +2876,12 @@ define([
                         'title': name,
                     }).appendTo($container);
                     $span.data('id', obj.id);
-                    if (obj.content) { $span.data('content', obj.content); }
-                    if (idx === selected) { $span.addClass('cp-creation-template-selected'); }
+                    if (obj.content) {
+                        $span.data('content', obj.content);
+                    }
+                    if (idx === selected) {
+                        $span.addClass('cp-creation-template-selected');
+                    }
                     if (!obj.thumbnail) {
                         $span.append(obj.icon || h('span.cptools.cptools-template'));
                     }
@@ -2687,19 +2896,24 @@ define([
 
                     // Add thumbnail if it exists
                     if (obj.thumbnail) {
-                        common.addThumbnail(obj.thumbnail, $span, function () {});
+                        common.addThumbnail(obj.thumbnail, $span, function () {
+                        });
                     }
                 });
                 $(right).off('click').removeClass('hidden').click(function () {
                     selected = 0;
                     redraw(i + TEMPLATES_DISPLAYED);
                 });
-                if (i >= allData.length - TEMPLATES_DISPLAYED ) { $(right).addClass('hidden'); }
+                if (i >= allData.length - TEMPLATES_DISPLAYED) {
+                    $(right).addClass('hidden');
+                }
                 $(left).off('click').removeClass('hidden').click(function () {
                     selected = TEMPLATES_DISPLAYED - 1;
                     redraw(i - TEMPLATES_DISPLAYED);
                 });
-                if (i < TEMPLATES_DISPLAYED) { $(left).addClass('hidden'); }
+                if (i < TEMPLATES_DISPLAYED) {
+                    $(left).addClass('hidden');
+                }
             };
             if (fromFileData) {
                 var todo = function (thumbnail) {
@@ -2713,19 +2927,19 @@ define([
                 };
                 todo();
                 sframeChan.query("Q_GET_FILE_THUMBNAIL", null, function (err, res) {
-                    if (err || (res && res.error)) { return; }
+                    if (err || (res && res.error)) {
+                        return;
+                    }
                     todo(res.data);
                 });
-            }
-            else if (fromContent) {
+            } else if (fromContent) {
                 allData = [{
                     name: fromContent.title,
                     id: 0,
                     icon: h('span.cptools.cptools-poll'),
                 }];
                 redraw(0);
-            }
-            else {
+            } else {
                 redraw(0);
             }
 
@@ -2742,8 +2956,8 @@ define([
                     return void redraw(i - TEMPLATES_DISPLAYED);
                 }
                 selected = revert ?
-                            (--selected < 0 ? 0 : selected) :
-                            ++selected >= max ? max-1 : selected;
+                    (--selected < 0 ? 0 : selected) :
+                    ++selected >= max ? max - 1 : selected;
                 $creation.find('.cp-creation-template-element')
                     .removeClass('cp-creation-template-selected');
                 $($creation.find('.cp-creation-template-element').get(selected))
@@ -2752,7 +2966,9 @@ define([
 
             $w.on('resize', function () {
                 var _big = $w.width() > 800;
-                if (big === _big) { return; }
+                if (big === _big) {
+                    return;
+                }
                 big = _big;
                 if (!big) {
                     $(left).removeClass('fa-chevron-left').addClass('fa-chevron-up');
@@ -2819,19 +3035,26 @@ define([
             var ownedVal = $('#cp-creation-owned').is(':checked') ? 1 : 0;
             // Life time
             var expireVal = 0;
-            if($('#cp-creation-expire').is(':checked')) {
+            if ($('#cp-creation-expire').is(':checked')) {
                 var unit = 0;
                 switch ($('#cp-creation-expire-unit').val()) {
-                    case "hour" : unit = 3600;           break;
-                    case "day"  : unit = 3600 * 24;      break;
-                    case "month": unit = 3600 * 24 * 30; break;
-                    default: unit = 0;
+                    case "hour" :
+                        unit = 3600;
+                        break;
+                    case "day"  :
+                        unit = 3600 * 24;
+                        break;
+                    case "month":
+                        unit = 3600 * 24 * 30;
+                        break;
+                    default:
+                        unit = 0;
                 }
                 expireVal = ($('#cp-creation-expire-val').val() || 0) * unit;
             }
             // Password
             var passwordVal = $('#cp-creation-password').is(':checked') ?
-                                $('#cp-creation-password-val').val() : undefined;
+                $('#cp-creation-password-val').val() : undefined;
 
             var $template = $creation.find('.cp-creation-template-selected');
             var templateId = $template.data('id') || undefined;
@@ -2856,14 +3079,18 @@ define([
             var val = getFormValues();
 
             common.setAttribute(['general', 'creation', 'owned'], val.owned, function (e) {
-                if (e) { return void console.error(e); }
+                if (e) {
+                    return void console.error(e);
+                }
             });
             common.setAttribute(['general', 'creation', 'expire'], val.expire, function (e) {
-                if (e) { return void console.error(e); }
+                if (e) {
+                    return void console.error(e);
+                }
             });
 
             if (val.expire) {
-                Feedback.send('EXPIRING_PAD-'+val.expire);
+                Feedback.send('EXPIRING_PAD-' + val.expire);
             }
 
             $creationContainer.remove();
@@ -2920,9 +3147,13 @@ define([
                 // what if they don't have a keyboard (ie. mobile)
                 msg += Messages.errorCopy;
             }
-            if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
+            if (toolbar && typeof toolbar.deleted === "function") {
+                toolbar.deleted();
+            }
         } else if (err.type === 'EDELETED') {
-            if (priv.burnAfterReading) { return void cb(); }
+            if (priv.burnAfterReading) {
+                return void cb();
+            }
 
             if (autoStoreModal[priv.channel]) {
                 autoStoreModal[priv.channel].delete();
@@ -2947,8 +3178,11 @@ define([
             }
 
             if (err.ownDeletion) {
-                if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
-                (cb || function () {})();
+                if (toolbar && typeof toolbar.deleted === "function") {
+                    toolbar.deleted();
+                }
+                (cb || function () {
+                })();
                 return;
             }
 
@@ -2960,8 +3194,11 @@ define([
                     fromServerError: true,
                     loaded: err.loaded,
                 });
-                if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
-                (cb || function () {})();
+                if (toolbar && typeof toolbar.deleted === "function") {
+                    toolbar.deleted();
+                }
+                (cb || function () {
+                })();
                 return;
             }
 
@@ -2970,21 +3207,28 @@ define([
                 msg += Messages.errorCopy;
             }
 
-            if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
+            if (toolbar && typeof toolbar.deleted === "function") {
+                toolbar.deleted();
+            }
         } else if (err.type === 'ERESTRICTED') {
             msg = Messages.restrictedError;
             if (!common.isLoggedIn()) {
                 msg = UIElements.loginErrorScreenContent(common);
             }
 
-            if (toolbar && typeof toolbar.failed === "function") { toolbar.failed(true); }
+            if (toolbar && typeof toolbar.failed === "function") {
+                toolbar.failed(true);
+            }
         } else if (err.type === 'HASH_NOT_FOUND' && priv.isHistoryVersion) {
             msg = Messages.oo_deletedVersion;
-            if (toolbar && typeof toolbar.failed === "function") { toolbar.failed(true); }
+            if (toolbar && typeof toolbar.failed === "function") {
+                toolbar.failed(true);
+            }
         }
         sframeChan.event('EV_SHARE_OPEN', {hidden: true});
         UI.errorLoadingScreen(msg, Boolean(err.loaded), Boolean(err.loaded));
-        (cb || function () {})();
+        (cb || function () {
+        })();
     };
 
     UIElements.displayPasswordPrompt = function (common, cfg, isError) {
@@ -3051,8 +3295,14 @@ define([
         };
 
 
-        $password.find('.cp-password-input').on('keydown', function (e) { if (e.which === 13) { submit(); } });
-        $(button).on('click', function () { submit(); });
+        $password.find('.cp-password-input').on('keydown', function (e) {
+            if (e.which === 13) {
+                submit();
+            }
+        });
+        $(button).on('click', function () {
+            submit();
+        });
 
 
         var block = h('div#cp-loading-password-prompt', [
@@ -3087,13 +3337,17 @@ define([
     };
     UIElements.getBurnAfterReadingWarning = function (common) {
         var priv = common.getMetadataMgr().getPrivateData();
-        if (!priv.burnAfterReading) { return; }
+        if (!priv.burnAfterReading) {
+            return;
+        }
         return h('div.alert.alert-danger.cp-burn-after-reading', Messages.burnAfterReading_warningDeleted);
     };
 
     var crowdfundingState = false;
     UIElements.displayCrowdfunding = function (common, force) {
-        if (crowdfundingState) { return; }
+        if (crowdfundingState) {
+            return;
+        }
         var priv = common.getMetadataMgr().getPrivateData();
 
 
@@ -3135,15 +3389,23 @@ define([
             return void todo();
         }
 
-        if (AppConfig.disableCrowdfundingMessages) { return; }
-        if (priv.plan) { return; }
+        if (AppConfig.disableCrowdfundingMessages) {
+            return;
+        }
+        if (priv.plan) {
+            return;
+        }
 
         crowdfundingState = true;
         common.getAttribute(['general', 'crowdfunding'], function (err, val) {
-            if (err || val === false) { return; }
+            if (err || val === false) {
+                return;
+            }
             common.getSframeChannel().query('Q_GET_PINNED_USAGE', null, function (err, obj) {
                 var quotaMb = obj.quota / (1024 * 1024);
-                if (quotaMb < 10) { return; }
+                if (quotaMb < 10) {
+                    return;
+                }
                 todo();
             });
         });
@@ -3151,7 +3413,9 @@ define([
 
     var storePopupState = false;
     UIElements.displayStorePadPopup = function (common, data) {
-        if (storePopupState) { return; }
+        if (storePopupState) {
+            return;
+        }
         storePopupState = true;
         // We won't display the popup for dropped files or already stored pads
         if (data && data.stored) {
@@ -3163,12 +3427,14 @@ define([
         var priv = common.getMetadataMgr().getPrivateData();
 
         // This pad will be deleted automatically, it shouldn't be stored
-        if (priv.burnAfterReading) { return; }
+        if (priv.burnAfterReading) {
+            return;
+        }
 
 
         var typeMsg = priv.pathname.indexOf('/file/') !== -1 ? Messages.autostore_file :
-                        priv.pathname.indexOf('/drive/') !== -1 ? Messages.autostore_sf :
-                          Messages.autostore_pad;
+            priv.pathname.indexOf('/drive/') !== -1 ? Messages.autostore_sf :
+                Messages.autostore_pad;
         var text = Messages._getKey('autostore_notstored', [typeMsg]);
         var footer = Pages.setHTML(h('span'), Messages.autostore_settings);
 
@@ -3203,7 +3469,9 @@ define([
         });
         var waitingForStoringCb = false;
         $(store).click(function () {
-            if (waitingForStoringCb) { return; }
+            if (waitingForStoringCb) {
+                return;
+            }
             waitingForStoringCb = true;
             common.getSframeChannel().query("Q_AUTOSTORE_STORE", null, function (err, obj) {
                 waitingForStoringCb = false;
@@ -3303,7 +3571,9 @@ define([
         var buttons = [{
             name: Messages.friendRequest_later,
             onClick: function () {
-                if (clicked) { return true; }
+                if (clicked) {
+                    return true;
+                }
                 clicked = true;
                 Feedback.send('LINK_RECEIVED_LATER');
             },
@@ -3312,7 +3582,9 @@ define([
             className: 'primary',
             name: Messages.fc_open,
             onClick: function () {
-                if (clicked) { return true; }
+                if (clicked) {
+                    return true;
+                }
                 clicked = true;
                 common.openUnsafeURL(url);
                 Feedback.send("LINK_RECEIVED_OPEN");
@@ -3322,7 +3594,9 @@ define([
             className: 'primary',
             name: Messages.toolbar_storeInDrive,
             onClick: function () {
-                if (clicked) { return; }
+                if (clicked) {
+                    return;
+                }
                 clicked = true;
                 common.getSframeChannel().query("Q_DRIVE_USEROBJECT", {
                     cmd: "addLink",
@@ -3361,7 +3635,7 @@ define([
         $(link).click(function (e) {
             e.preventDefault();
             e.stopPropagation();
-            var obj = { pw: msg.content.password || '' };
+            var obj = {pw: msg.content.password || ''};
             common.openURL(Hash.getNewPadURL(msg.content.href, obj));
         });
 
@@ -3372,7 +3646,9 @@ define([
 
         var dismiss = function () {
             common.mailbox.dismiss(data, function (err) {
-                if (err) { console.log(err); }
+                if (err) {
+                    console.log(err);
+                }
             });
         };
         var answer = function (yes) {
@@ -3402,7 +3678,7 @@ define([
                     err = err || (res && res.error);
                     if (err) {
                         var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                                                                      : Messages.error;
+                            : Messages.error;
                         console.error(err);
                         dismiss();
                         return void UI.warn(text);
@@ -3430,7 +3706,7 @@ define([
                             }
                         });
                     } else {
-                        sframeChan.query('Q_ACCEPT_OWNERSHIP', data, function (err, res) {
+                        sframeChan.query('Q_ACCEPT_OWNERSHIP', data, function (err, res) {
                             if (err || (res && res.error)) {
                                 return void console.error(err | res.error);
                             }
@@ -3501,7 +3777,9 @@ define([
                 curvePublic: msg.content.user.curvePublic
             });
             common.mailbox.dismiss(data, function (err) {
-                if (err) { console.log(err); }
+                if (err) {
+                    console.log(err);
+                }
             });
         };
         var module = common.makeUniversal('team');
@@ -3514,7 +3792,9 @@ define([
                 value: [priv.edPublic]
             }, function (err, res) {
                 err = err || (res && res.error);
-                if (!err) { return; }
+                if (!err) {
+                    return;
+                }
                 waitFor.abort();
                 cb(err);
             });
@@ -3527,7 +3807,9 @@ define([
                 value: [priv.edPublic]
             }, waitFor(function (err, res) {
                 err = err || (res && res.error);
-                if (!err) { return; }
+                if (!err) {
+                    return;
+                }
                 waitFor.abort();
                 cb(err);
             }));
@@ -3539,7 +3821,9 @@ define([
                 f(msg.content.teamChannel, waitFor, cb);
                 f(msg.content.chatChannel, waitFor, cb);
                 f(msg.content.rosterChannel, waitFor, cb);
-            }).nThen(function () { cb(); });
+            }).nThen(function () {
+                cb();
+            });
         };
 
         var todo = function (yes) {
@@ -3549,7 +3833,7 @@ define([
                     if (err) {
                         console.error(err);
                         var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                                                                      : Messages.error;
+                            : Messages.error;
                         return void UI.warn(text);
                     }
                     UI.log(Messages.saved);
@@ -3562,12 +3846,16 @@ define([
                         teamChannel: msg.content.teamChannel,
                         answer: true
                     }, function (obj) {
-                        if (obj && obj.error) { console.error(obj.error); }
+                        if (obj && obj.error) {
+                            console.error(obj.error);
+                        }
                     });
 
                     // Remove yourself from the pending owners
                     changeAll(false, function (err) {
-                        if (err) { console.error(err); }
+                        if (err) {
+                            console.error(err);
+                        }
                     });
                 });
                 return;
@@ -3576,7 +3864,9 @@ define([
             // DECLINE
             // Remove yourself from the pending owners
             changeAll(false, function (err) {
-                if (err) { console.error(err); }
+                if (err) {
+                    console.error(err);
+                }
                 // Send notification to the sender
                 answer(false);
                 // Set our role back to ADMIN
@@ -3584,7 +3874,9 @@ define([
                     teamChannel: msg.content.teamChannel,
                     answer: false
                 }, function (obj) {
-                    if (obj && obj.error) { console.error(obj.error); }
+                    if (obj && obj.error) {
+                        console.error(obj.error);
+                    }
                 });
             });
         };
@@ -3616,7 +3908,7 @@ define([
         var msg = data.content.msg;
 
         var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
-        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
+        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
 
         var verified = UIElements.getVerifiedFriend(common, msg.author, name);
 
@@ -3657,13 +3949,16 @@ define([
                 }, function (obj) {
                     if (obj && obj.error) {
                         if (obj.error === 'ENOENT') {
-                            common.mailbox.dismiss(data, function () {});
+                            common.mailbox.dismiss(data, function () {
+                            });
                             return void UI.alert(Messages.deletedError);
                         }
                         return void UI.warn(Messages.error);
                     }
                     answer(true);
-                    if (priv.app !== 'teams') { common.openURL('/teams/'); }
+                    if (priv.app !== 'teams') {
+                        common.openURL('/teams/');
+                    }
                 });
                 return;
             }
@@ -3691,9 +3986,13 @@ define([
     getSource['contacts'] = function (common, sources) {
         var priv = common.getMetadataMgr().getPrivateData();
         Object.keys(priv.friends || {}).forEach(function (key) {
-            if (key === 'me') { return; }
+            if (key === 'me') {
+                return;
+            }
             var f = priv.friends[key];
-            if (!f.curvePublic || sources[f.curvePublic]) { return; }
+            if (!f.curvePublic || sources[f.curvePublic]) {
+                return;
+            }
             sources[f.curvePublic] = {
                 avatar: f.avatar,
                 name: f.displayName,
@@ -3705,35 +4004,52 @@ define([
         });
     };
     UIElements.addMentions = function (common, options) {
-        if (!options.$input) { return; }
+        if (!options.$input) {
+            return;
+        }
         var $t = options.$input;
 
-        var getValue = function () { return $t.val(); };
-        var setValue = function (val) { $t.val(val); };
+        var getValue = function () {
+            return $t.val();
+        };
+        var setValue = function (val) {
+            $t.val(val);
+        };
 
         var div = false;
         if (options.contenteditable) {
             div = true;
-            getValue = function () { return $t.html(); };
-            setValue = function () {}; // Not used, we insert data at the node level
+            getValue = function () {
+                return $t.html();
+            };
+            setValue = function () {
+            }; // Not used, we insert data at the node level
             $t.on('paste', function (e) {
                 try {
                     insertTextAtCursor(e.originalEvent.clipboardData.getData('text'));
                     e.preventDefault();
-                } catch (err) { console.error(err); }
+                } catch (err) {
+                    console.error(err);
+                }
             });
 
             // Fix backspace with "contenteditable false" children
             $t.on('keydown', function (e) {
-                if (e.which !== 8 && e.which !== 46) { return; } // Backspace or del
+                if (e.which !== 8 && e.which !== 46) {
+                    return;
+                } // Backspace or del
                 var sel = document.getSelection();
-                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) { return; } // text nodes only
+                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) {
+                    return;
+                } // text nodes only
 
                 // Only fix node located after mentions
                 var n = sel.anchorNode;
                 var prev = n && n.previousSibling;
                 // Check if our caret is just after a mention
-                if (!prev || !prev.classList || !prev.classList.contains('cp-mentions')) { return; }
+                if (!prev || !prev.classList || !prev.classList.contains('cp-mentions')) {
+                    return;
+                }
 
                 // Del: if we're at offset 0, make sure we won't delete the text node
                 if (e.which === 46) {
@@ -3762,7 +4078,9 @@ define([
         // Add the sources
         // NOTE: Sources must have a "name". They can have an "avatar".
         var sources = options.sources || {};
-        if (!getSource[options.type]) { return; }
+        if (!getSource[options.type]) {
+            return;
+        }
         getSource[options.type](common, sources);
 
 
@@ -3770,25 +4088,31 @@ define([
         var sort = function (a, b) {
             var _a = a.label.toLowerCase();
             var _b = b.label.toLowerCase();
-            if (_a.label < _b.label) { return -1; }
-            if (_b.label < _a.label) { return 1; }
+            if (_a.label < _b.label) {
+                return -1;
+            }
+            if (_b.label < _a.label) {
+                return 1;
+            }
             return 0;
         };
 
         // Get the text between the last @ before the cursor and the cursor
         var extractLast = function (term, offset) {
-            offset = typeof(offset) !== "undefined" ? offset : $t[0].selectionStart;
-            var startOffset = term.slice(0,offset).lastIndexOf('@');
-            return term.slice(startOffset+1, offset);
+            offset = typeof (offset) !== "undefined" ? offset : $t[0].selectionStart;
+            var startOffset = term.slice(0, offset).lastIndexOf('@');
+            return term.slice(startOffset + 1, offset);
         };
         // Insert the autocomplete value in the input field
         var insertValue = function (value, offset, content) {
-            offset = typeof(offset) !== "undefined" ? offset : $t[0].selectionStart;
+            offset = typeof (offset) !== "undefined" ? offset : $t[0].selectionStart;
             content = content || getValue();
-            var startOffset = content.slice(0,offset).lastIndexOf('@');
+            var startOffset = content.slice(0, offset).lastIndexOf('@');
             var length = offset - startOffset;
-            if (length <= 0) { return; }
-            var result = content.slice(0,startOffset) + value + content.slice(offset);
+            if (length <= 0) {
+                return;
+            }
+            var result = content.slice(0, startOffset) + value + content.slice(offset);
             if (content) {
                 return {
                     result: result,
@@ -3800,7 +4124,7 @@ define([
         // Set the value to receive from the autocomplete
         var toInsert = function (data, key) {
             var name = UI.getDisplayName(data.name.replace(/[^a-zA-Z0-9]+/g, "-"));
-            return "[@"+name+"|"+key+"]";
+            return "[@" + name + "|" + key + "]";
         };
 
         // Fix the functions when suing a contenteditable div
@@ -3809,26 +4133,33 @@ define([
             // Use getSelection to get the cursor position in contenteditable
             extractLast = function () {
                 var sel = document.getSelection();
-                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) { return; }
+                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) {
+                    return;
+                }
                 return _extractLast(sel.anchorNode.nodeValue, sel.anchorOffset);
             };
             var _insertValue = insertValue;
-            insertValue = function (value) {
+            insertValue = function (value) {
                 // Get the selected node
                 var sel = document.getSelection();
-                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) { return; }
+                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) {
+                    return;
+                }
                 var node = sel.anchorNode;
 
                 // Remove the "term"
-                var insert =_insertValue("", sel.anchorOffset, node.nodeValue);
+                var insert = _insertValue("", sel.anchorOffset, node.nodeValue);
                 if (insert) {
                     node.nodeValue = insert.result;
                 }
                 var breakAt = insert ? insert.startOffset : sel.anchorOffset;
 
                 var el;
-                if (typeof(value) === "string") { el = document.createTextNode(value); }
-                else { el = value; }
+                if (typeof (value) === "string") {
+                    el = document.createTextNode(value);
+                } else {
+                    el = value;
+                }
 
                 node.parentNode.insertBefore(el, node.splitText(breakAt));
                 var next = el.nextSibling;
@@ -3873,7 +4204,7 @@ define([
 
 
         // don't navigate away from the field on tab when selecting an item
-        $t.on("keydown", function(e) {
+        $t.on("keydown", function (e) {
             // Tab or enter
             if ((e.which === 13 || e.which === 9)) {
                 try {
@@ -3882,15 +4213,17 @@ define([
                         e.preventDefault();
                         e.stopPropagation();
                     }
-                } catch (err) { console.error(err, $t); }
+                } catch (err) {
+                    console.error(err, $t);
+                }
             }
         }).autocomplete({
             minLength: 0,
-            source: function(data, cb) {
+            source: function (data, cb) {
                 var term = data.term;
                 var results = [];
                 if (term.indexOf("@") >= 0) {
-                    term = extractLast(data.term) || '';
+                    term = extractLast(data.term) || '';
                     results = Object.keys(sources).filter(function (key) {
                         var data = sources[key];
                         return data.name.toLowerCase().indexOf(term.toLowerCase()) !== -1;
@@ -3911,15 +4244,16 @@ define([
                     var menu = $t.autocomplete("instance").menu.activeMenu;
                     menu.css({
                         'overflow-y': 'auto',
-                        'max-height': (max-pos.bottom)+'px'
+                        'max-height': (max - pos.bottom) + 'px'
                     });
-                } catch (e) {}
+                } catch (e) {
+                }
             },
-            focus: function() {
+            focus: function () {
                 // prevent value inserted on focus
                 return false;
             },
-            select: function(event, ui) {
+            select: function (event, ui) {
                 // add the selected item
                 var key = ui.item.value;
                 var data = sources[key];
@@ -3927,10 +4261,12 @@ define([
                 insertValue(value);
                 return false;
             }
-        }).autocomplete( "instance" )._renderItem = function( ul, item ) {
+        }).autocomplete("instance")._renderItem = function (ul, item) {
             var key = item.value;
             var obj = sources[key];
-            if (!obj) { return; }
+            if (!obj) {
+                return;
+            }
             var avatar = h('span.cp-avatar');
             var displayName = UI.getDisplayName(obj.name);
 
@@ -3951,15 +4287,20 @@ define([
 
     UIElements.is24h = function () {
         try {
-            return !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
-        } catch (e) {}
+            return !new Intl.DateTimeFormat(navigator.language, {hour: 'numeric'}).format(0).match(/AM/);
+        } catch (e) {
+        }
         return false;
     };
 
     UIElements.fixInlineBRs = function (htmlString) {
-        if (!htmlString && typeof(htmlString) === 'string') { return; }
+        if (!htmlString && typeof (htmlString) === 'string') {
+            return;
+        }
         var lines = htmlString.split('<br>');
-        if (lines.length === 1) { return lines; }
+        if (lines.length === 1) {
+            return lines;
+        }
         var len = lines.length - 1;
         var result = [];
         for (var i = 0; i <= len; i++) {
@@ -3975,7 +4316,7 @@ define([
         var modal;
         var readOnly = common.getMetadataMgr().getPrivateData().readOnly;
 
-        var container = h('div.cp-snapshots-container', {tabindex:1});
+        var container = h('div.cp-snapshots-container', {tabindex: 1});
         var $container = $(container);
 
         var input = h('input', {
@@ -3993,7 +4334,7 @@ define([
         var refresh = function () {
             var metadataMgr = common.getMetadataMgr();
             var md = metadataMgr.getMetadata();
-            var snapshots = md.snapshots || {};
+            var snapshots = md.snapshots || {};
 
             var list = Object.keys(snapshots).sort(function (h1, h2) {
                 var s1 = snapshots[h1];
@@ -4028,7 +4369,7 @@ define([
                     refresh();
                 });
 
-                return h('span.cp-snapshot-element', {tabindex:1}, [
+                return h('span.cp-snapshot-element', {tabindex: 1}, [
                     h('i.fa.fa-camera'),
                     h('span.cp-snapshot-title', [
                         h('span', s.title),
@@ -4043,7 +4384,9 @@ define([
 
             $container.html('').append(list);
             setTimeout(function () {
-                if (list.length) { return void $container.focus(); }
+                if (list.length) {
+                    return void $container.focus();
+                }
                 $input.focus();
             });
         };
@@ -4052,7 +4395,8 @@ define([
         var buttons = [{
             className: 'cancel',
             name: Messages.filePicker_close,
-            onClick: function () {},
+            onClick: function () {
+            },
             keys: [27],
         }];
         if (!readOnly) {
@@ -4062,7 +4406,9 @@ define([
                 name: Messages.snapshots_new,
                 onClick: function () {
                     var val = $input.val();
-                    if (!val) { return true; }
+                    if (!val) {
+                        return true;
+                    }
                     $container.html('').append(h('div.cp-snapshot-spinner'));
                     var to = setTimeout(function () {
                         UI.spinner($container.find('div')).get().show();
@@ -4081,7 +4427,7 @@ define([
             });
         }
 
-        modal = UI.openCustomModal(UI.dialog.customModal(content, {buttons: buttons }));
+        modal = UI.openCustomModal(UI.dialog.customModal(content, {buttons: buttons}));
     };
 
     return UIElements;

From 58daaa21523628e5ee452ace5e6a55fad9a6cc82 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 1 Nov 2023 13:08:39 +0200
Subject: [PATCH 47/87] temporary disabled keyboard access to drive content has
 to be redone

---
 www/common/drive-ui.js | 2000 ++++++++++++++++++++++++----------------
 1 file changed, 1205 insertions(+), 795 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 87b1d3bc1..6041b0173 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -39,15 +39,17 @@ define([
     ProxyManager,
     AppConfig,
     Messages,
-    Pages)
-{
+    Pages) {
 
     var APP = window.APP = {
         editable: false,
         online: false,
         mobile: function () {
-            if (window.matchMedia) { return !window.matchMedia('(any-pointer:fine)').matches; }
-            else { return $('body').width() <= 600; }
+            if (window.matchMedia) {
+                return !window.matchMedia('(any-pointer:fine)').matches;
+            } else {
+                return $('body').width() <= 600;
+            }
         },
         isMac: navigator.platform === "MacIntel",
         allowFolderUpload: File.prototype.hasOwnProperty("webkitRelativePath"),
@@ -148,7 +150,9 @@ define([
     var DEBUG = config.DEBUG = false;
     var debug = config.debug = DEBUG ? function () {
         console.log.apply(console, arguments);
-    } : function () { return; };
+    } : function () {
+        return;
+    };
     var logError = config.logError = function () {
         console.error.apply(console, arguments);
     };
@@ -157,7 +161,7 @@ define([
     var localStore = window.cryptpadStore;
     APP.store = {};
 
-    $(window).keydown(function (e) {
+    $(window).keydown(function (e) {
         if (e.which === 70 && e.ctrlKey) {
             e.preventDefault();
             e.stopPropagation();
@@ -169,7 +173,7 @@ define([
     });
 
     var makeLS = function (teamId) {
-        var suffix = teamId ? ('-' + teamId) :  '';
+        var suffix = teamId ? ('-' + teamId) : '';
         var LS_LAST = "app-drive-lastOpened" + suffix;
         var LS_OPENED = "app-drive-openedFolders" + suffix;
 
@@ -185,13 +189,15 @@ define([
             return path;
         };
         LS.setLastOpenedFolder = function (path) {
-            if (path[0] === SEARCH) { return; }
+            if (path[0] === SEARCH) {
+                return;
+            }
             APP.store[LS_LAST] = JSON.stringify(path);
             localStore.put(LS_LAST, JSON.stringify(path));
         };
 
         LS.wasFolderOpened = function (path) {
-            var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
+            var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
             return stored.indexOf(JSON.stringify(path)) !== -1;
         };
         LS.setFolderOpened = function (path, opened) {
@@ -212,7 +218,7 @@ define([
         LS.removeFoldersOpened = function (parentPath) {
             var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
             var s = JSON.stringify(parentPath).slice(0, -1);
-            for (var i = stored.length - 1 ; i >= 0 ; i--) {
+            for (var i = stored.length - 1; i >= 0; i--) {
                 if (stored[i].indexOf(s) === 0) {
                     stored.splice(i, 1);
                 }
@@ -226,7 +232,7 @@ define([
             var newParentPath = parentPath.slice();
             newParentPath[newParentPath.length - 1] = newName;
             var sNew = JSON.stringify(newParentPath).slice(0, -1);
-            for (var i = 0 ; i < stored.length ; i++) {
+            for (var i = 0; i < stored.length; i++) {
                 if (stored[i].indexOf(s) === 0) {
                     stored[i] = stored[i].replace(s, sNew);
                 }
@@ -238,10 +244,14 @@ define([
             var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
             var s = JSON.stringify(previousPath).slice(0, -1);
             var sNew = JSON.stringify(newPath).slice(0, -1);
-            if (s === sNew ) { return; } // move to itself
-            if (sNew.indexOf(s) === 0) { return; } // move to subfolder
+            if (s === sNew) {
+                return;
+            } // move to itself
+            if (sNew.indexOf(s) === 0) {
+                return;
+            } // move to subfolder
             sNew = JSON.stringify(newPath.concat(previousPath[previousPath.length - 1])).slice(0, -1);
-            for (var i = 0 ; i < stored.length ; i++) {
+            for (var i = 0; i < stored.length; i++) {
                 if (stored[i].indexOf(s) === 0) {
                     stored[i] = stored[i].replace(s, sNew);
                 }
@@ -255,14 +265,16 @@ define([
 
     var getViewModeClass = function (forceList) {
         var mode = APP.store[LS_VIEWMODE];
-        if (mode === 'list' || forceList) { return 'cp-app-drive-content-list'; }
+        if (mode === 'list' || forceList) {
+            return 'cp-app-drive-content-list';
+        }
         return 'cp-app-drive-content-grid';
     };
     var getViewMode = function () {
         return APP.store[LS_VIEWMODE] || 'grid';
     };
     var setViewMode = function (mode) {
-        if (typeof(mode) !== "string") {
+        if (typeof (mode) !== "string") {
             logError("Incorrect view mode: ", mode);
             return;
         }
@@ -275,7 +287,9 @@ define([
     // If isHistory is true, update the "APP.history" flag
     // isSf is used to detect offline shared folders: setEditable is called on displayDirectory
     var setEditable = function (state, isHistory, isSf) {
-        if (APP.closed || !APP.$content || !$.contains(document.documentElement, APP.$content[0])) { return; }
+        if (APP.closed || !APP.$content || !$.contains(document.documentElement, APP.$content[0])) {
+            return;
+        }
         if (isHistory) {
             APP.history = !state;
         } else if (!isSf) {
@@ -283,7 +297,9 @@ define([
         }
         state = APP.online && !APP.history && state;
         APP.editable = !APP.readOnly && state;
-        if (APP.editable) { onConnectEvt.fire(); }
+        if (APP.editable) {
+            onConnectEvt.fire();
+        }
 
         if (!state) {
             APP.$content.addClass('cp-app-drive-readonly');
@@ -293,8 +309,7 @@ define([
                 $('#cp-app-drive-connection-state').hide();
             }
             $('[draggable="true"]').attr('draggable', false);
-        }
-        else {
+        } else {
             APP.$content.removeClass('cp-app-drive-readonly');
             $('#cp-app-drive-connection-state').hide();
             $('[draggable="false"]').attr('draggable', true);
@@ -302,7 +317,9 @@ define([
     };
 
     var copyObjectValue = function (objRef, objToCopy) {
-        for (var k in objRef) { delete objRef[k]; }
+        for (var k in objRef) {
+            delete objRef[k];
+        }
         $.extend(true, objRef, objToCopy);
     };
 
@@ -331,18 +348,20 @@ define([
         return $(".cp-app-drive-element-selected");
     };
 
-        var getNewPadTypes = function () {
-            var arr = [];
-            AppConfig.availablePadTypes.forEach(function (type) {
-                if (AppConfig.hiddenTypes.indexOf(type) !== -1) { return; }
-                if (!APP.loggedIn && AppConfig.registeredOnlyTypes &&
-                    AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
-                    return;
-                }
-                arr.push(type);
-            });
-            return arr;
-        };
+    var getNewPadTypes = function () {
+        var arr = [];
+        AppConfig.availablePadTypes.forEach(function (type) {
+            if (AppConfig.hiddenTypes.indexOf(type) !== -1) {
+                return;
+            }
+            if (!APP.loggedIn && AppConfig.registeredOnlyTypes &&
+                AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
+                return;
+            }
+            arr.push(type);
+        });
+        return arr;
+    };
 
     var createContextMenu = function (common) {
         var metadataMgr = common.getMetadataMgr();
@@ -351,8 +370,8 @@ define([
         APP.premiumPlan = priv.plan;
         var getOpenIn = function (app) {
             var icon = AppConfig.applicationsIcon[app];
-            var cls = icon.indexOf('cptools') === 0 ? 'cptools '+icon : 'fa '+icon;
-            var html = '<i class="'+cls+'"></i>' + Messages.type[app];
+            var cls = icon.indexOf('cptools') === 0 ? 'cptools ' + icon : 'fa ' + icon;
+            var html = '<i class="' + cls + '"></i>' + Messages.type[app];
             return Messages._getKey('fc_openIn', [html]);
         };
         var restricted = {};
@@ -361,11 +380,15 @@ define([
             return enabled.includes(app);
         };
         getNewPadTypes().forEach(function (app) {
-            if (!Array.isArray(AppConfig.availablePadTypes)) { return void enabled.push(app); }
+            if (!Array.isArray(AppConfig.availablePadTypes)) {
+                return void enabled.push(app);
+            }
             var registered = common.isLoggedIn() || !(AppConfig.registeredOnlyTypes || []).includes(app);
             restricted[app] = common.checkRestrictedApp(app);
             var e = AppConfig.availablePadTypes.includes(app) && registered && restricted[app] >= 0;
-            if (e) { enabled.push(app); }
+            if (e) {
+                enabled.push(app);
+            }
         });
         var menu = h('div.cp-contextmenu.dropdown.cp-unselectable', [
             h('ul.dropdown-menu', {
@@ -1039,20 +1062,20 @@ define([
                 APP.onElementClick(ev, $(el));
             };
 
-            var $selection = findSelectedElements();
-            if ($selection.length === 0) { return void click($elements.first()[0]); }
-
-            var lastIndex = typeof sel.endSelected === "number" ? sel.endSelected :
-                            typeof sel.startSelected === "number" ? sel.startSelected :
-                            $elements.index($selection.last()[0]);
-            var length = $elements.length;
-            if (length === 0) { return; }
-            // List mode
-            if (getViewMode() === "list") {
-                if (e.which === 40) { click($elements.get(Math.min(lastIndex+1, length -1))); }
-                if (e.which === 38) { click($elements.get(Math.max(lastIndex-1, 0))); }
-                return;
-            }
+            // var $selection = findSelectedElements();
+            // if ($selection.length === 0) { return void click($elements.first()[0]); }
+            //
+            // var lastIndex = typeof sel.endSelected === "number" ? sel.endSelected :
+            //                 typeof sel.startSelected === "number" ? sel.startSelected :
+            //                 $elements.index($selection.last()[0]);
+            // var length = $elements.length;
+            // if (length === 0) { return; }
+            // // List mode
+            // if (getViewMode() === "list") {
+            //     if (e.which === 40) { click($elements.get(Math.min(lastIndex+1, length -1))); }
+            //     if (e.which === 38) { click($elements.get(Math.max(lastIndex-1, 0))); }
+            //     return;
+            // }
 
             // Icon mode
             // Get the vertical and horizontal position of lastIndex
@@ -1069,26 +1092,26 @@ define([
                 c : lastIndex - Math.floor(lastIndex/cols)*cols
             };
 
-            if (e.which === 37) {
-                if (lastPos.c === 0) { return; }
-                click($elements.get(Math.max(lastIndex-1, 0)));
-                return;
-            }
-            if (e.which === 38) {
-                if (lastPos.l === 0) { return; }
-                click($elements.get(Math.max(lastIndex-cols, 0)));
-                return;
-            }
-            if (e.which === 39) {
-                if (lastPos.c === cols-1) { return; }
-                click($elements.get(Math.min(lastIndex+1, length-1)));
-                return;
-            }
-            if (e.which === 40) {
-                if (lastPos.l === lines-1) { return; }
-                click($elements.get(Math.min(lastIndex+cols, length-1)));
-                return;
-            }
+            // if (e.which === 37) {
+            //     if (lastPos.c === 0) { return; }
+            //     click($elements.get(Math.max(lastIndex-1, 0)));
+            //     return;
+            // }
+            // if (e.which === 38) {
+            //     if (lastPos.l === 0) { return; }
+            //     click($elements.get(Math.max(lastIndex-cols, 0)));
+            //     return;
+            // }
+            // if (e.which === 39) {
+            //     if (lastPos.c === cols-1) { return; }
+            //     click($elements.get(Math.min(lastIndex+1, length-1)));
+            //     return;
+            // }
+            // if (e.which === 40) {
+            //     if (lastPos.l === lines-1) { return; }
+            //     click($elements.get(Math.min(lastIndex+cols, length-1)));
+            //     return;
+            // }
         };
 
         var compareDays = function (date1, date2) {
@@ -1121,9 +1144,13 @@ define([
             $content.find('.cp-app-drive-element.cp-border-color-file').each(function (i, el) {
                 var path = $(el).data('path');
                 var id = manager.find(path);
-                if (!id) { return; }
+                if (!id) {
+                    return;
+                }
                 var _data = manager.getFileData(id);
-                if (!_data || _data.channel < 48) { return; }
+                if (!_data || _data.channel < 48) {
+                    return;
+                }
                 mts.push({
                     channel: _data.channel,
                     href: _data.href,
@@ -1153,9 +1180,13 @@ define([
         var FILTER_BY = "filterBy";
 
         var refreshDeprecated = function () {
-            if (!APP.passwordModal) { return; }
+            if (!APP.passwordModal) {
+                return;
+            }
             var deprecated = files.sharedFoldersTemp;
-            if (JSONSortify(deprecated) === APP.deprecatedSF) { return; }
+            if (JSONSortify(deprecated) === APP.deprecatedSF) {
+                return;
+            }
             APP.deprecatedSF = JSONSortify(deprecated);
             if (typeof (deprecated) === "object" && Object.keys(deprecated).length) {
                 var nt = nThen;
@@ -1163,7 +1194,8 @@ define([
                     var data = deprecated[fId];
                     var sfId = manager.user.userObject.getSFIdFromHref(data.href);
                     if (folders[fId] || sfId) { // This shared folder is already stored in the drive...
-                        return void manager.delete([['sharedFoldersTemp', fId]], function () { });
+                        return void manager.delete([['sharedFoldersTemp', fId]], function () {
+                        });
                     }
                     nt = nt(function (waitFor) {
                         UI.openCustomModal(APP.passwordModal(fId, data, waitFor()));
@@ -1180,7 +1212,9 @@ define([
             var path = type ? [FILTER, type, currentPath] : currentPath;
             APP.displayDirectory(path, undefined, () => {
                 refreshDeprecated();
-                if (typeof(cb) === "function") { cb(); }
+                if (typeof (cb) === "function") {
+                    cb();
+                }
             });
         };
 
@@ -1206,11 +1240,11 @@ define([
             var parsed = Hash.parsePadUrl(href);
 
             if (parsed.hashData && parsed.hashData.type === 'file' && !app
-                    && (defaultInApp.indexOf(data.fileType) === -1 || app === false)) {
+                && (defaultInApp.indexOf(data.fileType) === -1 || app === false)) {
                 return void previewMediaTag(data);
             }
 
-            var obj = { t: APP.team };
+            var obj = {t: APP.team};
 
             var priv = metadataMgr.getPrivateData();
             var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
@@ -1221,7 +1255,9 @@ define([
             // Get hidden hash
             var secret = Hash.getSecrets(parsed.type, parsed.hash, data.password);
             var opts = {};
-            if (isRo) { opts.view = true; }
+            if (isRo) {
+                opts.view = true;
+            }
             var hash = Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
             var hiddenHref = Hash.hashToHref(hash, parsed.type);
             common.openURL(Hash.getNewPadURL(hiddenHref, obj));
@@ -1264,23 +1300,30 @@ define([
         };
 
         var getFolderColor = function (path) {
-            if (path.length === 0) { return; }
+            if (path.length === 0) {
+                return;
+            }
             return manager.getFolderData(path).color || "";
         };
 
         var setFolderColor = function ($element, path, color) {
-            if ($element.length === 0) { return; }
+            if ($element.length === 0) {
+                return;
+            }
             $element.find(".cp-app-drive-icon-folder").css("color", color);
             manager.setFolderData({
                 path: path,
                 key: "color",
                 value: color
-            }, function () {});
+            }, function () {
+            });
         };
 
 
         var filterContextMenu = function (type, paths) {
-            if (!paths || paths.length === 0) { logError('no paths'); }
+            if (!paths || paths.length === 0) {
+                logError('no paths');
+            }
 
             $contextMenu.find('li').hide();
 
@@ -1289,16 +1332,24 @@ define([
             var editable = true;
 
             if (type === "content") {
-                if (APP.$content.data('readOnlyFolder')) { editable = false; }
+                if (APP.$content.data('readOnlyFolder')) {
+                    editable = false;
+                }
                 // Return true in filter to hide
                 filter = function ($el, className) {
-                    if (className === 'newfolder') { return; }
+                    if (className === 'newfolder') {
+                        return;
+                    }
                     if (className === 'newsharedfolder') {
                         // Hide the new shared folder menu if we're already in a shared folder
                         return manager.isInSharedFolder(currentPath) || APP.disableSF;
                     }
-                    if (className === 'uploadfiles') { return; }
-                    if (className === 'uploadfolder') { return !APP.allowFolderUpload; }
+                    if (className === 'uploadfiles') {
+                        return;
+                    }
+                    if (className === 'uploadfolder') {
+                        return !APP.allowFolderUpload;
+                    }
                     if (className === 'newdoc') {
                         return;
                     }
@@ -1316,7 +1367,9 @@ define([
                     var $element = p.element;
 
                     if (APP.$content.data('readOnlyFolder') &&
-                            manager.isSubpath(path, currentPath)) { editable = false; }
+                        manager.isSubpath(path, currentPath)) {
+                        editable = false;
+                    }
 
                     if (!$element.closest("#cp-app-drive-tree").length) {
                         hide.push('expandall');
@@ -1428,7 +1481,7 @@ define([
                     }
                     // If we're not in the trash nor in a shared folder, hide "remove"
                     if (!manager.isInSharedFolder(path)
-                            && !$element.is('.cp-app-drive-element-sharedf')) {
+                        && !$element.is('.cp-app-drive-element-sharedf')) {
                         // This isn't a shared folder: can't delete shared folder
                         hide.push('removesf');
                     } else if (type === "tree") {
@@ -1467,19 +1520,21 @@ define([
                 }
 
                 filter = function ($el, className) {
-                    if (hide.indexOf(className) !== -1) { return true; }
+                    if (hide.indexOf(className) !== -1) {
+                        return true;
+                    }
                 };
             }
 
-            switch(type) {
+            switch (type) {
                 case 'content':
                     show = ['newfolder', 'newsharedfolder', 'uploadfiles', 'uploadfolder', 'newdoc'];
                     break;
                 case 'tree':
                     show = ['open', 'openro', 'preview', 'openincode', 'expandall', 'collapseall',
-                            'color', 'download', 'share', 'savelocal', 'rename', 'delete',
-                            'makeacopy', 'openinsheet', 'openindoc', 'openinpresentation',
-                            'deleteowned', 'removesf', 'access', 'properties', 'hashtag'];
+                        'color', 'download', 'share', 'savelocal', 'rename', 'delete',
+                        'makeacopy', 'openinsheet', 'openindoc', 'openinpresentation',
+                        'deleteowned', 'removesf', 'access', 'properties', 'hashtag'];
                     break;
                 case 'default':
                     show = ['open', 'openro', 'preview', 'openincode', 'openinsheet', 'openindoc', 'openinpresentation', 'share', 'download', 'openparent', 'delete', 'deleteowned', 'properties', 'access', 'hashtag', 'makeacopy', 'savelocal', 'rename'];
@@ -1496,9 +1551,15 @@ define([
             var filtered = [];
             show.forEach(function (className) {
                 var $el = $contextMenu.find('.cp-app-drive-context-' + className);
-                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) { return; }
-                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) { return; }
-                if (filter($el, className)) { return; }
+                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) {
+                    return;
+                }
+                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) {
+                    return;
+                }
+                if (filter($el, className)) {
+                    return;
+                }
                 $el.parent('li').show();
                 filtered.push('.cp-app-drive-context-' + className);
             });
@@ -1578,7 +1639,9 @@ define([
             // New scroll value
             var v = st + pos + eh - h;
             // If the element is completely visile, don't change the scroll position
-            if (pos+eh <= h && pos >= 0) { return; }
+            if (pos + eh <= h && pos >= 0) {
+                return;
+            }
             $content.scrollTop(v);
         };
 
@@ -1588,7 +1651,9 @@ define([
             removeInput();
             $element = findDataHolder($element);
             // If we're selecting a new element with the left click, hide the menu
-            if (e) { APP.hideMenu(); }
+            if (e) {
+                APP.hideMenu();
+            }
             // Remove the selection if we don't hold ctrl key or if we are right-clicking
             if (!e || !e.ctrlKey) {
                 removeSelected(e && e.shiftKey);
@@ -1648,14 +1713,17 @@ define([
                 var $el = $(el);
                 if ($el.is(".dropdown-divider")) {
                     $el.css("display", showSep ? "list-item" : "none");
-                    if (showSep) { $lastVisibleSep = $el; }
+                    if (showSep) {
+                        $lastVisibleSep = $el;
+                    }
                     showSep = false;
-                }
-                else if ($el.is("li") && $el.css("display") !== "none") {
+                } else if ($el.is("li") && $el.css("display") !== "none") {
                     showSep = true;
                 }
             });
-            if (!showSep && $lastVisibleSep) { $lastVisibleSep.css("display", "none"); } // remove last divider if no options after
+            if (!showSep && $lastVisibleSep) {
+                $lastVisibleSep.css("display", "none");
+            } // remove last divider if no options after
         };
 
         // prepare and display contextmenu
@@ -1677,7 +1745,7 @@ define([
                 hideSeparators($(menu));
             });
             // show contextmenu at cursor position
-            $menu.css({ display: "block" });
+            $menu.css({display: "block"});
             if (APP.mobile()) {
                 $menu.css({
                     top: ($("#cp-app-drive-toolbar-context-mobile").offset().top + 32) + 'px',
@@ -1697,7 +1765,7 @@ define([
                 });
             } else if (e.pageY + h <= wH) {
                 $menu.css({
-                    top: e.pageY+'px',
+                    top: e.pageY + 'px',
                     bottom: ''
                 });
             } else {
@@ -1706,14 +1774,14 @@ define([
                     top: ''
                 });
             }
-            if(w > wW) {
+            if (w > wW) {
                 $menu.css({
                     left: '0px',
                     right: ''
                 });
             } else if (e.pageX + w <= wW) {
                 $menu.css({
-                    left: e.pageX+'px',
+                    left: e.pageX + 'px',
                     right: ''
                 });
             } else {
@@ -1733,7 +1801,9 @@ define([
                 var paths;
                 if (type === 'content') {
                     paths = [{path: $(e.target).closest('#' + FOLDER_CONTENT_ID).data('path')}];
-                    if (!paths) { return; }
+                    if (!paths) {
+                        return;
+                    }
                     removeSelected();
                 } else {
                     var $element = findDataHolder($(e.target));
@@ -1749,7 +1819,9 @@ define([
                         removeSelected();
                     }
 
-                    if (type === 'trash' && !$element.data('path')) { return; }
+                    if (type === 'trash' && !$element.data('path')) {
+                        return;
+                    }
 
                     if (!$element.length) {
                         logError("Unable to locate the .element tag", e.target);
@@ -1792,7 +1864,9 @@ define([
 
         var getElementName = function (path) {
             var file = manager.find(path);
-            if (!file) { return; }
+            if (!file) {
+                return;
+            }
             if (manager.isSharedFolder(file)) {
                 return manager.getSharedFolderData(file).title;
             }
@@ -1800,7 +1874,9 @@ define([
         };
         // moveElements is able to move several paths to a new location
         var moveElements = function (paths, newPath, copy, cb) {
-            if (!APP.editable) { return; }
+            if (!APP.editable) {
+                return;
+            }
             // Cancel drag&drop from TRASH to TRASH
             if (manager.isPathIn(newPath, [TRASH]) && paths.length && paths[0][0] === TRASH) {
                 return;
@@ -1811,22 +1887,30 @@ define([
                 });
                 cb();
             };
-            if (paths.some(function (p) { return manager.comparePath(newPath, p); })) { return void cb(); }
+            if (paths.some(function (p) {
+                return manager.comparePath(newPath, p);
+            })) {
+                return void cb();
+            }
             manager.move(paths, newPath, newCb, copy);
         };
         // Delete paths from the drive and/or shared folders (without moving them to the trash)
         var deletePaths = function (paths, pathsList) {
             pathsList = pathsList || [];
             if (paths) {
-                paths.forEach(function (p) { pathsList.push(p.path); });
+                paths.forEach(function (p) {
+                    pathsList.push(p.path);
+                });
             }
             var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [pathsList.length]);
             if (pathsList.length === 1) {
                 msg = Messages.fm_removePermanentlyDialog;
             }
-            UI.confirm(msg, function(res) {
+            UI.confirm(msg, function (res) {
                 $(window).focus();
-                if (!res) { return; }
+                if (!res) {
+                    return;
+                }
                 manager.delete(pathsList, function () {
                     pathsList.forEach(LS.removeFoldersOpened);
                     removeSelected();
@@ -1848,7 +1932,9 @@ define([
                     var ePath = $(elmt).data('path');
                     if (ePath) {
                         var val = manager.find(ePath);
-                        if (!val) { return; } // Error? A ".selected" element is not in the object
+                        if (!val) {
+                            return;
+                        } // Error? A ".selected" element is not in the object
                         paths.push({
                             path: ePath,
                             value: {
@@ -1862,7 +1948,9 @@ define([
                 removeSelected();
                 selectElement($element);
                 var val = manager.find(path);
-                if (!val) { return; } // The element is not in the object
+                if (!val) {
+                    return;
+                } // The element is not in the object
                 paths = [{
                     path: path,
                     value: {
@@ -1882,8 +1970,7 @@ define([
             var $el;
             if ($target.is(".cp-app-drive-path-element")) {
                 $el = $target;
-            }
-            else {
+            } else {
                 $el = findDataHolder($target);
             }
             var newPath = $el.data('path');
@@ -1891,7 +1978,7 @@ define([
             if (newPath && manager.isSharedFolder(dropEl)) {
                 newPath.push(manager.user.userObject.ROOT);
             } else if ((!newPath || manager.isFile(dropEl))
-                    && $target.parents('#cp-app-drive-content')) {
+                && $target.parents('#cp-app-drive-content')) {
                 newPath = currentPath;
             }
             return newPath;
@@ -1915,7 +2002,7 @@ define([
             path = path || "";
             if (item.isFile) {
                 // Get file
-                item.file(w(function(file) {
+                item.file(w(function (file) {
                     file.fix_path = path + file.name;
                     files.push(file);
                 }));
@@ -1925,8 +2012,8 @@ define([
                 // this API is not supported in Opera or IE
                 // https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItem/webkitGetAsEntry
                 // all other browsers will recurse over subfolders and upload everything
-                dirReader.readEntries(w(function(entries) {
-                    for (var i=0; i<entries.length; i++) {
+                dirReader.readEntries(w(function (entries) {
+                    for (var i = 0; i < entries.length; i++) {
                         traverseFileTree(entries[i], path + item.name + "/", w, files);
                     }
                 }));
@@ -1951,7 +2038,9 @@ define([
 
             // ask for folder name and files options, then upload all the files!
             APP.FM.showFolderUploadModal(availableName, function (folderUploadOptions) {
-                if (!folderUploadOptions) { return; }
+                if (!folderUploadOptions) {
+                    return;
+                }
 
                 // verfify folder name is possible, and update files path
                 availableName = manager.user.userObject.getAvailableName(manager.find(currentFolder), folderUploadOptions.folderName);
@@ -1963,9 +2052,11 @@ define([
 
                 // uploadSteps is an array of objects {folders: [], files: []}, containing all the folders and files to create safely
                 // at the index i + 1, the files and folders are children of the folders at the index i
-                var maxSteps = files.reduce(function (max, file) { return Math.max(max, file.path.length); }, 0);
+                var maxSteps = files.reduce(function (max, file) {
+                    return Math.max(max, file.path.length);
+                }, 0);
                 var uploadSteps = [];
-                for (var i = 0 ; i < maxSteps ; i++) {
+                for (var i = 0; i < maxSteps; i++) {
                     uploadSteps[i] = {
                         folders: [],
                         files: [],
@@ -1973,7 +2064,7 @@ define([
                 }
                 files.forEach(function (file) {
                     // add steps to create subfolders containing file
-                    for (var depth = 0 ; depth < file.path.length - 1 ; depth++) {
+                    for (var depth = 0; depth < file.path.length - 1; depth++) {
                         var subfolderStr = file.path.slice(0, depth + 1).join("/");
                         if (uploadSteps[depth].folders.indexOf(subfolderStr) === -1) {
                             uploadSteps[depth].folders.push(subfolderStr);
@@ -1986,7 +2077,9 @@ define([
                 // add folders, then add files when theirs folders have been created
                 // wait for the folders to be created to go to the next step (don't wait for the files)
                 var stepByStep = function (uploadSteps, i) {
-                    if (i >= uploadSteps.length) { return; }
+                    if (i >= uploadSteps.length) {
+                        return;
+                    }
                     nThen(function (waitFor) {
                         // add folders
                         uploadSteps[i].folders.forEach(function (folder) {
@@ -2018,7 +2111,9 @@ define([
             var data = ev.dataTransfer.getData("text");
 
             var newPath = findDropPath(ev.target);
-            if (!newPath) { return; }
+            if (!newPath) {
+                return;
+            }
             var sfId = manager.isInSharedFolder(newPath);
             if (sfId && folders[sfId] && folders[sfId].readOnly) {
                 return void UI.warn(Messages.fm_forbidden);
@@ -2028,7 +2123,9 @@ define([
             if (fileDrop.length) {
                 // Filter out all the folders and use the correct function to upload them
                 fileDrop = Array.prototype.slice.call(fileDrop).map(function (file) {
-                    if (file.kind !== "file") { return; }
+                    if (file.kind !== "file") {
+                        return;
+                    }
                     var f = file.getAsFile();
                     if (!f.type && f.size % 4096 === 0) {
                         // It's a folder!
@@ -2055,7 +2152,9 @@ define([
             }
 
             var oldPaths = JSON.parse(data).path;
-            if (!oldPaths) { return; }
+            if (!oldPaths) {
+                return;
+            }
             // A moved element should be removed from its previous location
             var movedPaths = [];
 
@@ -2086,7 +2185,9 @@ define([
         };
 
         var addDragAndDropHandlers = function ($element, path, isFolder, droppable) {
-            if (!APP.editable) { return; }
+            if (!APP.editable) {
+                return;
+            }
             // "dragenter" is fired for an element and all its children
             // "dragleave" may be fired when entering a child
             // --> we use pointer-events: none in CSS, but we still need a counter to avoid some issues
@@ -2104,7 +2205,9 @@ define([
             });
 
             // Add drop handlers if we are not in the trash and if the element is a folder
-            if (!droppable || !isFolder) { return; }
+            if (!droppable || !isFolder) {
+                return;
+            }
 
             $element.on('dragover', function (e) {
                 e.preventDefault();
@@ -2180,7 +2283,9 @@ define([
         };
         var thumbsUrls = {};
         var addFileData = function (element, $element) {
-            if (!manager.isFile(element)) { return; }
+            if (!manager.isFile(element)) {
+                return;
+            }
 
             var data = manager.getFileData(element);
             if (data.static) {
@@ -2192,11 +2297,13 @@ define([
             }
 
             var href = data.href || data.roHref;
-            if (!data) { return void logError("No data for the file", element); }
+            if (!data) {
+                return void logError("No data for the file", element);
+            }
 
             var hrefData = Hash.parsePadUrl(href);
             if (hrefData.type) {
-                $element.addClass('cp-border-color-'+hrefData.type);
+                $element.addClass('cp-border-color-' + hrefData.type);
             }
 
             var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
@@ -2237,8 +2344,7 @@ define([
                 $element.prepend(img);
                 $(img).addClass('cp-app-drive-element-grid cp-app-drive-element-thumbnail');
                 $(img).attr("draggable", false);
-            }
-            else {
+            } else {
                 common.displayThumbnail(href || data.roHref, data.channel, data.password, $element, function ($thumb) {
                     // Called only if the thumbnail exists
                     // Remove the .hide() added by displayThumnail() because it hides the icon in list mode too
@@ -2263,7 +2369,9 @@ define([
         };
 
         var addFolderData = function (element, key, $span) {
-            if (!element || !manager.isFolder(element)) { return; }
+            if (!element || !manager.isFolder(element)) {
+                return;
+            }
             // The element with the class '.name' is underlined when the 'li' is hovered
             var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
             var $ro;
@@ -2332,13 +2440,17 @@ define([
             var data = manager.getSharedFolderData(id);
             var parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
             var roParsed = Hash.parsePadUrl(data.roHref) || {};
-            if (!parsed.hash && !roParsed.hash) { return void console.error("Invalid href: "+(data.href || data.roHref)); }
+            if (!parsed.hash && !roParsed.hash) {
+                return void console.error("Invalid href: " + (data.href || data.roHref));
+            }
             var friends = common.getFriends();
             var ro = folders[id] && folders[id].version >= 2;
             // If we're a viewer and this is an old shared folder (no read-only mode), we
             // can't share the read-only URL and we don't have access to the edit one.
             // We should hide the share button.
-            if (!data.href && !ro) { return; }
+            if (!data.href && !ro) {
+                return;
+            }
 
             $shareBlock.click(function () {
                 Share.getShareModal(common, {
@@ -2369,7 +2481,9 @@ define([
             var element;
             if (isTrash && Array.isArray(elPath)) {
                 key = elPath[0];
-                elPath.forEach(function (k) { newPath.push(k); });
+                elPath.forEach(function (k) {
+                    newPath.push(k);
+                });
                 element = manager.find(newPath);
             } else {
                 key = elPath;
@@ -2383,8 +2497,8 @@ define([
             var $icon = !isFolder ? getFileIcon(element) : undefined;
             var ro = manager.isReadOnlyFile(element);
             // ro undefined means it's an old hash which doesn't support read-only
-            var roClass = typeof(ro) === 'undefined' ? '.cp-app-drive-element-noreadonly' :
-                            ro ? '.cp-app-drive-element-readonly' : '';
+            var roClass = typeof (ro) === 'undefined' ? '.cp-app-drive-element-noreadonly' :
+                ro ? '.cp-app-drive-element-readonly' : '';
             var liClass = '.cp-app-drive-element-file';
             var restrictedClass = restricted ? '.cp-app-drive-element-restricted' : '';
             if (isSharedFolder) {
@@ -2419,7 +2533,9 @@ define([
                     APP.displayDirectory(newPath);
                     return;
                 }
-                if (isTrash) { return; }
+                if (isTrash) {
+                    return;
+                }
                 openFile(root[key]);
             });
             var invalid;
@@ -2440,7 +2556,7 @@ define([
             });
             var droppable = !isTrash && !APP.$content.data('readOnlyFolder') && !restricted;
             addDragAndDropHandlers($element, newPath, isFolder, droppable);
-            $element.click(function(e) {
+            $element.click(function (e) {
                 e.stopPropagation();
                 onElementClick(e, $element);
             });
@@ -2454,7 +2570,9 @@ define([
             var isNewFolder = APP.newFolder && manager.comparePath(newPath, APP.newFolder);
             if (isNewFolder) {
                 appStatus.onReady(function () {
-                    window.setTimeout(function () { displayRenameInput($element, newPath); }, 0);
+                    window.setTimeout(function () {
+                        displayRenameInput($element, newPath);
+                    }, 0);
                 });
                 delete APP.newFolder;
             }
@@ -2462,7 +2580,9 @@ define([
             if (isSharedFolder && APP.convertedFolder === element) {
                 setTimeout(function () {
                     var $fakeButton = createShareButton(element, $('<div>'));
-                    if (!$fakeButton) { return; }
+                    if (!$fakeButton) {
+                        return;
+                    }
                     $fakeButton.click();
                 }, 100);
             }
@@ -2491,16 +2611,35 @@ define([
         var getPrettyName = function (name) {
             var pName;
             switch (name) {
-                case ROOT: pName = ROOT_NAME; break;
-                case TRASH: pName = TRASH_NAME; break;
-                case TEMPLATE: pName = TEMPLATE_NAME; break;
-                case FILES_DATA: pName = FILES_DATA_NAME; break;
-                case SEARCH: pName = SEARCH_NAME; break;
-                case RECENT: pName = RECENT_NAME; break;
-                case OWNED: pName = OWNED_NAME; break;
-                case TAGS: pName = TAGS_NAME; break;
-                case SHARED_FOLDER: pName = SHARED_FOLDER_NAME; break;
-                default: pName = name;
+                case ROOT:
+                    pName = ROOT_NAME;
+                    break;
+                case TRASH:
+                    pName = TRASH_NAME;
+                    break;
+                case TEMPLATE:
+                    pName = TEMPLATE_NAME;
+                    break;
+                case FILES_DATA:
+                    pName = FILES_DATA_NAME;
+                    break;
+                case SEARCH:
+                    pName = SEARCH_NAME;
+                    break;
+                case RECENT:
+                    pName = RECENT_NAME;
+                    break;
+                case OWNED:
+                    pName = OWNED_NAME;
+                    break;
+                case TAGS:
+                    pName = TAGS_NAME;
+                    break;
+                case SHARED_FOLDER:
+                    pName = SHARED_FOLDER_NAME;
+                    break;
+                default:
+                    pName = name;
             }
             return pName;
         };
@@ -2561,7 +2700,9 @@ define([
 
         // Create the title block with the "parent folder" button
         var createTitle = function ($container, path, noStyle) {
-            if (!path || path.length === 0) { return; }
+            if (!path || path.length === 0) {
+                return;
+            }
             var isTrash = manager.isPathIn(path, [TRASH]);
             // we assume that users viewing shared folders may want to see the "bread-crumb"
             if (!APP.newSharedFolder && APP.mobile() && !noStyle) { // noStyle means title in search result
@@ -2569,7 +2710,7 @@ define([
             }
             var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
             var el = isVirtual ? undefined : manager.find(path);
-            path = path[0] === SEARCH ? path.slice(0,1) : path;
+            path = path[0] === SEARCH ? path.slice(0, 1) : path;
             var isInTrashRoot = manager.isInTrashRoot(path);
 
             var $outer = $('<div>', {'class': 'cp-app-drive-path'});
@@ -2579,9 +2720,16 @@ define([
 
             var skipNext = false; // When encountering a shared folder, skip a key in the path
             path.forEach(function (p, idx) {
-                if (isTrash && [2,3].indexOf(idx) !== -1) { return; }
-                if (skipNext) { skipNext = false; return; }
-                if (APP.newSharedFolder && priv.isEmbed && p === ROOT && !idx) { return; }
+                if (isTrash && [2, 3].indexOf(idx) !== -1) {
+                    return;
+                }
+                if (skipNext) {
+                    skipNext = false;
+                    return;
+                }
+                if (APP.newSharedFolder && priv.isEmbed && p === ROOT && !idx) {
+                    return;
+                }
                 var name = p;
 
                 if (manager.isFile(el) && isInTrashRoot && idx === 1) {
@@ -2590,11 +2738,11 @@ define([
 
                 // Check if the current element is a shared folder. If it is, get its
                 // name and skip the next itme in the path (it will be "root")
-                var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx+1));
+                var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx + 1));
 
                 // If we're in trash root, check if the "element" is a shared folder
                 if (isTrash && idx === 1) {
-                    currentEl = manager.find(path.slice(0, idx+3));
+                    currentEl = manager.find(path.slice(0, idx + 3));
                 }
 
                 // Name and skip next...
@@ -2611,7 +2759,9 @@ define([
                         $span.click(function (e) {
                             e.stopPropagation();
                             var sliceEnd = idx + 1;
-                            if (isTrash && idx === 1) { sliceEnd = 4; } // Make sure we don't show the index or 'element' and 'path'
+                            if (isTrash && idx === 1) {
+                                sliceEnd = 4;
+                            } // Make sure we don't show the index or 'element' and 'path'
                             APP.displayDirectory(path.slice(0, sliceEnd));
                         });
                     }
@@ -2621,8 +2771,9 @@ define([
                 $span.data("path", path.slice(0, idx + 1));
                 addDragAndDropHandlers($span, path.slice(0, idx), true, true);
 
-                if (idx === 0) { name = p === SHARED_FOLDER ? name : getPrettyName(p); }
-                else if (!(APP.newSharedFolder && priv.isEmbed && idx === 1)) {
+                if (idx === 0) {
+                    name = p === SHARED_FOLDER ? name : getPrettyName(p);
+                } else if (!(APP.newSharedFolder && priv.isEmbed && idx === 1)) {
                     var $span2 = $('<span>', {
                         'class': 'cp-app-drive-path-element cp-app-drive-path-separator'
                     }).text(' / ');
@@ -2640,9 +2791,10 @@ define([
         };
 
 
-
         var createInfoBox = function (path) {
-            if (APP.readOnly || $content.data('readOnlyFolder')) { return; }
+            if (APP.readOnly || $content.data('readOnlyFolder')) {
+                return;
+            }
             var $box = $('<div>', {'class': 'cp-app-drive-content-info-box'});
             var msg;
             switch (path[0]) {
@@ -2672,7 +2824,7 @@ define([
             if (history.isHistoryMode && history.sfId) {
                 // Shared folder history: always display the warning
                 var sfName = (manager.getSharedFolderData(history.sfId) || {}).title || Messages.fm_sharedFolderName;
-                msg = Messages._getKey('fm_info_sharedFolderHistory', [sfName]);
+                msg = Messages._getKey('fm_info_sharedFolderHistory', [sfName]);
                 return $(common.fixLinks($box.html(msg)));
             }
             if (!APP.loggedIn) {
@@ -2706,15 +2858,15 @@ define([
 
         var getOppositeViewMode = function (viewMode) {
             viewMode = viewMode || getViewMode();
-            var newViewMode = viewMode === 'grid'? 'list': 'grid';
+            var newViewMode = viewMode === 'grid' ? 'list' : 'grid';
             return newViewMode;
         };
 
         // Create the button allowing the user to switch from list to icons modes
         var createViewModeButton = function ($container) {
             var viewMode = getViewMode();
-            var gridIcon = h('i.fa.fa-th-large', { title: Messages.fm_viewGridButton });
-            var listIcon = h('i.fa.fa-list', { title: Messages.fm_viewListButton });
+            var gridIcon = h('i.fa.fa-th-large', {title: Messages.fm_viewGridButton});
+            var listIcon = h('i.fa.fa-list', {title: Messages.fm_viewListButton});
 
             var $button = $(h('button.cp-app-drive-viewmode-button', [
                 gridIcon,
@@ -2762,7 +2914,8 @@ define([
             var buttons = [{
                 className: 'cancel',
                 name: Messages.cancelButton,
-                onClick: function () {},
+                onClick: function () {
+                },
                 keys: [27]
             }];
             if (hasOwned) {
@@ -2793,7 +2946,7 @@ define([
         };
         var createEmptyTrashButton = function () {
             var button = h('button.btn.btn-danger', [
-                h('i.fa.'+faTrash),
+                h('i.fa.' + faTrash),
                 h('span', Messages.fc_empty)
             ]);
             $(button).click(function () {
@@ -2811,7 +2964,7 @@ define([
             var content = h('div', [
                 h('h4', Messages.sharedFolders_create),
                 h('label', {for: 'cp-app-drive-sf-name'}, Messages.sharedFolders_create_name),
-                h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder,tabindex:'1'}),
+                h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder, tabindex: '1'}),
                 h('label', {for: 'cp-app-drive-sf-password'}, Messages.fm_shareFolderPassword),
                 UI.passwordInput({id: 'cp-app-drive-sf-password'}),
                 h('span', {
@@ -2829,7 +2982,9 @@ define([
             });
 
             UI.confirm(content, function (yes) {
-                if (!yes) { return void cb(); }
+                if (!yes) {
+                    return void cb();
+                }
 
                 // Get the values
                 var newName = $(content).find('#cp-app-drive-sf-name').val();
@@ -2881,9 +3036,18 @@ define([
             ]);
             var content = h('p', [
                 h('label', {for: 'cp-app-drive-link-name'}, Messages.fm_link_name),
-                name = h('input#cp-app-drive-link-name', { autocomplete: 'off', placeholder: Messages.fm_link_name_placeholder, tabindex:'1'}),
+                name = h('input#cp-app-drive-link-name', {
+                    autocomplete: 'off',
+                    placeholder: Messages.fm_link_name_placeholder,
+                    tabindex: '1'
+                }),
                 h('label', {for: 'cp-app-drive-link-url'}, Messages.fm_link_url),
-                url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off', placeholder: Messages.form_input_ph_url,tabindex:'1'}),
+                url = h('input#cp-app-drive-link-url', {
+                    type: 'url',
+                    autocomplete: 'off',
+                    placeholder: Messages.form_input_ph_url,
+                    tabindex: '1'
+                }),
                 warning,
             ]);
 
@@ -2911,7 +3075,8 @@ define([
             var buttons = [{
                 className: 'cancel',
                 name: Messages.cancelButton,
-                onClick: function () {},
+                onClick: function () {
+                },
                 keys: [27]
             }];
             buttons.push({
@@ -2923,7 +3088,9 @@ define([
                     var $name = $(name);
                     var n = $name.val().trim() || $name.attr('placeholder');
                     var u = $url.val().trim();
-                    if (!n || !u) { return true; }
+                    if (!n || !u) {
+                        return true;
+                    }
                     if (!Util.isValidURL(u)) {
                         UI.warn(Messages.fm_link_invalid);
                         return true;
@@ -2968,7 +3135,9 @@ define([
                             if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                                 event.preventDefault();
                                 addSharedFolderModal(function (obj) {
-                                    if (!obj) { return; }
+                                    if (!obj) {
+                                        return;
+                                    }
                                     manager.addSharedFolder(currentPath, obj, refresh);
                                 });
                             }
@@ -2998,8 +3167,7 @@ define([
             }
             $block.find('a.cp-app-drive-new-doc, li.cp-app-drive-new-doc')
                 .on('click auxclick keypress', function (event) {
-                    if (event.type === 'click' || event.type === 'auxclick' || (event.type === 'keypress' && event.which === 13))
-                    {
+                    if (event.type === 'click' || event.type === 'auxclick' || (event.type === 'keypress' && event.which === 13)) {
                         event.preventDefault();
                         var type = $(this).attr('data-type') || 'pad';
                         var path = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
@@ -3022,7 +3190,7 @@ define([
                         name: Messages.fm_sharedFolder,
                     });
                 }
-                options.push({ separator: true });
+                options.push({separator: true});
                 options.push({
                     class: 'cp-app-drive-new-fileupload',
                     icon: getIcon('fileupload')[0],
@@ -3035,13 +3203,13 @@ define([
                         name: Messages.uploadFolderButton,
                     });
                 }
-                options.push({ separator: true });
+                options.push({separator: true});
                 options.push({
                     class: 'cp-app-drive-new-link',
                     icon: getIcon('link')[0],
                     name: Messages.fm_link_new,
                 });
-                options.push({ separator: true });
+                options.push({separator: true});
             }
             getNewPadTypes().forEach(function (type) {
                 var typeClass = 'cp-app-drive-new-doc';
@@ -3064,7 +3232,9 @@ define([
             if (APP.store[FILTER_BY]) {
                 var typeFilter = APP.store[FILTER_BY];
                 options = options.filter((obj) => {
-                    if (obj.separator) { return false; }
+                    if (obj.separator) {
+                        return false;
+                    }
 
                     if (typeFilter === 'link') {
                         return obj.class.includes('cp-app-drive-new-link');
@@ -3081,18 +3251,26 @@ define([
             return options;
         };
         var createNewButton = function (isInRoot, $container) {
-            if (!APP.editable) { return; }
-            if (!APP.loggedIn) { return; } // Anonymous users can use the + menu in the toolbar
+            if (!APP.editable) {
+                return;
+            }
+            if (!APP.loggedIn) {
+                return;
+            } // Anonymous users can use the + menu in the toolbar
 
-            if (!manager.isPathIn(currentPath, [ROOT, 'hrefArray'])) { return; }
+            if (!manager.isPathIn(currentPath, [ROOT, 'hrefArray'])) {
+                return;
+            }
 
             // Create dropdown
             var options = getNewPadOptions(isInRoot).map(function (obj) {
-                if (obj.separator) { return { tag: 'hr' }; }
+                if (obj.separator) {
+                    return {tag: 'hr'};
+                }
                 var newObj = {
                     tag: 'a',
-                    attributes: { 'class': obj.class, href:'#' },
-                    content: [ obj.icon, obj.name ]
+                    attributes: {'class': obj.class, href: '#'},
+                    content: [obj.icon, obj.name]
                 };
                 if (obj.type) {
                     newObj.attributes['data-type'] = obj.type;
@@ -3114,9 +3292,9 @@ define([
 
             // Custom style:
             $block.find('button').addClass('cp-app-drive-toolbar-new');
-            $block.find('button').attr('aria-haspopup','menu');
+            $block.find('button').attr('aria-haspopup', 'menu');
             $block.find('button').attr('aria-expanded', 'false');
-            $block.find('button').click(function() {
+            $block.find('button').click(function () {
                 if ($block.find('button').attr('aria-expanded') === 'true') {
                     $block.find('button').attr('aria-expanded', 'false');
                 } else {
@@ -3130,7 +3308,9 @@ define([
         };
 
         var createFilterButton = function (isTemplate, $container) {
-            if (!APP.loggedIn) { return; }
+            if (!APP.loggedIn) {
+                return;
+            }
 
             // Create dropdown
             var options = [];
@@ -3219,9 +3399,9 @@ define([
             }
             var $block = UIElements.createDropdown(dropdownConfig);
 
-            $block.find('button').attr('aria-haspopup','menu');
+            $block.find('button').attr('aria-haspopup', 'menu');
             $block.find('button').attr('aria-expanded', 'false');
-            $block.find('button').click(function() {
+            $block.find('button').click(function () {
                 if ($block.find('button').attr('aria-expanded') === 'true') {
                     $block.find('button').attr('aria-expanded', 'false');
                 } else {
@@ -3237,17 +3417,17 @@ define([
             // Add handlers
             if (APP.store[FILTER_BY]) {
                 $block.find('a.cp-app-drive-rm-filter')
-                .click(function () {
-                    APP.store[FILTER_BY] = undefined;
-                    APP.displayDirectory(currentPath);
-                });
+                    .click(function () {
+                        APP.store[FILTER_BY] = undefined;
+                        APP.displayDirectory(currentPath);
+                    });
             }
             $block.find('a.cp-app-drive-filter-doc')
-            .click(function () {
-                var type = $(this).attr('data-type') || 'invalid-filter';
-                APP.store[FILTER_BY] = type;
-                APP.displayDirectory([FILTER, type, currentPath]);
-            });
+                .click(function () {
+                    var type = $(this).attr('data-type') || 'invalid-filter';
+                    APP.store[FILTER_BY] = type;
+                    APP.displayDirectory([FILTER, type, currentPath]);
+                });
 
             $container.append($block);
         };
@@ -3257,10 +3437,10 @@ define([
         var SORT_FILE_DESC = 'sortFilesDesc';
 
         var getSortFileDesc = function () {
-            return APP.store[SORT_FILE_DESC]+"" === "true";
+            return APP.store[SORT_FILE_DESC] + "" === "true";
         };
         var getSortFolderDesc = function () {
-            return APP.store[SORT_FOLDER_DESC]+"" === "true";
+            return APP.store[SORT_FOLDER_DESC] + "" === "true";
         };
 
         var onSortByClick = function () {
@@ -3284,11 +3464,12 @@ define([
                 }
             } else {
                 ['cp-app-drive-element-type',
-                 'cp-app-drive-element-atime', 'cp-app-drive-element-ctime'].some(function (c) {
+                    'cp-app-drive-element-atime', 'cp-app-drive-element-ctime'].some(function (c) {
                     if ($span.hasClass(c)) {
                         var nValue = c.replace(/cp-app-drive-element-/, '');
-                        if (value === nValue) { descValue = descValue ? false : true; }
-                        else {
+                        if (value === nValue) {
+                            descValue = descValue ? false : true;
+                        } else {
                             // atime and ctime should be ordered in a desc order at the first click
                             value = nValue;
                             descValue = value !== 'title';
@@ -3309,7 +3490,7 @@ define([
             if (getSortFolderDesc()) {
                 $icon = $sortDescIcon.clone();
             }
-            if (typeof(APP.store[SORT_FOLDER_DESC]) !== "undefined") {
+            if (typeof (APP.store[SORT_FOLDER_DESC]) !== "undefined") {
                 $list.find('.cp-app-drive-sort-foldername').addClass('cp-app-drive-sort-active').prepend($icon);
             }
         };
@@ -3322,14 +3503,14 @@ define([
                     h('i.fa.fa-minus'),
                     Messages.fm_type,
                 ],
-            },{
+            }, {
                 tag: 'a',
                 attributes: {'class': 'cp-app-drive-element-atime'},
                 content: [
                     h('i.fa.fa-minus'),
                     Messages.fm_lastAccess,
                 ],
-            },{
+            }, {
                 tag: 'a',
                 attributes: {'class': 'cp-app-drive-element-ctime'},
                 content: [
@@ -3355,7 +3536,8 @@ define([
                 'class': 'cp-app-drive-element-header cp-app-drive-element-list'
             });
             var clickCls = clickable ? 'cp-app-drive-sort-clickable ' : '';
-            var onClick = clickable ? onSortByClick : function () {};
+            var onClick = clickable ? onSortByClick : function () {
+            };
             //var $fohElement = $('<span>', {'class': 'element'}).appendTo($folderHeader);
             var $fhIcon = $('<span>', {'class': 'cp-app-drive-content-icon'});
             var $name = $('<span>', {
@@ -3376,8 +3558,10 @@ define([
                 'class': 'cp-app-drive-element-filler cp-app-drive-element-list'
             });
             $fohElement.append($fhIcon).append($name).append($state)
-                        .append($subfolders).append($files).append($filler);
-            if (clickable) { addFolderSortIcon($fohElement); }
+                .append($subfolders).append($files).append($filler);
+            if (clickable) {
+                addFolderSortIcon($fohElement);
+            }
             return $fohElement;
         };
         var addFileSortIcon = function ($list) {
@@ -3386,8 +3570,11 @@ define([
                 $icon = $sortDescIcon.clone();
             }
             var classSorted;
-            if (APP.store[SORT_FILE_BY] === '') { classSorted = 'cp-app-drive-sort-filename'; }
-            else if (APP.store[SORT_FILE_BY]) { classSorted = 'cp-app-drive-element-' + APP.store[SORT_FILE_BY]; }
+            if (APP.store[SORT_FILE_BY] === '') {
+                classSorted = 'cp-app-drive-sort-filename';
+            } else if (APP.store[SORT_FILE_BY]) {
+                classSorted = 'cp-app-drive-element-' + APP.store[SORT_FILE_BY];
+            }
             if (classSorted) {
                 $list.find('.' + classSorted).addClass('cp-app-drive-sort-active').prepend($icon).find('i').hide();
             }
@@ -3397,7 +3584,8 @@ define([
                 'class': 'cp-app-drive-element-header cp-app-drive-element-list'
             });
             var clickCls = clickable ? 'cp-app-drive-sort-clickable ' : '';
-            var onClick = clickable ? onSortByClick : function () {};
+            var onClick = clickable ? onSortByClick : function () {
+            };
             //var $fihElement = $('<span>', {'class': 'element'}).appendTo($fileHeader);
             var $fhIcon = $('<span>', {'class': 'cp-app-drive-content-icon'});
             var $fhName = $('<span>', {
@@ -3418,7 +3606,9 @@ define([
             // If displayTitle is false, it means the "name" is the title, so do not display the "name" header
             $fihElement.append($fhIcon).append($fhName).append($fhSort).append($fhState).append($fhType);
             $fihElement.append($fhAdate).append($fhCdate);
-            if (clickable) { addFileSortIcon($fihElement); }
+            if (clickable) {
+                addFileSortIcon($fihElement);
+            }
             return $fihElement;
         };
 
@@ -3432,7 +3622,9 @@ define([
             var keys = oldkeys.filter(function (e) {
                 return useId ? test(e) : (path && test(root[e]));
             });
-            if (keys.length < 2) { return keys; }
+            if (keys.length < 2) {
+                return keys;
+            }
             var mult = asc ? 1 : -1;
             var getProp = function (_el) {
                 var el = useId ? _el : root[_el];
@@ -3445,29 +3637,35 @@ define([
                     return String((el && el.key) || _el).toLowerCase();
                 }
                 var data = manager.getFileData(el);
-                if (!data) { return ''; }
+                if (!data) {
+                    return '';
+                }
                 if (prop === 'type') {
                     var hrefData = Hash.parsePadUrl(data.href || data.roHref);
                     return hrefData.type;
                 }
                 if (prop === 'atime' || prop === 'ctime') {
-                    return typeof(data[prop]) === "number" ? data[prop] : new Date(data[prop]);
+                    return typeof (data[prop]) === "number" ? data[prop] : new Date(data[prop]);
                 }
                 return (manager.getTitle(el) || "").toLowerCase();
             };
             var props = {};
             keys.forEach(function (k) {
                 var uid = k;
-                if (typeof(k) === "object") {
+                if (typeof (k) === "object") {
                     uid = k.uid = Util.uid();
                 }
                 props[uid] = getProp(k);
             });
-            keys.sort(function(a, b) {
+            keys.sort(function (a, b) {
                 var _a = props[(a && a.uid) || a];
                 var _b = props[(b && b.uid) || b];
-                if (_a < _b) { return mult * -1; }
-                if (_b < _a) { return mult; }
+                if (_a < _b) {
+                    return mult * -1;
+                }
+                if (_b < _a) {
+                    return mult;
+                }
                 return 0;
             });
             return keys;
@@ -3477,7 +3675,9 @@ define([
             var keys = oldkeys.filter(function (e) {
                 return test(e.element);
             });
-            if (keys.length < 2) { return keys; }
+            if (keys.length < 2) {
+                return keys;
+            }
             var mult = asc ? 1 : -1;
             var getProp = function (el, prop) {
                 if (prop && !folder) {
@@ -3485,10 +3685,10 @@ define([
                     var e = manager.getFileData(element);
                     if (!e) {
                         e = {
-                            href : el,
-                            title : Messages.fm_noname,
-                            atime : 0,
-                            ctime : 0
+                            href: el,
+                            title: Messages.fm_noname,
+                            atime: 0,
+                            ctime: 0
                         };
                     }
                     if (prop === 'type') {
@@ -3501,9 +3701,13 @@ define([
                 }
                 return (el.name || "").toLowerCase();
             };
-            keys.sort(function(a, b) {
-                if (getProp(a, prop) < getProp(b, prop)) { return mult * -1; }
-                if (getProp(a, prop) > getProp(b, prop)) { return mult * 1; }
+            keys.sort(function (a, b) {
+                if (getProp(a, prop) < getProp(b, prop)) {
+                    return mult * -1;
+                }
+                if (getProp(a, prop) > getProp(b, prop)) {
+                    return mult * 1;
+                }
                 return 0;
             });
             return keys;
@@ -3519,7 +3723,9 @@ define([
                 .filter(function (e) {
                     var id = useId ? e : root[e];
                     var data = manager.getFileData(id);
-                    if (type === 'link') { return data.static; }
+                    if (type === 'link') {
+                        return data.static;
+                    }
                     var href = data.href || data.roHref;
                     return href ? (href.split('/')[1] === type) : true;
                     // if types are unreachable, display files to avoid misleading the user
@@ -3530,14 +3736,16 @@ define([
         var createNewPadIcons = function ($block, isInRoot) {
             var $container = $('<ul>');
             getNewPadOptions(isInRoot).forEach(function (obj) {
-                if (obj.separator) { return; }
+                if (obj.separator) {
+                    return;
+                }
 
                 var $element = $('<li>', {
                     'class': obj.class + ' cp-app-drive-element-row ' +
                         'cp-app-drive-element-grid',
-                        'tabindex': 1
+                    'tabindex': 1
                 }).prepend(obj.icon).appendTo($container);
-                $element.append($('<span>', { 'class': 'cp-app-drive-new-name' }).text(obj.name));
+                $element.append($('<span>', {'class': 'cp-app-drive-new-name'}).text(obj.name));
 
                 if (obj.type) {
                     $element.attr('data-type', obj.type);
@@ -3550,7 +3758,9 @@ define([
             return $container;
         };
         var createGhostIcon = function ($list) {
-            if (APP.$content.data('readOnlyFolder') || !APP.editable) { return; }
+            if (APP.$content.data('readOnlyFolder') || !APP.editable) {
+                return;
+            }
             var isInRoot = currentPath[0] === ROOT;
             var $element = $('<li>', {
                 'class': 'cp-app-drive-element-row cp-app-drive-new-ghost'
@@ -3563,13 +3773,15 @@ define([
                     $body: $('body')
                 });
                 var $modal = modal.$modal;
-                var $title = $(h('h3', [ h('i.fa.fa-plus'), ' ', Messages.fm_newButton ]));
+                var $title = $(h('h3', [h('i.fa.fa-plus'), ' ', Messages.fm_newButton]));
                 var $description = $('<p>').text(Messages.fm_newButtonTitle);
                 $modal.find('.cp-modal').append($title);
                 $modal.find('.cp-modal').append($description);
                 var $content = createNewPadIcons($modal, isInRoot);
                 $modal.find('.cp-modal').append($content);
-                window.setTimeout(function () { modal.show(); });
+                window.setTimeout(function () {
+                    modal.show();
+                });
                 addNewPadHandlers($modal, isInRoot);
             });
         };
@@ -3582,7 +3794,7 @@ define([
             }
         };
         var collapseTreeButton = function () {
-            APP.$collapseButton = APP.$collapseButton || common.createButton('', true, {
+            APP.$collapseButton = APP.$collapseButton || common.createButton('', true, {
                 text: Messages.drive_treeButton,
                 name: 'files',
                 icon: 'fa-hdd-o',
@@ -3609,7 +3821,9 @@ define([
                 APP.toolbar.$bottomR.append(APP.$burnThisDrive);
             }
             // this button is not useful for unregistered users who do not have a tree worth looking at
-            if (APP.loggedIn) { collapseTreeButton(); }
+            if (APP.loggedIn) {
+                collapseTreeButton();
+            }
             return $toolbar;
         };
 
@@ -3630,15 +3844,15 @@ define([
                 var file = manager.getFileData(id);
                 if (!file) {
                     //debug("Unsorted or template returns an element not present in filesData: ", href);
-                    file = { title: Messages.fm_noname };
+                    file = {title: Messages.fm_noname};
                     //return;
                 }
                 var idx = files[rootName].indexOf(id);
                 var $icon = getFileIcon(id);
                 var ro = manager.isReadOnlyFile(id);
                 // ro undefined mens it's an old hash which doesn't support read-only
-                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
-                                ro ? ' cp-app-drive-element-readonly' : '';
+                var roClass = typeof (ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                    ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-file cp-app-drive-element-row' + roClass,
                     draggable: draggable
@@ -3653,7 +3867,7 @@ define([
                     openFile(id);
                 });
                 addFileData(id, $element);
-                $element.click(function(e) {
+                $element.click(function (e) {
                     e.stopPropagation();
                     onElementClick(e, $element);
                 });
@@ -3685,7 +3899,7 @@ define([
                 var $icon = getFileIcon(id);
                 var ro = manager.isReadOnlyFile(id);
                 // ro undefined maens it's an old hash which doesn't support read-only
-                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                var roClass = typeof (ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
                     ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass
@@ -3696,7 +3910,7 @@ define([
                 addFileData(id, $element);
                 $element.data('path', [FILES_DATA, id]);
                 $element.data('element', id);
-                $element.click(function(e) {
+                $element.click(function (e) {
                     e.stopPropagation();
                     onElementClick(e, $element);
                 });
@@ -3719,7 +3933,9 @@ define([
                     return;
                 }
                 root[key].forEach(function (el, idx) {
-                    if (!manager.isFile(el.element) && !manager.isFolder(el.element)) { return; }
+                    if (!manager.isFile(el.element) && !manager.isFolder(el.element)) {
+                        return;
+                    }
                     var spath = [key, idx, 'element'];
                     filesList.push({
                         element: el.element,
@@ -3734,7 +3950,9 @@ define([
             var sortedFiles = sortTrashElements(false, filesList, APP.store[SORT_FILE_BY], !getSortFileDesc);
 
             if (typeFilter) {
-                var ids = sortedFiles.map(function (obj) { return obj.element; });
+                var ids = sortedFiles.map(function (obj) {
+                    return obj.element;
+                });
                 var idsFilter = filterPads(ids, typeFilter, false, true);
                 sortedFiles = sortedFiles.filter(function (obj) {
                     return (idsFilter.indexOf(obj.element) !== -1);
@@ -3748,12 +3966,16 @@ define([
                 $content.append($empty);
             }
 
-            if (!typeFilter && manager.hasSubfolder(root, true)) { $list.append($folderHeader); }
+            if (!typeFilter && manager.hasSubfolder(root, true)) {
+                $list.append($folderHeader);
+            }
             sortedFolders.forEach(function (f) {
                 var $element = createElement([TRASH], f.spath, root, true);
                 $list.append($element);
             });
-            if (manager.hasFile(root, true)) { $list.append($fileHeader); }
+            if (manager.hasFile(root, true)) {
+                $list.append($fileHeader);
+            }
             sortedFiles.forEach(function (f) {
                 var $element = createElement([TRASH], f.spath, root, false);
                 $list.append($element);
@@ -3783,7 +4005,9 @@ define([
                     return;
                 }
                 var currentValue = $input.val().trim();
-                if (search.to) { window.clearTimeout(search.to); }
+                if (search.to) {
+                    window.clearTimeout(search.to);
+                }
                 if (e.which === 13) {
                     spinner.spin();
                     var newLocation = [SEARCH, $input.val()];
@@ -3808,23 +4032,27 @@ define([
                     return;
                 }
 
-                if (currentValue.length < 2) { return; } // Don't autosearch 1 character
+                if (currentValue.length < 2) {
+                    return;
+                } // Don't autosearch 1 character
                 search.to = window.setTimeout(function () {
                     var newLocation = [SEARCH, $input.val()];
                     search.cursor = $input[0].selectionStart;
-                    if (currentValue === search.value) { return; }
+                    if (currentValue === search.value) {
+                        return;
+                    }
                     if (!manager.comparePath(newLocation, currentPath.slice())) {
                         searching = true;
                         APP.displayDirectory(newLocation);
                     }
                 }, 500);
-            }).on('click mousedown mouseup', function (e) {
+            }).on('click mousedown mouseup', function (e) {
                 e.stopPropagation();
             }).val(value || '').appendTo($div);
             $input[0].selectionStart = search.cursor || 0;
             $input[0].selectionEnd = search.cursor || 0;
 
-            var cancel = h('span.fa.fa-times.cp-app-drive-search-cancel', {title:Messages.cancel});
+            var cancel = h('span.fa.fa-times.cp-app-drive-search-cancel', {title: Messages.cancel});
             cancel.addEventListener('click', function () {
                 $input.val('');
                 search.cursor = 0;
@@ -3838,7 +4066,7 @@ define([
                 $input.focus();
             });
 
-            if (typeof(value) === "string" && value.trim()) {
+            if (typeof (value) === "string" && value.trim()) {
                 spinner.spin();
             } else {
                 searching = false;
@@ -3860,7 +4088,9 @@ define([
                     // if r.id === null, then it's a folder, not a file
                     r.paths.forEach(function (path) {
                         if (!r.inSharedFolder &&
-                            APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) { return; }
+                            APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) {
+                            return;
+                        }
                         var _path = path.slice();
                         var key = path.pop();
                         var root = manager.find(path);
@@ -3888,7 +4118,7 @@ define([
                     $element.off('contextmenu');
                     $element.contextmenu(openContextMenu('default'));
                     $element.data('context', 'default');
-                    if (folder) {
+                    if (folder) {
                         $element.find('.cp-app-drive-element-list').css({
                             visibility: 'hidden'
                         }).text('');
@@ -3904,12 +4134,16 @@ define([
 
                     $list.append($element);
                 };
-                if (_folders.length) { getFolderListHeader(true, true).appendTo($list); }
+                if (_folders.length) {
+                    getFolderListHeader(true, true).appendTo($list);
+                }
                 _folders.forEach(function (el) {
                     var obj = el;
                     addEl(obj, true);
                 });
-                if (_files.length) { getFileListHeader(true).appendTo($list); }
+                if (_files.length) {
+                    getFileListHeader(true).appendTo($list);
+                }
                 _files.forEach(function (el) {
                     var obj = sortable[el];
                     addEl(obj, false);
@@ -3926,18 +4160,20 @@ define([
 
             var now = new Date();
             var last1 = new Date(now);
-            last1.setDate(last1.getDate()-1);
+            last1.setDate(last1.getDate() - 1);
             var last7 = new Date(now);
-            last7.setDate(last7.getDate()-7);
+            last7.setDate(last7.getDate() - 7);
             var last28 = new Date(now);
-            last28.setDate(last28.getDate()-28);
+            last28.setDate(last28.getDate() - 28);
 
             var header7, header28, headerOld;
             var i = 0;
             var channels = [];
 
             if (typeFilter) {
-                var ids = filesList.map(function (arr) { return arr[0]; });
+                var ids = filesList.map(function (arr) {
+                    return arr[0];
+                });
                 var idsFilter = filterPads(ids, typeFilter, false, true);
                 filesList = filesList.filter(function (arr) {
                     return (idsFilter.indexOf(arr[0]) !== -1);
@@ -3950,19 +4186,29 @@ define([
             filesList.some(function (arr) {
                 var id = arr[0];
                 var file = arr[1];
-                if (!file || !file.atime) { return; }
+                if (!file || !file.atime) {
+                    return;
+                }
 
                 if (file.atime <= last28 && i >= limit) {
                     return true;
                 }
 
                 var paths = manager.findFile(id);
-                if (!paths.length) { return; }
+                if (!paths.length) {
+                    return;
+                }
                 var path = paths[0];
-                if (manager.isPathIn(path, [TRASH])) { return; }
+                if (manager.isPathIn(path, [TRASH])) {
+                    return;
+                }
 
-                if (!file.channel) { file.channel = id; }
-                if (channels.indexOf(file.channel) !== -1) { return; }
+                if (!file.channel) {
+                    file.channel = id;
+                }
+                if (channels.indexOf(file.channel) !== -1) {
+                    return;
+                }
                 channels.push(file.channel);
 
                 if (!header7 && file.atime < last1) {
@@ -4002,22 +4248,26 @@ define([
         // Owned pads category
         var displayOwned = function ($container) {
             var list = manager.getOwnedPads();
-            if (list.length === 0) { return; }
+            if (list.length === 0) {
+                return;
+            }
             var $fileHeader = getFileListHeader(true);
             $container.append($fileHeader);
             var sortedFiles = sortElements(false, false, list, APP.store[SORT_FILE_BY], !getSortFileDesc(), true);
             sortedFiles.forEach(function (id) {
                 var paths = manager.findFile(id);
-                if (!paths.length) { return; }
+                if (!paths.length) {
+                    return;
+                }
                 var path = paths[0];
                 var $icon = getFileIcon(id);
                 var ro = manager.isReadOnlyFile(id);
                 // ro undefined maens it's an old hash which doesn't support read-only
-                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                var roClass = typeof (ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
                     ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-notrash ' +
-                             'cp-app-drive-element-file cp-app-drive-element-row' + roClass
+                        'cp-app-drive-element-file cp-app-drive-element-row' + roClass
                 });
                 $element.prepend($icon).dblclick(function () {
                     openFile(id);
@@ -4025,7 +4275,7 @@ define([
                 addFileData(id, $element);
                 $element.data('path', path);
                 $element.data('element', id);
-                $element.click(function(e) {
+                $element.click(function (e) {
                     e.stopPropagation();
                     onElementClick(e, $element);
                 });
@@ -4038,7 +4288,9 @@ define([
         // Tags category
         var displayTags = function ($container) {
             var list = manager.getTagsList();
-            if (Object.keys(list).length === 0) { return; }
+            if (Object.keys(list).length === 0) {
+                return;
+            }
             var sortedTags = Object.keys(list);
             sortedTags.sort(function (a, b) {
                 return list[b] - list[a];
@@ -4050,7 +4302,7 @@ define([
                 ])
             ];
             sortedTags.forEach(function (tag) {
-                var tagLink = h('a', { href: '#' }, '#' + tag);
+                var tagLink = h('a', {href: '#'}, '#' + tag);
                 $(tagLink).click(function () {
                     if (displayedCategories.indexOf(SEARCH) !== -1) {
                         APP.displayDirectory([SEARCH, '#' + tag]);
@@ -4079,22 +4331,32 @@ define([
 
             var realPath = [ROOT, SHARED_FOLDER].concat(path);
 
-            if (manager.hasSubfolder(root)) { $list.append($folderHeader); }
+            if (manager.hasSubfolder(root)) {
+                $list.append($folderHeader);
+            }
             // display sub directories
             var keys = Object.keys(root);
             var sortedFolders = sortElements(true, realPath, keys, null, !getSortFolderDesc());
             var sortedFiles = sortElements(false, realPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
             sortedFolders.forEach(function (key) {
-                if (manager.isFile(root[key])) { return; }
+                if (manager.isFile(root[key])) {
+                    return;
+                }
                 var $element = createElement(realPath, key, root, true);
                 $element.appendTo($list);
             });
-            if (manager.hasFile(root)) { $list.append($fileHeader); }
+            if (manager.hasFile(root)) {
+                $list.append($fileHeader);
+            }
             // display files
             sortedFiles.forEach(function (key) {
-                if (manager.isFolder(root[key])) { return; }
+                if (manager.isFolder(root[key])) {
+                    return;
+                }
                 var $element = createElement(realPath, key, root, false);
-                if (!$element) { return; }
+                if (!$element) {
+                    return;
+                }
                 $element.appendTo($list);
             });
         };
@@ -4102,12 +4364,18 @@ define([
         // Display the selected directory into the content part (rightside)
         // NOTE: Elements in the trash are not using the same storage structure as the others
         var _displayDirectory = function (path, force) {
-            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
+            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) {
+                return;
+            }
 
             APP.hideMenu();
 
-            if (!APP.editable) { debug("Read-only mode"); }
-            if (!appStatus.isReady && !force) { return; }
+            if (!APP.editable) {
+                debug("Read-only mode");
+            }
+            if (!appStatus.isReady && !force) {
+                return;
+            }
 
             // Fix path obvious issues
             if (!path || path.length === 0) {
@@ -4138,7 +4406,9 @@ define([
             var typeFilter;
             var isFilter = path[0] === FILTER;
             if (isFilter) {
-                if (path.length < 3) { return; }
+                if (path.length < 3) {
+                    return;
+                }
                 typeFilter = path[1];
                 path = path[2];
                 currentPath = path;
@@ -4168,9 +4438,11 @@ define([
                 // ANON_SHARED_FOLDER
                 path.push(manager.user.userObject.ROOT);
                 root = manager.find(path);
-                if (!root) { return; }
+                if (!root) {
+                    return;
+                }
             }
-            if (!isVirtual && typeof(root) === "undefined") {
+            if (!isVirtual && typeof (root) === "undefined") {
                 log(Messages.fm_unknownFolderError);
                 debug("Unable to locate the selected directory: ", path);
                 if (path.length === 1 && path[0] === ROOT) {
@@ -4183,7 +4455,9 @@ define([
                 _displayDirectory(parentPath, true);
                 return;
             }
-            if (!isSearch) { delete APP.Search.oldLocation; }
+            if (!isSearch) {
+                delete APP.Search.oldLocation;
+            }
 
             // Display the tree and build the content
             APP.resetTree();
@@ -4192,7 +4466,9 @@ define([
 
             createToolbar(path);
 
-            if (!isSearch) { createTitle($content, path); }
+            if (!isSearch) {
+                createTitle($content, path);
+            }
             var $info = createInfoBox(path);
 
             var $dirContent = $('<div>', {id: FOLDER_CONTENT_ID});
@@ -4228,8 +4504,8 @@ define([
                 (function () {
                     // show 'READ-ONLY' when a guest only has view rights
                     if (/\/view\//.test(APP.anonSFHref)) {
-            // !common.getMetadataMgr().getPrivateData().canEdit
-            // would accomplish the same thing if this breaks
+                        // !common.getMetadataMgr().getPrivateData().canEdit
+                        // would accomplish the same thing if this breaks
                         $content.prepend($readOnly.clone());
                         return;
                     }
@@ -4284,7 +4560,7 @@ define([
                     $li.contextmenu();
                 });
             } else {
-                var $contextButtons = $('<span>', {'id' : 'cp-app-drive-toolbar-contextbuttons'});
+                var $contextButtons = $('<span>', {'id': 'cp-app-drive-toolbar-contextbuttons'});
                 $contextButtons.appendTo(APP.toolbar.$bottomR);
             }
             updateContextButton();
@@ -4310,31 +4586,47 @@ define([
                 // ANON_SHARED_FOLDER
                 displaySharedFolder($list);
             } else {
-                if (!inTrash) { $dirContent.contextmenu(openContextMenu('content')); }
-                if (!isFilter && manager.hasSubfolder(root)) { $list.append($folderHeader); }
+                if (!inTrash) {
+                    $dirContent.contextmenu(openContextMenu('content'));
+                }
+                if (!isFilter && manager.hasSubfolder(root)) {
+                    $list.append($folderHeader);
+                }
                 // display sub directories
                 var keys = Object.keys(root);
                 var sortedFolders = isFilter ? [] : sortElements(true, path, keys, null, !getSortFolderDesc());
                 var sortedFiles = sortElements(false, path, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
                 sortedFiles = isFilter ? filterPads(sortedFiles, typeFilter, path) : sortedFiles;
                 sortedFolders.forEach(function (key) {
-                    if (manager.isFile(root[key])) { return; }
+                    if (manager.isFile(root[key])) {
+                        return;
+                    }
                     var $element = createElement(path, key, root, true);
                     $element.appendTo($list);
                 });
-                if (manager.hasFile(root)) { $list.append($fileHeader); }
+                if (manager.hasFile(root)) {
+                    $list.append($fileHeader);
+                }
                 // display files
                 sortedFiles.forEach(function (key) {
-                    if (manager.isFolder(root[key])) { return; }
+                    if (manager.isFolder(root[key])) {
+                        return;
+                    }
                     var p = path.slice();
                     p.push(key);
-                    if (APP.hideDuplicateOwned && manager.isDuplicateOwned(p)) { return; }
+                    if (APP.hideDuplicateOwned && manager.isDuplicateOwned(p)) {
+                        return;
+                    }
                     var $element = createElement(path, key, root, false);
-                    if (!$element) { return; }
+                    if (!$element) {
+                        return;
+                    }
                     $element.appendTo($list);
                 });
 
-                if (!inTrash) { createGhostIcon($list); }
+                if (!inTrash) {
+                    createGhostIcon($list);
+                }
             }
             $content.append($info).append($dirContent);
 
@@ -4360,7 +4652,7 @@ define([
                 } else {
                     $content.scrollTop(s);
                 }
-            } else {
+            } else {
                 $content.scrollTop(s);
             }
 
@@ -4369,8 +4661,11 @@ define([
             appStatus.ready(true);
         };
         var displayDirectory = APP.displayDirectory = function (path, force, cb) {
-            cb = cb || function () {};
-            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
+            cb = cb || function () {
+            };
+            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) {
+                return;
+            }
             if (history.isHistoryMode) {
                 _displayDirectory(path, force);
                 return void cb();
@@ -4388,13 +4683,16 @@ define([
         };
 
         var createTreeElement = function (name, $icon, path, draggable, droppable, collapsable, active, isSharedFolder) {
-            var $name = $('<span>', { 'class': 'cp-app-drive-element' }).text(name);
+            var $name = $('<span>', {'class': 'cp-app-drive-element'}).text(name);
             $icon.css("color", isSharedFolder ? getFolderColor(path.slice(0, -1)) : getFolderColor(path));
             var $collapse;
             if (collapsable) {
                 $collapse = $expandIcon.clone().attr('tabindex', 0);
             }
-            var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row', 'tabindex': 0}).append($collapse).append($icon).append($name).on('click keypress', function (e) {
+            var $elementRow = $('<span>', {
+                'class': 'cp-app-drive-element-row',
+                'tabindex': 0
+            }).append($collapse).append($icon).append($name).on('click keypress', function (e) {
                 if (e.type === 'keypress' && e.which !== 13) {
                     return;
                 }
@@ -4417,10 +4715,12 @@ define([
                 _addOwnership($elementRow, $(), sfData);
             }
             var $element = $('<li>').append($elementRow);
-            if (draggable) { $elementRow.attr('draggable', true); }
+            if (draggable) {
+                $elementRow.attr('draggable', true);
+            }
             if (collapsable) {
                 $element.addClass('cp-app-drive-element-collapsed');
-                $collapse.on('click keypress', function(e) {
+                $collapse.on('click keypress', function (e) {
                     if (e.type === 'keypress' && e.which !== 13) {
                         return;
                     }
@@ -4444,7 +4744,7 @@ define([
                     }
                 });
                 if (LS.wasFolderOpened(path) ||
-                        (manager.isSubpath(currentPath, path) && path.length < currentPath.length)) {
+                    (manager.isSubpath(currentPath, path) && path.length < currentPath.length)) {
                     $collapse.click();
                 }
             }
@@ -4464,7 +4764,7 @@ define([
             var rootName = ROOT_NAME;
             if (APP.newSharedFolder && priv.isEmbed && isRoot) {
                 var newSFPaths = manager.findFile(Number(APP.newSharedFolder));
-                if (newSFPaths.length) {
+                if (newSFPaths.length) {
                     path = newSFPaths[0];
                     path.push(ROOT);
                     root = manager.find(path);
@@ -4473,7 +4773,9 @@ define([
             }
 
             // don't try to display what doesn't exist
-            if (!root) { return; }
+            if (!root) {
+                return;
+            }
 
             // Display the root element in the tree
             if (isRoot) {
@@ -4491,21 +4793,25 @@ define([
                 $('<ul>', {'class': 'cp-app-drive-tree-docs'})
                     .append($rootElement).appendTo($container);
                 $container = $rootElement;
-            } else if (manager.isFolderEmpty(root)) { return; }
+            } else if (manager.isFolderEmpty(root)) {
+                return;
+            }
 
             // Display root content
             var $list = $('<ul>').appendTo($container);
             var keys = Object.keys(root).sort(function (a, b) {
                 var newA = manager.isSharedFolder(root[a]) ?
-                            manager.getSharedFolderData(root[a]).title : a;
+                    manager.getSharedFolderData(root[a]).title : a;
                 var newB = manager.isSharedFolder(root[b]) ?
-                            manager.getSharedFolderData(root[b]).title : b;
+                    manager.getSharedFolderData(root[b]).title : b;
                 return newA < newB ? -1 :
-                        (newA === newB ? 0 : 1);
+                    (newA === newB ? 0 : 1);
             });
             keys.forEach(function (key) {
                 // Do not display files in the menu
-                if (!manager.isFolder(root[key])) { return; }
+                if (!manager.isFolder(root[key])) {
+                    return;
+                }
                 var newPath = path.slice();
                 newPath.push(key);
                 var isSharedFolder = manager.isSharedFolder(root[key]) && root[key];
@@ -4535,7 +4841,7 @@ define([
                 var f = folders[sfId];
                 var editable = !(f && f.readOnly);
                 var $element = createTreeElement(key, $icon.clone(), newPath, true, editable,
-                                                subfolder, isCurrentFolder, isSharedFolder);
+                    subfolder, isCurrentFolder, isSharedFolder);
                 $element.appendTo($list);
                 $element.find('>.cp-app-drive-element-row').contextmenu(openContextMenu('tree'));
                 if (isSharedFolder) {
@@ -4545,7 +4851,9 @@ define([
                 if (sfId && !editable) {
                     $element.attr('data-ro', true);
                 }
-                if (!subfolder) { return; }
+                if (!subfolder) {
+                    return;
+                }
                 createTree($element, newPath);
             });
         };
@@ -4556,8 +4864,8 @@ define([
             var $trashElement = createTreeElement(TRASH_NAME, $icon, [TRASH], false, true, false, isOpened);
             $trashElement.addClass('cp-app-drive-tree-root');
             $trashElement.find('>.cp-app-drive-element-row')
-                         .contextmenu(openContextMenu('trashtree'));
-            var $trashList = $('<ul>', { 'class': 'cp-app-drive-tree-category' })
+                .contextmenu(openContextMenu('trashtree'));
+            var $trashList = $('<ul>', {'class': 'cp-app-drive-tree-category'})
                 .append($trashElement);
             $container.append($trashList);
         };
@@ -4594,7 +4902,7 @@ define([
             var isOpened = manager.comparePath([cat], currentPath);
             var $element = createTreeElement(options.name, $icon, [cat], options.draggable, options.droppable, false, isOpened);
             $element.addClass('cp-app-drive-tree-root');
-            var $list = $('<ul>', { 'class': 'cp-app-drive-tree-category' }).append($element);
+            var $list = $('<ul>', {'class': 'cp-app-drive-tree-category'}).append($element);
             $container.append($list);
         };
 
@@ -4606,14 +4914,30 @@ define([
 
             var $div = $('<div>', {'class': 'cp-app-drive-tree-categories-container'})
                 .appendTo($tree);
-            if (displayedCategories.indexOf(SEARCH) !== -1) { createCategory($div, SEARCH); }
-            if (displayedCategories.indexOf(TAGS) !== -1) { createCategory($div, TAGS); }
-            if (displayedCategories.indexOf(RECENT) !== -1) { createCategory($div, RECENT); }
-            if (displayedCategories.indexOf(OWNED) !== -1) { createCategory($div, OWNED); }
-            if (displayedCategories.indexOf(ROOT) !== -1) { createTree($div, [ROOT]); }
-            if (displayedCategories.indexOf(TEMPLATE) !== -1) { createCategory($div, TEMPLATE); }
-            if (displayedCategories.indexOf(FILES_DATA) !== -1) { createCategory($div, FILES_DATA); }
-            if (displayedCategories.indexOf(TRASH) !== -1) { createTrash($div, [TRASH]); }
+            if (displayedCategories.indexOf(SEARCH) !== -1) {
+                createCategory($div, SEARCH);
+            }
+            if (displayedCategories.indexOf(TAGS) !== -1) {
+                createCategory($div, TAGS);
+            }
+            if (displayedCategories.indexOf(RECENT) !== -1) {
+                createCategory($div, RECENT);
+            }
+            if (displayedCategories.indexOf(OWNED) !== -1) {
+                createCategory($div, OWNED);
+            }
+            if (displayedCategories.indexOf(ROOT) !== -1) {
+                createTree($div, [ROOT]);
+            }
+            if (displayedCategories.indexOf(TEMPLATE) !== -1) {
+                createCategory($div, TEMPLATE);
+            }
+            if (displayedCategories.indexOf(FILES_DATA) !== -1) {
+                createCategory($div, FILES_DATA);
+            }
+            if (displayedCategories.indexOf(TRASH) !== -1) {
+                createTrash($div, [TRASH]);
+            }
 
             $tree.append(APP.$limit);
             $categories = $tree.find('.cp-app-drive-tree-categories-container');
@@ -4632,12 +4956,16 @@ define([
         };
 
         var stringifyPath = function (path) {
-            if (!Array.isArray(path)) { return; }
+            if (!Array.isArray(path)) {
+                return;
+            }
             var div = h('div');
             var space = 10;
             path.forEach(function (s, i) {
-                if (i === 0) { s = getPrettyName(s); }
-                div.appendChild(h('span', { style: 'margin: 0 0 0 ' + i * space + 'px', }, s));
+                if (i === 0) {
+                    s = getPrettyName(s);
+                }
+                div.appendChild(h('span', {style: 'margin: 0 0 0 ' + i * space + 'px',}, s));
                 div.appendChild(h(('br')));
             });
             return div;
@@ -4645,7 +4973,9 @@ define([
 
         // Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs
         var onWindowClick = function (e) {
-            if (!e.target || !$(e.target).parents('.cp-dropdown-content').length) { return; }
+            if (!e.target || !$(e.target).parents('.cp-dropdown-content').length) {
+                return;
+            }
             if (e.which !== 1) {
                 e.stopPropagation();
                 return false;
@@ -4663,7 +4993,9 @@ define([
             } else {
                 data = JSON.parse(JSON.stringify(manager.getFileData(el)));
             }
-            if (!data || !(data.href || data.roHref)) { return void cb('INVALID_FILE'); }
+            if (!data || !(data.href || data.roHref)) {
+                return void cb('INVALID_FILE');
+            }
 
             var opts = {};
             opts.href = Hash.getRelativeHref(data.href || data.roHref);
@@ -4671,7 +5003,9 @@ define([
 
             if (manager.isSharedFolder(el)) {
                 var ro = folders[el] && folders[el].version >= 2;
-                if (!ro) { opts.noReadOnly = true; }
+                if (!ro) {
+                    opts.noReadOnly = true;
+                }
             }
             Properties.getPropertiesModal(common, opts, cb);
         };
@@ -4685,7 +5019,9 @@ define([
             } else {
                 data = JSON.parse(JSON.stringify(manager.getFileData(el)));
             }
-            if (!data || !(data.href || data.roHref)) { return void cb('INVALID_FILE'); }
+            if (!data || !(data.href || data.roHref)) {
+                return void cb('INVALID_FILE');
+            }
 
             var opts = {};
             opts.href = Hash.getRelativeHref(data.href || data.roHref);
@@ -4707,13 +5043,17 @@ define([
         var deleteOwnedPaths = function (paths, pathsList) {
             pathsList = pathsList || [];
             if (paths) {
-                paths.forEach(function (p) { pathsList.push(p.path); });
+                paths.forEach(function (p) {
+                    pathsList.push(p.path);
+                });
             }
             var msgD = pathsList.length === 1 ? Messages.fm_deleteOwnedPad :
-                                                Messages.fm_deleteOwnedPads;
-            UI.confirm(msgD, function(res) {
+                Messages.fm_deleteOwnedPads;
+            UI.confirm(msgD, function (res) {
                 $(window).focus();
-                if (!res) { return; }
+                if (!res) {
+                    return;
+                }
                 manager.deleteOwned(pathsList, function () {
                     pathsList.forEach(LS.removeFoldersOpened);
                     removeSelected();
@@ -4756,7 +5096,9 @@ define([
             var p = paths[0];
             var el = manager.find(p.path);
             var path = currentPath;
-            if (path[0] !== ROOT) { path = [ROOT]; }
+            if (path[0] !== ROOT) {
+                path = [ROOT];
+            }
             var _metadata = manager.getFileData(el);
             var _simpleData = {
                 title: _metadata.filename || _metadata.title,
@@ -4768,447 +5110,486 @@ define([
             openIn(app, path, APP.team, _simpleData);
         };
 
-        var addContextEvent = function () { $contextMenu.on("click", "a", function(e) {
-            e.stopPropagation();
-            var paths = $contextMenu.data('paths');
-            var pathsList = [];
-            var type = $contextMenu.attr('data-menu-type');
-            var $this = $(this);
+        var addContextEvent = function () {
+            $contextMenu.on("click", "a", function (e) {
+                e.stopPropagation();
+                var paths = $contextMenu.data('paths');
+                var pathsList = [];
+                var type = $contextMenu.attr('data-menu-type');
+                var $this = $(this);
 
-            var prefix = /cp\-app\-drive\-context\-/;
-            var command = Util.slice(this.classList)
-                .map(c => {
-                    if (!prefix.test(c)) { return; }
-                    return c.replace(prefix, '');
-                }).filter(Boolean);
-            console.log(command);
+                var prefix = /cp\-app\-drive\-context\-/;
+                var command = Util.slice(this.classList)
+                    .map(c => {
+                        if (!prefix.test(c)) {
+                            return;
+                        }
+                        return c.replace(prefix, '');
+                    }).filter(Boolean);
+                console.log(command);
 
-            var el, data;
-            if (paths.length === 0) {
-                log(Messages.fm_forbidden);
-                debug("Context menu on a forbidden or unexisting element. ", paths);
-                return;
-            }
-
-            if ($this.hasClass("cp-app-drive-context-rename")) {
-                if (paths.length !== 1) { return; }
-                displayRenameInput(paths[0].element, paths[0].path);
-            }
-            else if ($this.hasClass("cp-app-drive-context-color")) {
-                var currentColor = getFolderColor(paths[0].path);
-                pickFolderColor(paths[0].element, currentColor, function (color) {
-                    paths.forEach(function (p) {
-                        setFolderColor(p.element, p.path, color);
-                    });
-                    refresh();
-                });
-            }
-            else if($this.hasClass("cp-app-drive-context-delete")) {
-                if (!APP.loggedIn) {
-                    return void deletePaths(paths);
+                var el, data;
+                if (paths.length === 0) {
+                    log(Messages.fm_forbidden);
+                    debug("Context menu on a forbidden or unexisting element. ", paths);
+                    return;
                 }
-                paths.forEach(function (p) { pathsList.push(p.path); });
-                moveElements(pathsList, [TRASH], false, refresh);
-            }
-            else if ($this.hasClass('cp-app-drive-context-deleteowned')) {
-                deleteOwnedPaths(paths);
-            }
-            else if ($this.hasClass('cp-app-drive-context-preview')) {
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                openFile(el, null, false);
-            }
-            else if ($this.hasClass('cp-app-drive-context-open')) {
-                paths.forEach(function (p) {
-                    var el = manager.find(p.path);
-                    if (files.restrictedFolders[el]) {
-                        UI.warn(Messages.fm_restricted);
+
+                if ($this.hasClass("cp-app-drive-context-rename")) {
+                    if (paths.length !== 1) {
                         return;
                     }
-                    openFile(el, false, true);
-                });
-            }
-            else if ($this.hasClass('cp-app-drive-context-openro')) {
-                paths.forEach(function (p) {
-                    var el = manager.find(p.path);
+                    displayRenameInput(paths[0].element, paths[0].path);
+                } else if ($this.hasClass("cp-app-drive-context-color")) {
+                    var currentColor = getFolderColor(paths[0].path);
+                    pickFolderColor(paths[0].element, currentColor, function (color) {
+                        paths.forEach(function (p) {
+                            setFolderColor(p.element, p.path, color);
+                        });
+                        refresh();
+                    });
+                } else if ($this.hasClass("cp-app-drive-context-delete")) {
+                    if (!APP.loggedIn) {
+                        return void deletePaths(paths);
+                    }
+                    paths.forEach(function (p) {
+                        pathsList.push(p.path);
+                    });
+                    moveElements(pathsList, [TRASH], false, refresh);
+                } else if ($this.hasClass('cp-app-drive-context-deleteowned')) {
+                    deleteOwnedPaths(paths);
+                } else if ($this.hasClass('cp-app-drive-context-preview')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    el = manager.find(paths[0].path);
+                    openFile(el, null, false);
+                } else if ($this.hasClass('cp-app-drive-context-open')) {
+                    paths.forEach(function (p) {
+                        var el = manager.find(p.path);
+                        if (files.restrictedFolders[el]) {
+                            UI.warn(Messages.fm_restricted);
+                            return;
+                        }
+                        openFile(el, false, true);
+                    });
+                } else if ($this.hasClass('cp-app-drive-context-openro')) {
+                    paths.forEach(function (p) {
+                        var el = manager.find(p.path);
+                        if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+                            // ANON_SHARED_FOLDER
+                            el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+                        }
+                        if (manager.isPathIn(p.path, [FILES_DATA])) {
+                            el = p.path[1];
+                        } else {
+                            if (!el || manager.isFolder(el)) {
+                                return;
+                            }
+                        }
+                        openFile(el, true, true);
+                    });
+                } else if ($this.hasClass('cp-app-drive-context-makeacopy')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    el = manager.find(paths[0].path);
+                    (function () {
+                        var path = currentPath;
+                        if (path[0] !== ROOT) {
+                            path = [ROOT];
+                        }
+                        var _metadata = manager.getFileData(el);
+                        var _simpleData = {
+                            title: _metadata.filename || _metadata.title,
+                            href: _metadata.href || _metadata.roHref,
+                            password: _metadata.password,
+                            channel: _metadata.channel,
+                        };
+                        var parsed = Hash.parsePadUrl(_metadata.href || _metadata.roHref);
+                        openIn(parsed.type, path, APP.team, _simpleData);
+                    })();
+                } else if ($this.hasClass('cp-app-drive-context-openincode')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    openInApp(paths, 'code');
+                } else if ($this.hasClass('cp-app-drive-context-openinsheet')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    openInApp(paths, 'sheet');
+                } else if ($this.hasClass('cp-app-drive-context-openindoc')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    openInApp(paths, 'doc');
+                } else if ($this.hasClass('cp-app-drive-context-openinpresentation')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    openInApp(paths, 'presentation');
+                } else if ($this.hasClass('cp-app-drive-context-expandall') ||
+                    $this.hasClass('cp-app-drive-context-collapseall')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    var opened = $this.hasClass('cp-app-drive-context-expandall');
+                    var openRecursive = function (path) {
+                        LS.setFolderOpened(path, opened);
+                        var folderContent = manager.find(path);
+                        var subfolders = [];
+                        for (var k in folderContent) {
+                            if (manager.isFolder(folderContent[k])) {
+                                if (manager.isSharedFolder(folderContent[k])) {
+                                    subfolders.push([k].concat(manager.user.userObject.ROOT));
+                                } else {
+                                    subfolders.push(k);
+                                }
+                            }
+                        }
+                        subfolders.forEach(function (p) {
+                            var subPath = path.concat(p);
+                            openRecursive(subPath);
+                        });
+                    };
+                    openRecursive(paths[0].path);
+                    refresh();
+                } else if ($this.hasClass('cp-app-drive-context-download')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    var path = paths[0];
+                    el = manager.find(path.path);
+                    // folder
+                    if (manager.isFolder(el)) {
+                        // folder
+                        var name, folderEl;
+                        if (!manager.isSharedFolder(el)) {
+                            name = path.path[path.path.length - 1];
+                            folderEl = el;
+                            var sfId = manager.isInSharedFolder(path.path);
+                            downloadFolder(folderEl, name, sfId);
+                        }
+                        // shared folder
+                        else {
+                            data = manager.getSharedFolderData(el);
+                            name = data.title;
+                            folderEl = manager.find(path.path.concat("root"));
+                            downloadFolder(folderEl, name, el);
+                        }
+                    }
+                    // file
+                    else if (manager.isFile(el)) {
+                        // imported file
+                        if (path.element.is(".cp-border-color-file")) {
+                            data = manager.getFileData(el);
+                            APP.FM.downloadFile(data, function (err, obj) {
+                                console.log(err, obj);
+                                console.log('DONE');
+                            });
+                        }
+                        // pad
+                        else {
+                            data = manager.getFileData(el);
+                            APP.FM.downloadPad(data, function (err, obj) {
+                                console.log(err, obj);
+                                console.log('DONE');
+                            });
+                        }
+                    }
+                } else if ($this.hasClass('cp-app-drive-context-share')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    el = manager.find(paths[0].path);
+                    var parsed;
+                    var friends = common.getFriends();
+                    var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn;
+
+                    if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
+                        // disconnected
+                        if (!APP.editable) {
+                            return void UI.warn(Messages.error);
+                        }
+                        // if folder is inside SF
+                        else if (manager.isInSharedFolder(paths[0].path)) {
+                            return void UI.alert(Messages.convertFolderToSF_SFParent);
+                        }
+                        // if folder already contains SF
+                        else if (manager.hasSubSharedFolder(el)) {
+                            return void UI.alert(Messages.convertFolderToSF_SFChildren);
+                        }
+                        // if root
+                        else if (paths[0].path.length <= 1) {
+                            return void UI.warn(Messages.error);
+                        }
+                        // if folder does not contains SF
+
+                        else {
+                            var convertContent = h('div', [
+                                h('p', Messages.convertFolderToSF_confirm),
+                                h('label', {for: 'cp-upload-password'}, Messages.fm_shareFolderPassword),
+                                UI.passwordInput({
+                                    id: 'cp-upload-password',
+                                    placeholder: Messages.creation_passwordValue
+                                }),
+                                h('span', {
+                                    style: 'display:flex;align-items:center;justify-content:space-between'
+                                }, [
+                                    UI.createCheckbox('cp-upload-owned', Messages.sharedFolders_create_owned, true),
+                                    UI.createHelper(Pages.localizeDocsLink('https://docs.cryptpad.org/en/user_guide/share_and_access.html#owners'), Messages.creation_owned1)
+                                ]),
+                            ]);
+                            return void UI.confirm(convertContent, function (res) {
+                                if (!res) {
+                                    return;
+                                }
+                                var password = $(convertContent).find('#cp-upload-password').val() || undefined;
+                                var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
+                                manager.convertFolderToSharedFolder(paths[0].path, owned, password, function (err, obj) {
+                                    if (err || obj && obj.error) {
+                                        return void console.error(err || obj.error);
+                                    }
+                                    if (obj && obj.fId) {
+                                        APP.convertedFolder = obj.fId;
+                                    }
+                                    refresh();
+                                });
+                            });
+                        }
+                    } else { // File or shared folder
+                        var sf = !anonDrive && manager.isSharedFolder(el);
+                        if (anonDrive) {
+                            data = el;
+                        } else {
+                            data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
+                        }
+                        parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
+
+                        // Form: get auditor hash
+                        var auditorHash;
+                        if (parsed.hash && parsed.type === "form") {
+                            var formData = Hash.getFormData(null, parsed.hash, data.password);
+                            console.log(formData);
+                            if (formData) {
+                                auditorHash = formData.form_auditorHash;
+                            }
+                        }
+
+                        var roParsed = Hash.parsePadUrl(data.roHref);
+                        var padType = parsed.type || roParsed.type;
+                        var ro = !sf || (folders[el] && folders[el].version >= 2);
+                        var padData = {
+                            teamId: APP.team,
+                            origin: APP.origin,
+                            pathname: "/" + padType + "/",
+                            friends: friends,
+                            password: data.password,
+                            hashes: {
+                                editHash: parsed.hash,
+                                viewHash: ro && roParsed.hash,
+                                fileHash: parsed.hash
+                            },
+                            auditorHash: auditorHash,
+                            fileData: {
+                                hash: parsed.hash,
+                                password: data.password
+                            },
+                            isTemplate: paths[0].path[0] === 'template',
+                            title: data.title || data.name,
+                            sharedFolder: sf,
+                            static: data.static ? data.href : undefined,
+                            common: common
+                        };
+                        if (padType === 'file') {
+                            return void Share.getFileShareModal(common, padData, function (err) {
+                                if (err) {
+                                    UI.warn(Messages.error);
+                                }
+                            });
+                        }
+                        Share.getShareModal(common, padData, function (err) {
+                            if (err) {
+                                UI.warn(Messages.error);
+                            }
+                        });
+                    }
+                } else if ($this.hasClass('cp-app-drive-context-savelocal')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    el = manager.find(paths[0].path);
+                    if (manager.isFile(el)) {
+                        data = manager.getFileData(el);
+                    } else if (manager.isSharedFolder(el)) {
+                        data = manager.getSharedFolderData(el);
+                    }
+                    if (!data) {
+                        return;
+                    }
+                    if (data.static) {
+                        sframeChan.query("Q_DRIVE_USEROBJECT", {
+                            cmd: "addLink",
+                            teamId: -1,
+                            data: {
+                                name: data.name,
+                                href: data.href,
+                                path: ['root']
+                            }
+                        }, function () {
+                            UI.log(Messages.saved);
+                        });
+                        return;
+                    }
+                    sframeChan.query('Q_STORE_IN_TEAM', {
+                        href: data.href || data.rohref,
+                        password: data.password,
+                        path: paths[0].path[0] === 'template' ? ['template'] : undefined,
+                        title: data.title || '',
+                        teamId: -1
+                    }, function (err) {
+                        if (err) {
+                            return void console.error(err);
+                        }
+                    });
+                } else if ($this.hasClass('cp-app-drive-context-newfolder')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    var onFolderCreated = function (err, info) {
+                        if (err) {
+                            return void logError(err);
+                        }
+                        APP.newFolder = info.newPath;
+                        APP.displayDirectory(paths[0].path);
+                    };
+                    el = manager.find(paths[0].path);
+                    if (manager.isSharedFolder(el)) {
+                        paths[0].path.push(ROOT);
+                    }
+                    manager.addFolder(paths[0].path, null, onFolderCreated);
+                } else if ($this.hasClass('cp-app-drive-context-newsharedfolder')) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    addSharedFolderModal(function (obj) {
+                        if (!obj) {
+                            return;
+                        }
+                        manager.addSharedFolder(paths[0].path, obj, refresh);
+                    });
+                } else if ($this.hasClass("cp-app-drive-context-uploadfiles")) {
+                    showUploadFilesModal();
+                } else if ($this.hasClass("cp-app-drive-context-uploadfolder")) {
+                    showUploadFolderModal();
+                } else if ($this.hasClass("cp-app-drive-context-newdoc")) {
+                    var ntype = $this.data('type') || 'pad';
+                    if (ntype === 'link') {
+                        return void showLinkModal();
+                    }
+                    var path2 = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
+                    openIn(ntype, path2, APP.team);
+                } else if ($this.hasClass("cp-app-drive-context-properties")) {
+                    if (type === 'trash') {
+                        var pPath = paths[0].path;
+                        if (paths.length !== 1 || pPath.length !== 4) {
+                            return;
+                        }
+                        var element = manager.find(pPath.slice(0, 3)); // element containing the oldpath
+                        var sPath = stringifyPath(element.path);
+                        return void UI.alert(h('span', [
+                            h('strong', Messages.fm_originalPath),
+                            h('br'),
+                            sPath,
+                        ]));
+                    }
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    el = manager.find(paths[0].path);
                     if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
                         // ANON_SHARED_FOLDER
                         el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
                     }
-                    if (manager.isPathIn(p.path, [FILES_DATA])) {
-                        el = p.path[1];
-                    } else {
-                        if (!el || manager.isFolder(el)) { return; }
+                    APP.getProperties(el, function (e) {
+                        if (e) {
+                            UI.warn(Messages.error);
+                            return void logError(e, el);
+                        }
+                    });
+                } else if ($this.hasClass("cp-app-drive-context-access")) {
+                    if (paths.length !== 1) {
+                        return;
                     }
-                    openFile(el, true, true);
-                });
-            }
-            else if ($this.hasClass('cp-app-drive-context-makeacopy')) {
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                (function () {
-                    var path = currentPath;
-                    if (path[0] !== ROOT) { path = [ROOT]; }
-                    var _metadata = manager.getFileData(el);
-                    var _simpleData = {
-                        title: _metadata.filename || _metadata.title,
-                        href: _metadata.href || _metadata.roHref,
-                        password: _metadata.password,
-                        channel: _metadata.channel,
-                    };
-                    var parsed = Hash.parsePadUrl(_metadata.href || _metadata.roHref);
-                    openIn(parsed.type, path, APP.team, _simpleData);
-                })();
-            }
-            else if ($this.hasClass('cp-app-drive-context-openincode')) {
-                if (paths.length !== 1) { return; }
-                openInApp(paths, 'code');
-            }
-            else if ($this.hasClass('cp-app-drive-context-openinsheet')) {
-                if (paths.length !== 1) { return; }
-                openInApp(paths, 'sheet');
-            }
-            else if ($this.hasClass('cp-app-drive-context-openindoc')) {
-                if (paths.length !== 1) { return; }
-                openInApp(paths, 'doc');
-            }
-            else if ($this.hasClass('cp-app-drive-context-openinpresentation')) {
-                if (paths.length !== 1) { return; }
-                openInApp(paths, 'presentation');
-            }
-            else if ($this.hasClass('cp-app-drive-context-expandall') ||
-                     $this.hasClass('cp-app-drive-context-collapseall')) {
-                if (paths.length !== 1) { return; }
-                var opened = $this.hasClass('cp-app-drive-context-expandall');
-                var openRecursive = function (path) {
-                    LS.setFolderOpened(path, opened);
-                    var folderContent = manager.find(path);
-                    var subfolders = [];
-                    for (var k in folderContent) {
-                        if (manager.isFolder(folderContent[k])) {
-                            if (manager.isSharedFolder(folderContent[k])) {
-                                subfolders.push([k].concat(manager.user.userObject.ROOT));
-                            }
-                            else {
-                                subfolders.push(k);
-                            }
+                    el = manager.find(paths[0].path);
+                    if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+                        // ANON_SHARED_FOLDER
+                        el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+                    }
+                    APP.getAccess(el, function (e) {
+                        if (e) {
+                            UI.warn(Messages.error);
+                            return void logError(e);
+                        }
+                    });
+                } else if ($this.hasClass("cp-app-drive-context-hashtag")) {
+                    var hrefs = paths.map(function (p) {
+                        var el = manager.find(p.path);
+                        var data = manager.getFileData(el);
+                        return data.href || data.roHref;
+                    }).filter(Boolean);
+                    common.updateTags(hrefs);
+                } else if ($this.hasClass("cp-app-drive-context-empty")) {
+                    if (paths.length !== 1 || !paths[0].element
+                        || !manager.comparePath(paths[0].path, [TRASH])) {
+                        log(Messages.fm_forbidden);
+                        return;
+                    }
+                    emptyTrashModal();
+                } else if ($this.hasClass("cp-app-drive-context-remove")) {
+                    return void deletePaths(paths);
+                } else if ($this.hasClass("cp-app-drive-context-removesf")) {
+                    return void deletePaths(paths);
+                } else if ($this.hasClass("cp-app-drive-context-restore")) {
+                    if (paths.length !== 1) {
+                        return;
+                    }
+                    var restorePath = paths[0].path;
+                    var restoreName = paths[0].path[paths[0].path.length - 1];
+                    if (restorePath.length === 4) {
+                        var rEl = manager.find(restorePath);
+                        if (manager.isFile(rEl)) {
+                            restoreName = manager.getTitle(rEl);
+                        } else if (manager.isSharedFolder(rEl)) {
+                            var sfData = manager.getSharedFolderData(rEl);
+                            restoreName = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
+                        } else {
+                            restoreName = restorePath[1];
                         }
                     }
-                    subfolders.forEach(function (p) {
-                        var subPath = path.concat(p);
-                        openRecursive(subPath);
-                    });
-                };
-                openRecursive(paths[0].path);
-                refresh();
-            }
-
-            else if ($this.hasClass('cp-app-drive-context-download')) {
-                if (paths.length !== 1) { return; }
-                var path = paths[0];
-                el = manager.find(path.path);
-                // folder
-                if (manager.isFolder(el)) {
-                    // folder
-                    var name, folderEl;
-                    if (!manager.isSharedFolder(el)) {
-                        name = path.path[path.path.length - 1];
-                        folderEl = el;
-                        var sfId = manager.isInSharedFolder(path.path);
-                        downloadFolder(folderEl, name, sfId);
-                    }
-                    // shared folder
-                    else {
-                        data = manager.getSharedFolderData(el);
-                        name = data.title;
-                        folderEl = manager.find(path.path.concat("root"));
-                        downloadFolder(folderEl, name, el);
-                    }
-                }
-                // file
-                else if (manager.isFile(el)) {
-                    // imported file
-                    if (path.element.is(".cp-border-color-file")) {
-                        data = manager.getFileData(el);
-                        APP.FM.downloadFile(data, function (err, obj) {
-                            console.log(err, obj);
-                            console.log('DONE');
-                        });
-                    }
-                    // pad
-                    else {
-                        data = manager.getFileData(el);
-                        APP.FM.downloadPad(data, function (err, obj) {
-                            console.log(err, obj);
-                            console.log('DONE');
-                        });
-                    }
-                }
-            }
-            else if ($this.hasClass('cp-app-drive-context-share')) {
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                var parsed;
-                var friends = common.getFriends();
-                var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn;
-
-                if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
-                    // disconnected
-                    if (!APP.editable) {
-                        return void UI.warn(Messages.error);
-                    }
-                    // if folder is inside SF
-                    else if (manager.isInSharedFolder(paths[0].path)) {
-                        return void UI.alert(Messages.convertFolderToSF_SFParent);
-                    }
-                    // if folder already contains SF
-                    else if (manager.hasSubSharedFolder(el)) {
-                        return void UI.alert(Messages.convertFolderToSF_SFChildren);
-                    }
-                    // if root
-                    else if (paths[0].path.length <= 1) {
-                        return void UI.warn(Messages.error);
-                    }
-                    // if folder does not contains SF
-
-                    else {
-                        var convertContent = h('div', [
-                            h('p', Messages.convertFolderToSF_confirm),
-                            h('label', {for: 'cp-upload-password'}, Messages.fm_shareFolderPassword),
-                            UI.passwordInput({
-                                id: 'cp-upload-password',
-                                placeholder: Messages.creation_passwordValue
-                            }),
-                            h('span', {
-                                style: 'display:flex;align-items:center;justify-content:space-between'
-                            }, [
-                                UI.createCheckbox('cp-upload-owned', Messages.sharedFolders_create_owned, true),
-                                UI.createHelper(Pages.localizeDocsLink('https://docs.cryptpad.org/en/user_guide/share_and_access.html#owners'), Messages.creation_owned1)
-                            ]),
-                        ]);
-                        return void UI.confirm(convertContent, function(res) {
-                            if (!res) { return; }
-                            var password = $(convertContent).find('#cp-upload-password').val() || undefined;
-                            var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
-                            manager.convertFolderToSharedFolder(paths[0].path, owned, password, function (err, obj) {
-                                if (err || obj && obj.error) { return void console.error(err || obj.error); }
-                                if (obj && obj.fId) { APP.convertedFolder = obj.fId; }
-                                refresh();
-                            });
-                        });
-                    }
-                } else { // File or shared folder
-                    var sf = !anonDrive && manager.isSharedFolder(el);
-                    if (anonDrive) {
-                        data = el;
-                    } else {
-                        data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
-                    }
-                    parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
-
-                    // Form: get auditor hash
-                    var auditorHash;
-                    if (parsed.hash && parsed.type === "form") {
-                        var formData = Hash.getFormData(null, parsed.hash, data.password);
-                        console.log(formData);
-                        if (formData) {
-                            auditorHash = formData.form_auditorHash;
+                    UI.confirm(Messages._getKey("fm_restoreDialog", [restoreName]), function (res) {
+                        if (!res) {
+                            return;
                         }
-                    }
-
-                    var roParsed = Hash.parsePadUrl(data.roHref);
-                    var padType = parsed.type || roParsed.type;
-                    var ro = !sf || (folders[el] && folders[el].version >= 2);
-                    var padData = {
-                        teamId: APP.team,
-                        origin: APP.origin,
-                        pathname: "/" + padType + "/",
-                        friends: friends,
-                        password: data.password,
-                        hashes: {
-                            editHash: parsed.hash,
-                            viewHash: ro && roParsed.hash,
-                            fileHash: parsed.hash
-                        },
-                        auditorHash: auditorHash,
-                        fileData: {
-                            hash: parsed.hash,
-                            password: data.password
-                        },
-                        isTemplate: paths[0].path[0] === 'template',
-                        title: data.title || data.name,
-                        sharedFolder: sf,
-                        static: data.static ? data.href : undefined,
-                        common: common
-                    };
-                    if (padType === 'file') {
-                        return void Share.getFileShareModal(common, padData, function (err) {
-                            if (err) { UI.warn(Messages.error); }
-                        });
-                    }
-                    Share.getShareModal(common, padData, function (err) {
-                        if (err) { UI.warn(Messages.error); }
+                        manager.restore(restorePath, refresh);
                     });
-                }
-            }
-            else if ($this.hasClass('cp-app-drive-context-savelocal')) {
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                if (manager.isFile(el)) {
-                    data = manager.getFileData(el);
-                } else if (manager.isSharedFolder(el)) {
-                    data = manager.getSharedFolderData(el);
-                }
-                if (!data) { return; }
-                if (data.static) {
-                    sframeChan.query("Q_DRIVE_USEROBJECT", {
-                        cmd: "addLink",
-                        teamId: -1,
-                        data: {
-                            name: data.name,
-                            href: data.href,
-                            path: ['root']
-                        }
-                    }, function () {
-                        UI.log(Messages.saved);
-                    });
-                    return;
-                }
-                sframeChan.query('Q_STORE_IN_TEAM', {
-                    href: data.href || data.rohref,
-                    password: data.password,
-                    path: paths[0].path[0] === 'template' ? ['template'] : undefined,
-                    title: data.title || '',
-                    teamId: -1
-                }, function (err) {
-                    if (err) { return void console.error(err); }
-                });
-            }
-            else if ($this.hasClass('cp-app-drive-context-newfolder')) {
-                if (paths.length !== 1) { return; }
-                var onFolderCreated = function (err, info) {
-                    if (err) { return void logError(err); }
-                    APP.newFolder = info.newPath;
-                    APP.displayDirectory(paths[0].path);
-                };
-                el = manager.find(paths[0].path);
-                if (manager.isSharedFolder(el)) {
-                    paths[0].path.push(ROOT);
-                }
-                manager.addFolder(paths[0].path, null, onFolderCreated);
-            }
-            else if ($this.hasClass('cp-app-drive-context-newsharedfolder')) {
-                if (paths.length !== 1) { return; }
-                addSharedFolderModal(function (obj) {
-                    if (!obj) { return; }
-                    manager.addSharedFolder(paths[0].path, obj, refresh);
-                });
-            }
-            else if ($this.hasClass("cp-app-drive-context-uploadfiles")) {
-                showUploadFilesModal();
-            }
-            else if ($this.hasClass("cp-app-drive-context-uploadfolder")) {
-                showUploadFolderModal();
-            }
-            else if ($this.hasClass("cp-app-drive-context-newdoc")) {
-                var ntype = $this.data('type') || 'pad';
-                if (ntype === 'link') {
-                    return void showLinkModal();
-                }
-                var path2 = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
-                openIn(ntype, path2, APP.team);
-            }
-            else if ($this.hasClass("cp-app-drive-context-properties")) {
-                if (type === 'trash') {
-                    var pPath = paths[0].path;
-                    if (paths.length !== 1 || pPath.length !== 4) { return; }
-                    var element = manager.find(pPath.slice(0,3)); // element containing the oldpath
-                    var sPath = stringifyPath(element.path);
-                    return void UI.alert(h('span', [
-                        h('strong', Messages.fm_originalPath),
-                        h('br'),
-                        sPath,
-                    ]));
-                }
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
-                    // ANON_SHARED_FOLDER
-                    el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
-                }
-                APP.getProperties(el, function (e) {
-                    if (e) {
-                        UI.warn(Messages.error);
-                        return void logError(e, el);
+                } else if ($this.hasClass("cp-app-drive-context-openparent")) {
+                    if (paths.length !== 1) {
+                        return;
                     }
-                });
-            }
-            else if ($this.hasClass("cp-app-drive-context-access")) {
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
-                    // ANON_SHARED_FOLDER
-                    el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
-                }
-                APP.getAccess(el, function (e) {
-                    if (e) {
-                        UI.warn(Messages.error);
-                        return void logError(e);
-                    }
-                });
-            }
-            else if ($this.hasClass("cp-app-drive-context-hashtag")) {
-                var hrefs = paths.map(function (p) {
-                    var el = manager.find(p.path);
-                    var data =  manager.getFileData(el);
-                    return data.href || data.roHref;
-                }).filter(Boolean);
-                common.updateTags(hrefs);
-            }
-            else if ($this.hasClass("cp-app-drive-context-empty")) {
-                if (paths.length !== 1 || !paths[0].element
-                    || !manager.comparePath(paths[0].path, [TRASH])) {
-                    log(Messages.fm_forbidden);
-                    return;
-                }
-                emptyTrashModal();
-            }
-            else if ($this.hasClass("cp-app-drive-context-remove")) {
-                return void deletePaths(paths);
-            }
-            else if ($this.hasClass("cp-app-drive-context-removesf")) {
-                return void deletePaths(paths);
-            }
-            else if ($this.hasClass("cp-app-drive-context-restore")) {
-                if (paths.length !== 1) { return; }
-                var restorePath = paths[0].path;
-                var restoreName = paths[0].path[paths[0].path.length - 1];
-                if (restorePath.length === 4) {
-                    var rEl = manager.find(restorePath);
-                    if (manager.isFile(rEl)) {
-                        restoreName = manager.getTitle(rEl);
-                    } else if (manager.isSharedFolder(rEl)) {
-                        var sfData = manager.getSharedFolderData(rEl);
-                        restoreName = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
+                    var parentPath = paths[0].path.slice();
+                    if (manager.isInTrashRoot(parentPath)) {
+                        parentPath = [TRASH];
                     } else {
-                        restoreName = restorePath[1];
+                        parentPath.pop();
                     }
+                    APP.displayDirectory(parentPath);
+                    APP.selectedFiles = paths[0].path.slice(-1);
                 }
-                UI.confirm(Messages._getKey("fm_restoreDialog", [restoreName]), function(res) {
-                    if (!res) { return; }
-                    manager.restore(restorePath, refresh);
-                });
-            }
-            else if ($this.hasClass("cp-app-drive-context-openparent")) {
-                if (paths.length !== 1) { return; }
-                var parentPath = paths[0].path.slice();
-                if (manager.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
-                else { parentPath.pop(); }
-                APP.displayDirectory(parentPath);
-                APP.selectedFiles = paths[0].path.slice(-1);
-            }
-            APP.hideMenu();
-        }); };
+                APP.hideMenu();
+            });
+        };
 
         addContextEvent();
         metadataMgr.onChange(function () {
@@ -5231,12 +5612,18 @@ define([
             e.preventDefault();
         });
         $appContainer.on('mouseup', function (e) {
-            if (e.which !== 1) { return ; }
-            if ($(e.target).is(".dropdown-submenu a, .dropdown-submenu a span")) { return; } // if we click on dropdown-submenu, don't close menu
+            if (e.which !== 1) {
+                return;
+            }
+            if ($(e.target).is(".dropdown-submenu a, .dropdown-submenu a span")) {
+                return;
+            } // if we click on dropdown-submenu, don't close menu
             APP.hideMenu(e);
         });
         $appContainer.on('click', function (e) {
-            if (e.which !== 1) { return ; }
+            if (e.which !== 1) {
+                return;
+            }
             removeInput();
         });
         $appContainer.on('drag drop', function (e) {
@@ -5253,21 +5640,27 @@ define([
                     return; // We can't remove elements directly from filesData
                 }
                 var $selected = findSelectedElements();
-                if (!$selected.length) { return; }
+                if (!$selected.length) {
+                    return;
+                }
                 var paths = [];
                 var isTrash = manager.isPathIn(currentPath, [TRASH]);
                 $selected.each(function (idx, elmt) {
-                    if (!$(elmt).data('path')) { return; }
+                    if (!$(elmt).data('path')) {
+                        return;
+                    }
                     paths.push($(elmt).data('path'));
                 });
-                if (!paths.length) { return; }
+                if (!paths.length) {
+                    return;
+                }
 
                 // If we are in the trash or anon USER or if we are holding the "shift" key,
                 // delete permanently
                 // Or if we are in a shared folder
                 // Or if the selection is only shared folders
                 if (!APP.loggedIn || isTrash || manager.isInSharedFolder(currentPath)
-                        || e.shiftKey) {
+                    || e.shiftKey) {
                     deletePaths(null, paths);
                     return;
                 }
@@ -5282,7 +5675,7 @@ define([
         });
 
         var onRefresh = {
-            refresh: function() {
+            refresh: function () {
                 if (onRefresh.to) {
                     window.clearTimeout(onRefresh.to);
                 }
@@ -5291,7 +5684,9 @@ define([
         };
 
         var onEvDriveChange = sframeChan.on('EV_DRIVE_CHANGE', function (data) {
-            if (history.isHistoryMode) { return; }
+            if (history.isHistoryMode) {
+                return;
+            }
 
             var path = data.path.slice();
             var originalPath = data.path.slice();
@@ -5310,15 +5705,19 @@ define([
                 }
             }
 
-            if (path[0] !== 'drive') { return false; }
+            if (path[0] !== 'drive') {
+                return false;
+            }
             path = path.slice(1);
-            if (originalPath[0] === 'drive') { originalPath = originalPath.slice(1); }
+            if (originalPath[0] === 'drive') {
+                originalPath = originalPath.slice(1);
+            }
 
             var cPath = currentPath.slice();
             if (originalPath.length && originalPath[0] === FILES_DATA) {
                 onRefresh.refresh();
             } else if ((manager.isPathIn(cPath, ['hrefArray', TRASH]) && cPath[0] === path[0]) ||
-                    (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
+                (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
                 // Reload after a few ms to make sure all the change events have been received
                 onRefresh.refresh();
             } else {
@@ -5327,7 +5726,9 @@ define([
             return false;
         });
         var onEvDriveRemove = sframeChan.on('EV_DRIVE_REMOVE', function (data) {
-            if (history.isHistoryMode) { return; }
+            if (history.isHistoryMode) {
+                return;
+            }
 
             var path = data.path.slice();
 
@@ -5345,12 +5746,14 @@ define([
                 }
             }
 
-            if (path[0] !== 'drive') { return false; }
+            if (path[0] !== 'drive') {
+                return false;
+            }
             path = path.slice(1);
 
             var cPath = currentPath.slice();
             if ((manager.isPathIn(cPath, ['hrefArray', TRASH]) && cPath[0] === path[0]) ||
-                    (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
+                (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
                 // Reload after a few to make sure all the change events have been received
                 onRefresh.refresh();
             } else {
@@ -5370,7 +5773,8 @@ define([
             try {
                 onEvDriveChange.stop();
                 onEvDriveRemove.stop();
-            } catch (e) {}
+            } catch (e) {
+            }
         };
 
 
@@ -5395,7 +5799,7 @@ define([
             };
             history.onEnterHistory = function (obj) {
                 if (history.sfId) {
-                    if (!obj || typeof(obj) !== "object" || Object.keys(obj).length === 0) {
+                    if (!obj || typeof (obj) !== "object" || Object.keys(obj).length === 0) {
                         return;
                     }
                     manager.setHistoryMode(true);
@@ -5407,10 +5811,12 @@ define([
                 history.sfId = false;
 
                 var ok = manager.isValidDrive(obj.drive);
-                if (!ok) { return; }
+                if (!ok) {
+                    return;
+                }
                 manager.setHistoryMode(true);
 
-                var restricted  = files.restrictedFolders;
+                var restricted = files.restrictedFolders;
                 copyObjectValue(files, obj.drive);
                 files.restrictedFolders = restricted;
 
@@ -5458,7 +5864,7 @@ define([
             var content = [];
 
             var legacy = data.legacy; // Legacy mode: we don't know if the sf has been destroyed or its password has changed
-            var folderName = '<b>'+ (Util.fixHTML(data.lastTitle) || Messages.fm_newFolder) +'</b>';
+            var folderName = '<b>' + (Util.fixHTML(data.lastTitle) || Messages.fm_newFolder) + '</b>';
             var pwMsg = legacy ? Messages._getKey('drive_sfPassword', [folderName]) : Messages._getKey('dph_sf_pw', [folderName]);
             content.push(UI.setHTML(h('p'), pwMsg));
             var newPassword = UI.passwordInput({
@@ -5476,7 +5882,9 @@ define([
 
             var locked = false;
             $(passwordOk).click(function () {
-                if (locked) { return; }
+                if (locked) {
+                    return;
+                }
                 var pw = $(newPassword).find('.cp-password-input').val();
                 locked = true;
                 $(div).find('.alert').remove();
@@ -5497,13 +5905,15 @@ define([
                 className: 'primary',
                 name: Messages.forgetButton,
                 onClick: function () {
-                    manager.delete([['sharedFoldersTemp', fId]], function () { });
+                    manager.delete([['sharedFoldersTemp', fId]], function () {
+                    });
                 },
                 keys: []
             }, {
                 className: 'cancel',
                 name: Messages.later,
-                onClick: function () {},
+                onClick: function () {
+                },
                 keys: [27]
             }];
             return UI.dialog.customModal(div, {

From 8d243d18936f608e049e898faabb8e72c1a2d085 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 1 Nov 2023 19:37:14 +0200
Subject: [PATCH 48/87] added character search

---
 www/common/toolbar.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index a6f14acd9..6a05c54a3 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1106,6 +1106,18 @@ define([
             'aria-expanded': 'false',
             'aria-label': Messages.userAccountButton
         });
+        function findItems(search, current, items) {
+            const currentIndex = items.index(current);
+            for (let i = 1; i < items.length; i++) {
+                const nextIndex = (currentIndex + i) % items.length;
+                const nextItem = items.eq(nextIndex);
+                const text = nextItem.text().trim().toLowerCase();
+                if (text.startsWith(search)) {
+                    return nextItem;
+                }
+            }
+            return null;
+        }
         $userAdmin.find('> button').click(function () {
             if ($userAdmin.find('> button').attr('aria-expanded') === 'true') {
                 $userAdmin.find('> button').attr('aria-expanded', 'false');
@@ -1122,6 +1134,7 @@ define([
                         }).first();
                         firstVisibleItem.attr('tabindex', '0').focus();
                     }, 0);
+                    var searchCharacters = '';
                     $(document).on('keydown', function (e) {
                         if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
                             var items = dropdownActive.find('li:visible');
@@ -1136,12 +1149,14 @@ define([
                                         prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
                                     }
                                     prevItem.attr('tabindex', '0').focus();
+                                    searchCharacters = '';
                                 } else if (e.key === 'ArrowDown') {
                                     var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
                                     while (nextItem.find('hr').length > 0 || nextItem.hasClass('cp-user-menu-logo') || nextItem.hasClass('cp-toolbar-account')) {
                                         nextItem = nextItem.next().length ? nextItem.next() : items.first();
                                     }
                                     nextItem.attr('tabindex', '0').focus();
+                                    searchCharacters = '';
 
                                 }
                             } else if (e.key === 'Escape') {
@@ -1150,8 +1165,16 @@ define([
                                 $(document).off('keydown');
                                 $userAdmin.find('> button').attr('aria-expanded', 'false');
                                 $userAdmin.find('> button').focus();
+                                searchCharacters = '';
+                            } else if (e.key.match(/[a-zA-Z]/)) {
+                                searchCharacters += e.key.toLowerCase();
+                                nextItem = findItems(searchCharacters, focusedItem, items);
+                                if (nextItem) {
+                                    nextItem.attr('tabindex', '0').focus();
+                                }
                             }
                         }
+
                     });
                 }
             }

From 6889e1d2a89488ddd297e998ecb392cfeb301bd2 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 1 Nov 2023 23:30:33 +0200
Subject: [PATCH 49/87] can open menu item with space

---
 www/common/common-ui-elements.js | 2 +-
 www/common/toolbar.js            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 502fb1a59..c4388b66d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1684,7 +1684,7 @@ define([
 
                 $el.appendTo($innerblock);
                 $el.on('click keydown', function (e) {
-                    if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13)) {
+                    if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13) || (e.type === 'keydown' && e.keyCode === 32)) {
                         if (Array.isArray(o.content)) {
                             o.content.forEach(function (item) {
                                 if (typeof item === 'object') {
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 6a05c54a3..7dc6e3a46 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1174,7 +1174,6 @@ define([
                                 }
                             }
                         }
-
                     });
                 }
             }

From eb753301be1a05fd41a387d1ed56778d41a2edc9 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 1 Nov 2023 23:51:36 +0200
Subject: [PATCH 50/87] fixed bug encountered when changing page
 focus/visibility

---
 www/common/toolbar.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 7dc6e3a46..86b8a2421 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1135,6 +1135,16 @@ define([
                         firstVisibleItem.attr('tabindex', '0').focus();
                     }, 0);
                     var searchCharacters = '';
+                    document.addEventListener("visibilitychange", function () {
+                        if (document.hidden) {
+                            $userAdmin.find('> button').attr('aria-expanded', 'false');
+                        }
+                    });
+                    $(document).on('click', function (e) {
+                        if ( !$(e.target).closest(".cp-dropdown-content").length) {
+                            $userAdmin.find('> button').attr('aria-expanded', 'false');
+                        }
+                    });
                     $(document).on('keydown', function (e) {
                         if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
                             var items = dropdownActive.find('li:visible');

From d4d56dd5ed24a55534c9f73db3f6ff740bab2396 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 1 Nov 2023 23:54:14 +0200
Subject: [PATCH 51/87] focus set on menu button when changing tabs

---
 www/common/toolbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 86b8a2421..3d2f8c80c 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1138,6 +1138,7 @@ define([
                     document.addEventListener("visibilitychange", function () {
                         if (document.hidden) {
                             $userAdmin.find('> button').attr('aria-expanded', 'false');
+                            $userAdmin.find('> button').focus();
                         }
                     });
                     $(document).on('click', function (e) {

From 4fd72921229632a369e4fdd7f1765dfe67c116f2 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 6 Nov 2023 13:25:09 +0200
Subject: [PATCH 52/87] fixed bug regarding skipping menu items + simplified
 code

---
 www/common/toolbar.js | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 3d2f8c80c..5b1ecfab6 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1118,14 +1118,17 @@ define([
             }
             return null;
         }
-        $userAdmin.find('> button').click(function () {
-            if ($userAdmin.find('> button').attr('aria-expanded') === 'true') {
-                $userAdmin.find('> button').attr('aria-expanded', 'false');
+
+        let userMenuButton = $userAdmin.find('> button');
+        userMenuButton.click(function () {
+            const isExpanded =  userMenuButton.attr('aria-expanded') === 'true';
+            if (isExpanded) {
+                userMenuButton.attr('aria-expanded', 'false');
                 $(document).off('keydown');
             } else {
-                $userAdmin.find('> button').attr('aria-expanded', 'true');
-                $userAdmin.find('> button').blur();
-                var dropdownActive = $(".cp-dropdown-content");
+                userMenuButton.attr('aria-expanded', 'true');
+                userMenuButton.blur();
+                const dropdownActive = $(".cp-dropdown-content");
                 if (dropdownActive.length > 0) {
                     setTimeout(function () {
                         let items = dropdownActive.find('li:visible');
@@ -1134,22 +1137,24 @@ define([
                         }).first();
                         firstVisibleItem.attr('tabindex', '0').focus();
                     }, 0);
-                    var searchCharacters = '';
+                    let searchCharacters = '';
                     document.addEventListener("visibilitychange", function () {
                         if (document.hidden) {
-                            $userAdmin.find('> button').attr('aria-expanded', 'false');
-                            $userAdmin.find('> button').focus();
+                            userMenuButton.attr('aria-expanded', 'false');
+                            userMenuButton.focus();
+                            $(document).off('keydown');
                         }
                     });
                     $(document).on('click', function (e) {
                         if ( !$(e.target).closest(".cp-dropdown-content").length) {
-                            $userAdmin.find('> button').attr('aria-expanded', 'false');
+                            userMenuButton.attr('aria-expanded', 'false');
+                            $(document).off('keydown');
                         }
                     });
                     $(document).on('keydown', function (e) {
                         if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
-                            var items = dropdownActive.find('li:visible');
-                            var focusedItem = items.filter(':focus');
+                            const items = dropdownActive.find('li:visible');
+                            const focusedItem = items.filter(':focus');
                             items.attr('tabindex', '-1');
                             if (e.key === 'Tab') {
                                 e.preventDefault();
@@ -1168,14 +1173,13 @@ define([
                                     }
                                     nextItem.attr('tabindex', '0').focus();
                                     searchCharacters = '';
-
                                 }
                             } else if (e.key === 'Escape') {
                                 dropdownActive.find('li').attr('tabindex', '-1');
                                 dropdownActive.attr('tabindex', '-1');
                                 $(document).off('keydown');
-                                $userAdmin.find('> button').attr('aria-expanded', 'false');
-                                $userAdmin.find('> button').focus();
+                                userMenuButton.attr('aria-expanded', 'false');
+                                userMenuButton.focus();
                                 searchCharacters = '';
                             } else if (e.key.match(/[a-zA-Z]/)) {
                                 searchCharacters += e.key.toLowerCase();

From 795aec10b325aef51356adfce354ba6ad5d1f97a Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 6 Nov 2023 14:00:08 +0200
Subject: [PATCH 53/87] ran lint

---
 www/common/drive-ui.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 6041b0173..8194ee3e6 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1057,10 +1057,10 @@ define([
             if ([37, 38, 39, 40].indexOf(e.which) === -1) { return; }
             e.preventDefault();
 
-            var click = function (el) {
-                if (!el) { return; }
-                APP.onElementClick(ev, $(el));
-            };
+            // var click = function (el) {
+            //     if (!el) { return; }
+            //     APP.onElementClick(ev, $(el));
+            // };
 
             // var $selection = findSelectedElements();
             // if ($selection.length === 0) { return void click($elements.first()[0]); }
@@ -1080,17 +1080,17 @@ define([
             // Icon mode
             // Get the vertical and horizontal position of lastIndex
             // Filter all the elements to get those in the same line/column
-            var pos = $($elements.get(0)).position();
-            var $line = $elements.filter(function (idx, el) {
-                return $(el).position().top === pos.top;
-            });
-            var cols = $line.length;
-            var lines = Math.ceil(length/cols);
+            // var pos = $($elements.get(0)).position();
+            // var $line = $elements.filter(function (idx, el) {
+            //     return $(el).position().top === pos.top;
+            // });
+            // var cols = $line.length;
+            // var lines = Math.ceil(length/cols);
 
-            var lastPos = {
-                l : Math.floor(lastIndex/cols),
-                c : lastIndex - Math.floor(lastIndex/cols)*cols
-            };
+            // var lastPos = {
+            //     l : Math.floor(lastIndex/cols),
+            //     c : lastIndex - Math.floor(lastIndex/cols)*cols
+            // };
 
             // if (e.which === 37) {
             //     if (lastPos.c === 0) { return; }

From c0d492e409050ee029249942d29404f249796192 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 6 Nov 2023 14:23:24 +0200
Subject: [PATCH 54/87] updated role of li elements according to WAI

---
 www/common/common-ui-elements.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c4388b66d..53ba630c7 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1956,8 +1956,7 @@ define([
         var options = [];
         options.push({
             tag: 'li',
-            role: 'presentation',
-            attributes: {'class': 'cp-user-menu-logo', 'role': 'menuitem'},
+            attributes: {'class': 'cp-user-menu-logo', 'role': 'none'},
             content: h('span', [
                 h('img', {
                     src: '/customize/CryptPad_logo_grey.svg',
@@ -1988,8 +1987,7 @@ define([
             }
             options.push({
                 tag: 'li',
-                role: 'presentation',
-                attributes: {'class': 'cp-toolbar-account', 'role': 'menuitem'},
+                attributes: {'class': 'cp-toolbar-account', 'role': 'none'},
                 content: userAdminContent,
             });
         }
@@ -2296,7 +2294,7 @@ define([
             return {
                 tag: 'li',
                 content: [option],
-                attributes: {'role': 'presentation'}
+                attributes: {'role': 'none'}
             };
         });
         var dropdownConfigUser = {

From 48b4f7be748a4513b23c2f45445e1f0011f34522 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 9 Nov 2023 11:39:24 +0200
Subject: [PATCH 55/87] added span to menu item titles

---
 www/common/drive-ui.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 8194ee3e6..600fd3040 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3270,7 +3270,7 @@ define([
                 var newObj = {
                     tag: 'a',
                     attributes: {'class': obj.class, href: '#'},
-                    content: [obj.icon, obj.name]
+                    content: [obj.icon, { tag: 'span', content: obj.name }]
                 };
                 if (obj.type) {
                     newObj.attributes['data-type'] = obj.type;
@@ -3347,7 +3347,7 @@ define([
                     attributes: attributes,
                     content: [
                         getIcon(type)[0],
-                        Messages.type[type],
+                        { tag: 'span', content: Messages.type[type] },
                     ],
                 });
             });
@@ -3362,7 +3362,7 @@ define([
                     },
                     content: [
                         getIcon('link')[0],
-                        Messages.fm_link_type,
+                        { tag: 'span', content: Messages.fm_link_type },
                     ],
                 });
                 options.push({
@@ -3374,7 +3374,7 @@ define([
                     },
                     content: [
                         getIcon('file')[0],
-                        Messages.type['file'],
+                        { tag: 'span', content: Messages.type['file'] },
                     ],
                 });
             }

From 2b2efd2fe6b2028e65c0048196bdc7c3650e6dd0 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 19:29:10 +0200
Subject: [PATCH 56/87] `+New` dropdown has li elements

---
 www/common/common-ui-elements.js | 13 ++++++++++++-
 www/common/drive-ui.js           | 19 +++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 53ba630c7..18819eeeb 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1660,6 +1660,9 @@ define([
                 if (typeof (o.content) === 'string' || (o.content instanceof Element)) {
                     o.content = [o.content];
                 }
+                if(typeof (o.content) === 'object' && !Array.isArray(o.content)) {
+                    o.content = [o.content];
+                }
                 if (Array.isArray(o.content)) {
                     o.content.forEach(function (item) {
                         if (item instanceof Element) {
@@ -1671,7 +1674,15 @@ define([
                         if (typeof item === 'object') {
                             //  case where item is an object, eg: an <a> tag
                             var $subElement = $(h(item.tag, item.attributes || {}));
-                            if (typeof item.content === 'string') {
+                            if (Array.isArray(item.content)) {
+                                item.content.forEach(function (subItem) {
+                                    if (typeof subItem === 'string') {
+                                        $subElement[0].appendChild(document.createTextNode(subItem));
+                                    } else if (subItem instanceof Element) {
+                                        $subElement.append(subItem);
+                                    }
+                                });
+                            } else if (typeof item.content === 'string') {
                                 $subElement.text(item.content);
                             } else if (item.content instanceof Element) {
                                 $subElement.append(item.content);
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 600fd3040..398a6f90a 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3265,19 +3265,26 @@ define([
             // Create dropdown
             var options = getNewPadOptions(isInRoot).map(function (obj) {
                 if (obj.separator) {
-                    return {tag: 'hr'};
+                    return { tag: 'hr' };
                 }
+
                 var newObj = {
-                    tag: 'a',
-                    attributes: {'class': obj.class, href: '#'},
-                    content: [obj.icon, { tag: 'span', content: obj.name }]
+                    tag: 'li',
+                    content: {
+                        tag: 'a',
+                        attributes: { 'class': obj.class, href: '#' },
+                        content: [obj.icon, obj.name]
+                    }
                 };
+
                 if (obj.type) {
-                    newObj.attributes['data-type'] = obj.type;
-                    newObj.attributes['href'] = APP.origin + Hash.hashToHref('', obj.type);
+                    newObj.content.attributes['data-type'] = obj.type;
+                    newObj.content.attributes['href'] = APP.origin + Hash.hashToHref('', obj.type);
                 }
+
                 return newObj;
             });
+
             var dropdownConfig = {
                 buttonContent: [
                     h('i.fa.fa-plus'),

From 7e37c0bf6b66cb1d86120f1916a0c8db3d0b7673 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 19:39:47 +0200
Subject: [PATCH 57/87] `Filter` dropdown has li elements

---
 www/common/drive-ui.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 398a6f90a..01227a662 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3354,7 +3354,7 @@ define([
                     attributes: attributes,
                     content: [
                         getIcon(type)[0],
-                        { tag: 'span', content: Messages.type[type] },
+                        Messages.type[type]
                     ],
                 });
             });
@@ -3369,7 +3369,7 @@ define([
                     },
                     content: [
                         getIcon('link')[0],
-                        { tag: 'span', content: Messages.fm_link_type },
+                        Messages.fm_link_type
                     ],
                 });
                 options.push({
@@ -3381,10 +3381,20 @@ define([
                     },
                     content: [
                         getIcon('file')[0],
-                        { tag: 'span', content: Messages.type['file'] },
+                        Messages.type['file']
                     ],
                 });
             }
+            // wrap the option in a li tag
+            options = options.map(function (obj) {
+                if (obj.tag === 'hr') {
+                    return { tag: 'hr' };
+                }
+                return {
+                    tag: 'li',
+                    content: obj
+                };
+            });
             var dropdownConfig = {
                 buttonContent: [
                     h('i.fa.fa-filter'),

From d84975deeceacf99e53cacd886039ac366764f1d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 20:09:44 +0200
Subject: [PATCH 58/87] added margin to dropdowns that open to the left

---
 customize.dist/src/less2/include/dropdown.less | 1 +
 customize.dist/src/less2/include/toolbar.less  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index e3f1ef827..5a54b3de0 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -71,6 +71,7 @@
 
             &.cp-dropdown-left {
                 right: 0;
+                margin-right: 5px;
             }
 
             &:hover {
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 2f66891d6..594236194 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -822,7 +822,6 @@
                 text-align: center;
 
                 .cp-dropdown-content {
-                    margin: 0;
                     padding-bottom: 10px;
                 }
                 & > button {

From 7df9b20c6332822c1c908d22126f251009fcaa5f Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 20:33:37 +0200
Subject: [PATCH 59/87] added li tags to notifications

---
 www/common/sframe-common-mailbox.js | 2 +-
 www/common/toolbar.js               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js
index 625fc2f07..80e119e4e 100644
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -86,7 +86,7 @@ define([
             }
             var order = -Math.floor((Util.find(data, ['content', 'msg', 'ctime']) || 0) / 1000);
             const tabIndexValue = data.content.isDismissible ? undefined : '0';
-            notif = h('div.cp-notification', {
+            notif = h('li.cp-notification', {
                 style: 'order:'+order+';',
                 'data-hash': data.content.hash
             }, [
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 5b1ecfab6..a0772880e 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1256,7 +1256,7 @@ define([
                 Common.openURL("/notifications/");
             }
         });
-        var div = h('li.cp-notifications-container', [
+        var div = h('ul.cp-notifications-container', [
             h('div.cp-notifications-empty', Messages.notifications_empty)
         ]);
         var pads_options = [div];
@@ -1265,6 +1265,7 @@ define([
         var privateData = metadataMgr.getPrivateData();
         if (!privateData.notifications) {
             var allowNotif = h('div.cp-notifications-gotoapp', {tabindex: '0'}, h('p', Messages.allowNotifications));
+            allowNotif = h('li', {}, allowNotif);
             pads_options.unshift(h("hr"));
             pads_options.unshift(allowNotif);
             $(allowNotif).on('click keypress', function (event) {

From 7dfb27d652b95002a100d881ae42c145393dfac9 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 20:39:04 +0200
Subject: [PATCH 60/87] added role to li elements on `+New` dropdown

---
 www/common/drive-ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 01227a662..627f265ba 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3270,6 +3270,7 @@ define([
 
                 var newObj = {
                     tag: 'li',
+                    attributes: { role: 'none'},
                     content: {
                         tag: 'a',
                         attributes: { 'class': obj.class, href: '#' },

From 99d5f7cccffd8d607cb9046bc6dda4ca3329194d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 20:43:24 +0200
Subject: [PATCH 61/87] added role to li elements on `Filter` dropdown

---
 www/common/drive-ui.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 627f265ba..61ca647c8 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3386,13 +3386,10 @@ define([
                     ],
                 });
             }
-            // wrap the option in a li tag
             options = options.map(function (obj) {
-                if (obj.tag === 'hr') {
-                    return { tag: 'hr' };
-                }
                 return {
                     tag: 'li',
+                    attributes: { role: 'none'},
                     content: obj
                 };
             });

From 6cc377bede1d8a644264a5b2f796ae76c66a7240 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Sun, 12 Nov 2023 20:48:55 +0200
Subject: [PATCH 62/87] added role to a elements on `Filter` dropdown

---
 www/common/drive-ui.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 61ca647c8..e58f94f8a 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3338,6 +3338,7 @@ define([
             }
             getNewPadTypes().forEach(function (type) {
                 var attributes = {
+                    'role': 'menuitem',
                     'class': 'cp-app-drive-filter-doc',
                     'data-type': type,
                     'href': '#'
@@ -3364,6 +3365,7 @@ define([
                 options.push({
                     tag: 'a',
                     attributes: {
+                        'role': 'menuitem',
                         'class': 'cp-app-drive-filter-doc',
                         'data-type': 'link',
                         'href': '#'
@@ -3376,6 +3378,7 @@ define([
                 options.push({
                     tag: 'a',
                     attributes: {
+                        'role': 'menuitem',
                         'class': 'cp-app-drive-filter-doc',
                         'data-type': 'file',
                         'href': '#'

From e941b78acf90a47042f127abd37fe4813e153a97 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 13 Nov 2023 14:12:48 +0200
Subject: [PATCH 63/87] clicking outside the dropdown sets aria-expanded to
 false

---
 www/common/drive-ui.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index e58f94f8a..7eff7c385 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3299,17 +3299,25 @@ define([
             var $block = UIElements.createDropdown(dropdownConfig);
 
             // Custom style:
-            $block.find('button').addClass('cp-app-drive-toolbar-new');
-            $block.find('button').attr('aria-haspopup', 'menu');
-            $block.find('button').attr('aria-expanded', 'false');
-            $block.find('button').click(function () {
-                if ($block.find('button').attr('aria-expanded') === 'true') {
-                    $block.find('button').attr('aria-expanded', 'false');
+            var menuButton = $block.find('button');
+            menuButton.addClass('cp-app-drive-toolbar-new');
+            menuButton.attr('aria-haspopup', 'menu');
+            menuButton.attr('aria-expanded', 'false');
+            menuButton.click(function () {
+                if (menuButton.attr('aria-expanded') === 'true') {
+                    menuButton.attr('aria-expanded', 'false');
                 } else {
-                    $block.find('button').attr('aria-expanded', 'true');
+                    menuButton.attr('aria-expanded', 'true');
                 }
+                $(document).on('click', function (e) {
+                    if ( !$(e.target).closest(".cp-dropdown-content").length) {
+                        menuButton.attr('aria-expanded', 'false');
+                        $(document).off('keydown');
+                    }
+                });
             });
 
+
             addNewPadHandlers($block, isInRoot);
 
             $container.append($block);

From e315ee24670497f5aad9e81cfd3383cc6dfec31e Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 13 Nov 2023 14:38:48 +0200
Subject: [PATCH 64/87] created function for reusability

---
 www/common/drive-ui.js | 48 ++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 7eff7c385..a59e872e7 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3299,30 +3299,31 @@ define([
             var $block = UIElements.createDropdown(dropdownConfig);
 
             // Custom style:
+            // actions for +New menu button
             var menuButton = $block.find('button');
             menuButton.addClass('cp-app-drive-toolbar-new');
-            menuButton.attr('aria-haspopup', 'menu');
-            menuButton.attr('aria-expanded', 'false');
-            menuButton.click(function () {
-                if (menuButton.attr('aria-expanded') === 'true') {
-                    menuButton.attr('aria-expanded', 'false');
-                } else {
-                    menuButton.attr('aria-expanded', 'true');
-                }
-                $(document).on('click', function (e) {
-                    if ( !$(e.target).closest(".cp-dropdown-content").length) {
-                        menuButton.attr('aria-expanded', 'false');
-                        $(document).off('keydown');
-                    }
-                });
-            });
-
-
+            functionalDropdown(menuButton);
             addNewPadHandlers($block, isInRoot);
 
             $container.append($block);
         };
-
+        var functionalDropdown = function ($button) {
+            menuButton.attr('aria-haspopup', 'menu');
+            menuButton.attr('aria-expanded', 'false');
+            $button.click(function () {
+                if ($button.attr('aria-expanded') === 'true') {
+                    $button.attr('aria-expanded', 'false');
+                } else {
+                    $button.attr('aria-expanded', 'true');
+                    $(document).on('click', function (e) {
+                        if ( !$(e.target).closest(".cp-dropdown-content").length) {
+                            $button.attr('aria-expanded', 'false');
+                            $(document).off('keydown');
+                        }
+                    });
+                }
+            });
+        };
         var createFilterButton = function (isTemplate, $container) {
             if (!APP.loggedIn) {
                 return;
@@ -3425,15 +3426,8 @@ define([
             }
             var $block = UIElements.createDropdown(dropdownConfig);
 
-            $block.find('button').attr('aria-haspopup', 'menu');
-            $block.find('button').attr('aria-expanded', 'false');
-            $block.find('button').click(function () {
-                if ($block.find('button').attr('aria-expanded') === 'true') {
-                    $block.find('button').attr('aria-expanded', 'false');
-                } else {
-                    $block.find('button').attr('aria-expanded', 'true');
-                }
-            });
+            var menuButton = $block.find('button');
+            functionalDropdown(menuButton);
 
             // Add style
             if (APP.store[FILTER_BY]) {

From d890d26e563a0fb036d87f2bd22eebc193a501f8 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 13 Nov 2023 15:05:46 +0200
Subject: [PATCH 65/87] dropdowns(`+New` and Filter) are accessible through
 keyboard

---
 www/common/drive-ui.js | 55 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index a59e872e7..f265bad21 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3265,7 +3265,13 @@ define([
             // Create dropdown
             var options = getNewPadOptions(isInRoot).map(function (obj) {
                 if (obj.separator) {
-                    return { tag: 'hr' };
+                    return {
+                        tag: 'li',
+                        role: 'none',
+                        content: {
+                            tag: 'hr'
+                        }
+                    };
                 }
 
                 var newObj = {
@@ -3308,19 +3314,60 @@ define([
             $container.append($block);
         };
         var functionalDropdown = function ($button) {
-            menuButton.attr('aria-haspopup', 'menu');
-            menuButton.attr('aria-expanded', 'false');
+            $button.attr('aria-haspopup', 'menu');
+            $button.attr('aria-expanded', 'false');
             $button.click(function () {
                 if ($button.attr('aria-expanded') === 'true') {
                     $button.attr('aria-expanded', 'false');
                 } else {
                     $button.attr('aria-expanded', 'true');
                     $(document).on('click', function (e) {
-                        if ( !$(e.target).closest(".cp-dropdown-content").length) {
+                        if (!$(e.target).closest(".cp-dropdown-content").length) {
                             $button.attr('aria-expanded', 'false');
                             $(document).off('keydown');
                         }
                     });
+                    $button.blur();
+                    const dropdownActive = $(".cp-dropdown-content");
+                    if (dropdownActive.length > 0) {
+                        setTimeout(function () {
+                            let items = dropdownActive.find('li:visible');
+                            const firstVisibleItem = items.filter(function () {
+                                return !($(this).find('hr').length > 0);
+                            }).first();
+                            firstVisibleItem.attr('tabindex', '0').focus();
+                        }, 0);
+                    }
+                    $(document).on('keydown', function (e) {
+                        if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
+                            const items = dropdownActive.find('li:visible');
+                            const focusedItem = items.filter(':focus');
+                            items.attr('tabindex', '-1');
+                            if (e.key === 'Tab') {
+                                e.preventDefault();
+                            } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+                                if (e.key === 'ArrowUp') {
+                                    var prevItem = focusedItem.prev().length ? focusedItem.prev() : items.last();
+                                    while (prevItem.find('hr').length > 0) {
+                                        prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
+                                    }
+                                    prevItem.attr('tabindex', '0').focus();
+                                } else if (e.key === 'ArrowDown') {
+                                    var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
+                                    while (nextItem.find('hr').length > 0) {
+                                        nextItem = nextItem.next().length ? nextItem.next() : items.first();
+                                    }
+                                    nextItem.attr('tabindex', '0').focus();
+                                }
+                            } else if (e.key === 'Escape') {
+                                dropdownActive.find('li').attr('tabindex', '-1');
+                                dropdownActive.attr('tabindex', '-1');
+                                $(document).off('keydown');
+                                menuButton.attr('aria-expanded', 'false');
+                                menuButton.focus();
+                            }
+                        }
+                    });
                 }
             });
         };

From bc714f6276c2f17fed922e9d54e04c42b2896334 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 17 Nov 2023 13:58:08 +0100
Subject: [PATCH 66/87] Revert autoformatting on "can access every link on user
 menu"

This partially reverts commit 6b5eb38070fe5fc35080f2cc65be2834f94e3aa1.
---
 www/common/common-ui-elements.js | 1225 +++++++++++-------------------
 1 file changed, 444 insertions(+), 781 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 18819eeeb..f9b17c79a 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -24,25 +24,24 @@ define([
     var urlArgs = Config.requireConf.urlArgs;
 
     UIElements.getSvgLogo = function () {
-        var svg = (function () {/*
+        var svg = (function(){/*
 <svg width="45" height="50" version="1.1" viewBox="0 0 11.906 13.229" xmlns="http://www.w3.org/2000/svg">
  <path id="background" d="m1.0914 0.43939h6.464l3.2642 3.0329v3.6261c0 3.8106-3.1186 4.6934-4.8229 5.5936-1.8663-0.85843-4.7759-1.7955-4.8229-5.5936z" style="stroke-width:0"/>
  <path id="squares" transform="matrix(.26458 0 0 .26458 -5.37e-5 0)" d="m4.125 1.6582 0.30469 21.82h18.242l0.001953-21.82h-18.549zm18.555 21.822 0.001953 24.188c7.0591-3.2362 18.032-9.399 18.232-23.754l0.007813-0.43359h-18.242z" style="fill-opacity:.4;stroke-width:.55042"/>
  <path id="outline" transform="matrix(.26458 0 0 .26458 -5.37e-5 0)" d="m2.6504 0.19922 0.021484 1.4766 0.31055 25.172c0.093479 7.5478 3.1451 12.529 7.0488 15.826 3.9038 3.297 8.5769 5.029 12.025 6.6152l0.65039 0.30274 0.63477-0.33984c3.0702-1.6216 7.7769-3.3403 11.773-6.5996 3.9966-3.2593 7.2344-8.2277 7.2344-15.826v-14.336l-13.221-12.291zm2.9453 2.916h20.381v12.379h13.457v11.332c0 6.8038-2.6491 10.706-6.1562 13.566-3.2982 2.6898-7.3426 4.2502-10.623 5.9141-3.4806-1.5714-7.5236-3.1369-10.74-5.8535-3.4025-2.8737-5.9391-6.8355-6.0234-13.643zm23.289 0.83789 9.2871 8.6328h-9.2871zm-6.5176 14.223a4.9632 4.9632 0 0 0-4.8496 4.9629 4.9632 4.9632 0 0 0 2.8184 4.4746l-1.7324 9.1504h7.7598l-1.7324-9.1523a4.9632 4.9632 0 0 0 2.8145-4.4727 4.9632 4.9632 0 0 0-4.9629-4.9629 4.9632 4.9632 0 0 0-0.11523 0z" style="color-rendering:auto;color:#000000;dominant-baseline:auto;font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;image-rendering:auto;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;shape-rendering:auto;solid-color:#000000;stop-color:#000000;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
-*/
-        }).toString().slice(14, -3);
+*/}).toString().slice(14,-3);
         return svg;
     };
 
     UIElements.prettySize = function (bytes) {
         var unit = Util.magnitudeOfBytes(bytes);
         if (unit === 'GB') {
-            return Messages._getKey('formattedGB', [Util.bytesToGigabytes(bytes)]);
+            return Messages._getKey('formattedGB', [ Util.bytesToGigabytes(bytes)]);
         } else if (unit === 'MB') {
-            return Messages._getKey('formattedMB', [Util.bytesToMegabytes(bytes)]);
+            return Messages._getKey('formattedMB', [ Util.bytesToMegabytes(bytes)]);
         } else {
-            return Messages._getKey('formattedKB', [Util.bytesToKilobytes(bytes)]);
+            return Messages._getKey('formattedKB', [ Util.bytesToKilobytes(bytes)]);
         }
     };
 
@@ -52,11 +51,9 @@ define([
         if (!hrefs || typeof (hrefs) === "string") {
             hrefs = [hrefs];
         }
-        NThen(function (waitFor) {
-            common.getSframeChannel().query("Q_GET_ALL_TAGS", null, waitFor(function (err, res) {
-                if (err || res.error) {
-                    return void console.error(err || res.error);
-                }
+        NThen(function(waitFor) {
+            common.getSframeChannel().query("Q_GET_ALL_TAGS", null, waitFor(function(err, res) {
+                if (err || res.error) { return void console.error(err || res.error); }
                 existing = Object.keys(res.tags).sort();
             }));
         }).nThen(function (waitFor) {
@@ -79,15 +76,13 @@ define([
                             return tags.indexOf(tag) !== -1;
                         });
                     } else {
-                        tags = res || [];
+                        tags = res || [];
                     }
                 }), href);
             });
         }).nThen(function () {
             UI.dialog.tagPrompt(tags, existing, function (newTags) {
-                if (!Array.isArray(newTags)) {
-                    return;
-                }
+                if (!Array.isArray(newTags)) { return; }
                 var added = [];
                 var removed = [];
                 newTags.forEach(function (tag) {
@@ -119,15 +114,11 @@ define([
 
     var dcAlert;
     UIElements.disconnectAlert = function () {
-        if (dcAlert && $(dcAlert.element).length) {
-            return;
-        }
+        if (dcAlert && $(dcAlert.element).length) { return; }
         dcAlert = UI.alert(Messages.common_connectionLost, undefined, true);
     };
     UIElements.reconnectAlert = function () {
-        if (!dcAlert) {
-            return;
-        }
+        if (!dcAlert) { return; }
         if (!dcAlert.delete) {
             dcAlert = undefined;
             return;
@@ -142,21 +133,17 @@ define([
                 var reader = new FileReader();
                 var parsed = file && file.name && /.+\.([^.]+)$/.exec(file.name);
                 var ext = parsed && parsed[1];
-                reader.onload = function (e) {
-                    f(e.target.result, file, ext);
-                };
+                reader.onload = function (e) { f(e.target.result, file, ext); };
                 if (cfg && cfg.binary && cfg.binary.indexOf(ext) !== -1) {
-                    reader.readAsArrayBuffer(file, type);
+                   reader.readAsArrayBuffer(file, type);
                 } else {
-                    reader.readAsText(file, type);
+                   reader.readAsText(file, type);
                 }
             };
 
-            if (_file) {
-                return void todo(_file);
-            }
+            if (_file) { return void todo(_file); }
 
-            var $files = $('<input>', {type: "file"});
+            var $files = $('<input>', {type:"file"});
             if (cfg && cfg.accept) {
                 $files.attr('accept', cfg.accept);
             }
@@ -171,9 +158,7 @@ define([
     UIElements.getUserGrid = function (label, config, onSelect) {
         var common = config.common;
         var users = config.data;
-        if (!users) {
-            return;
-        }
+        if (!users) { return; }
 
         var icons = Object.keys(users).map(function (key, i) {
             var data = users[key];
@@ -190,25 +175,23 @@ define([
                 });
             }
 
-            el = h('div.cp-usergrid-user' + (data.selected ? '.cp-selected' : '') + (config.large ? '.large' : ''), {
+            el = h('div.cp-usergrid-user'+(data.selected?'.cp-selected':'')+(config.large?'.large':''), {
                 'data-ed': data.edPublic,
                 'data-teamid': data.teamId,
                 'data-curve': data.curvePublic || '',
                 'data-name': name.toLowerCase(),
                 'data-order': i,
-                style: 'order:' + i + ';'
-            }, [
+                style: 'order:'+i+';'
+            },[
                 avatar,
                 h('span.cp-usergrid-user-name', name),
                 data.notRemovable ? undefined : removeBtn
             ]);
             return el;
-        }).filter(function (x) {
-            return x;
-        });
+        }).filter(function (x) { return x; });
 
         var noOthers = icons.length === 0 ? '.cp-usergrid-empty' : '';
-        var classes = noOthers + (config.large ? '.large' : '') + (config.list ? '.list' : '');
+        var classes = noOthers + (config.large?'.large':'') + (config.list?'.list':'');
 
         var inputFilter = h('input', {
             placeholder: Messages.share_filterFriend
@@ -227,7 +210,7 @@ define([
             var name = $(inputFilter).val().trim().replace(/"/g, '').toLowerCase();
             $div.find('.cp-usergrid-user').show();
             if (name) {
-                $div.find('.cp-usergrid-user:not(.cp-selected):not([data-name*="' + name + '"])').hide();
+                $div.find('.cp-usergrid-user:not(.cp-selected):not([data-name*="'+name+'"])').hide();
             }
         };
         $(inputFilter).on('keydown keyup change', redraw);
@@ -240,7 +223,7 @@ define([
                     $(this).addClass('cp-selected');
                 } else {
                     var order = $(this).attr('data-order');
-                    order = order ? 'order:' + order : '';
+                    order = order ? 'order:'+order : '';
                     $(this).removeClass('cp-selected').attr('style', order);
                 }
                 onSelect();
@@ -267,12 +250,10 @@ define([
                     onClick: function () {
                         var profile = data.profile ? (origin + '/profile/#' + data.profile) : '';
                         var success = Clipboard.copy(profile);
-                        if (success) {
-                            UI.log(Messages.shareSuccess);
-                        }
+                        if (success) { UI.log(Messages.shareSuccess); }
                     },
                     keys: [13]
-                }]
+                  }]
             };
         } else {
             return {
@@ -283,26 +264,24 @@ define([
                     onClick: function () {
                         common.setLoginRedirect('register');
                     }
-                }, {
+                  }, {
                     className: 'secondary',
                     name: Messages.login_login,
                     onClick: function () {
                         common.setLoginRedirect('login');
                     }
-                }]
+                  }]
             };
         }
     };
 
     UIElements.createInviteTeamModal = function (config) {
         var common = config.common;
-        var hasFriends = Object.keys(config.friends || {}).length !== 0;
+        var hasFriends = Object.keys(config.friends || {}).length !== 0;
 
         var privateData = common.getMetadataMgr().getPrivateData();
         var team = privateData.teams[config.teamId];
-        if (!team) {
-            return void UI.warn(Messages.error);
-        }
+        if (!team) { return void UI.warn(Messages.error); }
 
         var origin = privateData.origin;
 
@@ -311,9 +290,7 @@ define([
         // Invite contacts
         var $div;
         var refreshButton = function () {
-            if (!$div) {
-                return;
-            }
+            if (!$div) { return; }
             var $modal = $div.closest('.alertify');
             var $nav = $modal.find('nav');
             var $btn = $nav.find('button.primary');
@@ -339,9 +316,7 @@ define([
                 onClick: function () {
                     var $sel = $div.find('.cp-usergrid-user.cp-selected');
                     var sel = $sel.toArray();
-                    if (!sel.length) {
-                        return;
-                    }
+                    if (!sel.length) { return; }
 
                     sel.forEach(function (el) {
                         var curve = $(el).attr('data-curve');
@@ -370,8 +345,7 @@ define([
         contactsButtons.unshift({
             className: 'cancel',
             name: Messages.cancel,
-            onClick: function () {
-            },
+            onClick: function () {},
             keys: [27]
         });
 
@@ -390,26 +364,26 @@ define([
         var dismissButton = h('span.fa.fa-times');
 
         var roleViewer = UI.createRadio('cp-team-role', 'cp-team-role-viewer',
-            Messages.team_viewers, true, {
-                input: {value: 'VIEWER'},
-            });
+                Messages.team_viewers, true, {
+                    input: { value: 'VIEWER' },
+                });
         var roleMember = UI.createRadio('cp-team-role', 'cp-team-role-member',
-            Messages.team_members, false, {
-                input: {value: 'MEMBER'},
-            });
+                Messages.team_members, false, {
+                    input: { value: 'MEMBER' },
+                });
 
 
         var linkContent = h('div.cp-share-modal', [
-            h('p', Messages.team_inviteLinkTitle),
-            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style: 'display: none;'}),
+            h('p', Messages.team_inviteLinkTitle ),
+            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}),
             linkForm = h('div.cp-teams-invite-form', [
                 // autofill: 'off' was insufficient
                 // adding these two fake inputs confuses firefox and prevents unwanted form autofill
-                h('input', {type: 'text', style: 'display: none'}),
-                h('input', {type: 'password', style: 'display: none'}),
+                h('input', { type: 'text', style: 'display: none'}),
+                h('input', { type: 'password', style: 'display: none'}),
 
                 linkName = h('input', {
-                    placeholder: Messages.team_inviteLinkTempName
+                    placeholder:  Messages.team_inviteLinkTempName
                 }),
                 h('br'),
                 h('div.cp-teams-invite-block', [
@@ -464,21 +438,15 @@ define([
                 dismissButton
             ])
         ]);
-        $(linkUses).on('change keyup', function (e) {
-            if (e.target.value === '') {
-                e.target.value = 0;
-            }
+        $(linkUses).on('change keyup', function(e) {
+            if (e.target.value === '') { e.target.value = 0; }
         });
         $(linkMessage).keydown(function (e) {
-            if (e.which === 13) {
-                e.stopPropagation();
-            }
+            if (e.which === 13) { e.stopPropagation(); }
         });
         var localStore = window.cryptpadStore;
         localStore.get('hide-alert-teamInvite', function (val) {
-            if (val === '1') {
-                return;
-            }
+            if (val === '1') { return; }
             $(linkWarning).css('display', 'flex');
 
             $(dismissButton).on('click', function () {
@@ -494,9 +462,7 @@ define([
             var name = $(linkName).val();
 
             var uses = Number($(linkUses).val());
-            if (isNaN(uses) || !uses) {
-                uses = -1;
-            }
+            if (isNaN(uses) || !uses) { uses = -1; }
 
             var role = $(linkRole).find("input[name='cp-team-role']:checked").val() || 'VIEWER';
 
@@ -555,8 +521,7 @@ define([
         var linkButtons = [{
             className: 'cancel',
             name: Messages.cancel,
-            onClick: function () {
-            },
+            onClick: function () {},
             keys: [27]
         }, {
             className: 'primary cp-teams-invite-create',
@@ -569,13 +534,9 @@ define([
             className: 'primary cp-teams-invite-copy',
             name: Messages.team_inviteLinkCopy,
             onClick: function () {
-                if (!href) {
-                    return;
-                }
+                if (!href) { return; }
                 var success = Clipboard.copy(href);
-                if (success) {
-                    UI.log(Messages.shareSuccess);
-                }
+                if (success) { UI.log(Messages.shareSuccess); }
             },
             keys: []
         }];
@@ -605,9 +566,7 @@ define([
     UIElements.openDirectlyConfirmation = function (common, cb) {
         cb = cb || Util.noop;
         UI.confirm(h('p', Messages.ui_openDirectly), yes => {
-            if (!yes) {
-                return void cb(yes);
-            }
+            if (!yes) { return void cb(yes); }
             common.openDirectly();
             cb(yes);
         });
@@ -667,19 +626,19 @@ define([
                     }
                 }
                 else if (callback) {*/
-                // Old import button, used in settings
-                var importer = importContent((data && data.binary) ? 'application/octet-stream' : 'text/plain', callback, {
-                    accept: data ? data.accept : undefined,
-                    binary: data ? data.binary : undefined
-                });
-
-                var handler = data.first ? function () {
-                    data.first(function () {
-                        importer(); // Make sure we don't pass arguments to importer
+                    // Old import button, used in settings
+                    var importer = importContent((data && data.binary) ? 'application/octet-stream' : 'text/plain', callback, {
+                        accept: data ? data.accept : undefined,
+                        binary: data ? data.binary : undefined
                     });
-                } : importer; //importContent;
 
-                button
+                    var handler = data.first? function () {
+                        data.first(function () {
+                            importer(); // Make sure we don't pass arguments to importer
+                        });
+                    }: importer; //importContent;
+
+                    button
                     .click(common.prepareFeedback(type))
                     .click(function () {
                         handler();
@@ -690,10 +649,8 @@ define([
                 button = $('<button>', {
                     'class': 'btn btn-primary new',
                     title: Messages.uploadButtonTitle,
-                }).append($('<span>', {'class': 'fa fa-upload'})).append(' ' + Messages.uploadButton);
-                if (!data.FM) {
-                    return;
-                }
+                }).append($('<span>', {'class':'fa fa-upload'})).append(' '+Messages.uploadButton);
+                if (!data.FM) { return; }
                 var $input = $('<input>', {
                     'type': 'file',
                     'style': 'display: none;',
@@ -715,154 +672,131 @@ define([
                         }
                         data.FM.handleFile(file, ev);
                     });
-                    if (callback) {
-                        callback();
-                    }
-                });
-                if (data.accept) {
-                    $input.attr('accept', data.accept);
-                }
-                button.click(function () {
-                    $input.click();
+                    if (callback) { callback(); }
                 });
+                if (data.accept) { $input.attr('accept', data.accept); }
+                button.click(function () { $input.click(); });
                 break;
             case 'copy':
                 button = $('<button>', {
                     'class': 'fa fa-files-o cp-toolbar-icon-import',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.makeACopy));
                 button
-                    .click(common.prepareFeedback(type))
-                    .click(function () {
-                        sframeChan.query('EV_MAKE_A_COPY');
-                    });
+                .click(common.prepareFeedback(type))
+                .click(function () {
+                    sframeChan.query('EV_MAKE_A_COPY');
+                });
                 break;
             case 'importtemplate':
-                if (!AppConfig.enableTemplates) {
-                    return;
-                }
-                if (!common.isLoggedIn()) {
-                    return;
-                }
+                if (!AppConfig.enableTemplates) { return; }
+                if (!common.isLoggedIn()) { return; }
                 button = $('<button>', {
                     'class': 'fa fa-upload cp-toolbar-icon-import',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.template_import));
                 button
-                    .click(common.prepareFeedback(type))
-                    .click(function () {
-                        if (callback) {
-                            return void callback();
-                        }
-                        UIElements.openTemplatePicker(common, true);
-                    });
+                .click(common.prepareFeedback(type))
+                .click(function () {
+                    if (callback) { return void callback(); }
+                    UIElements.openTemplatePicker(common, true);
+                });
                 break;
             case 'template':
-                if (!AppConfig.enableTemplates) {
-                    return;
-                }
-                if (!common.isLoggedIn()) {
-                    return;
-                }
+                if (!AppConfig.enableTemplates) { return; }
+                if (!common.isLoggedIn()) { return; }
                 button = $('<button>', {
                     'class': 'cptools cptools-new-template cp-toolbar-icon-template',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.saveTemplateButton));
                 if (data.rt || data.callback) {
                     button
-                        .click(function () {
-                            var title = data.getTitle() || document.title;
-                            var todo = function (val) {
-                                if (typeof (val) !== "string") {
-                                    return;
-                                }
-                                if (data.callback) {
-                                    return void data.callback(val);
-                                }
-                                var toSave = data.rt.getUserDoc();
-                                if (val.trim()) {
-                                    val = val.trim();
-                                    title = val;
-                                    try {
-                                        var parsed = JSON.parse(toSave);
-                                        var meta;
-                                        if (Array.isArray(parsed) && typeof (parsed[3]) === "object") {
-                                            meta = parsed[3].metadata; // pad
-                                        } else if (parsed.info) {
-                                            meta = parsed.info; // poll
-                                        } else {
-                                            meta = parsed.metadata;
-                                        }
-                                        if (typeof (meta) === "object") {
-                                            meta.title = val;
-                                            meta.defaultTitle = val;
-                                            delete meta.users;
-                                        }
-                                        toSave = JSON.stringify(parsed);
-                                    } catch (e) {
-                                        console.error("Parse error while setting the title", e);
+                    .click(function () {
+                        var title = data.getTitle() || document.title;
+                        var todo = function (val) {
+                            if (typeof(val) !== "string") { return; }
+                            if (data.callback) {
+                                return void data.callback(val);
+                            }
+                            var toSave = data.rt.getUserDoc();
+                            if (val.trim()) {
+                                val = val.trim();
+                                title = val;
+                                try {
+                                    var parsed = JSON.parse(toSave);
+                                    var meta;
+                                    if (Array.isArray(parsed) && typeof(parsed[3]) === "object") {
+                                        meta = parsed[3].metadata; // pad
+                                    } else if (parsed.info) {
+                                        meta = parsed.info; // poll
+                                    } else {
+                                        meta = parsed.metadata;
                                     }
+                                    if (typeof(meta) === "object") {
+                                        meta.title = val;
+                                        meta.defaultTitle = val;
+                                        delete meta.users;
+                                    }
+                                    toSave = JSON.stringify(parsed);
+                                } catch(e) {
+                                    console.error("Parse error while setting the title", e);
                                 }
-                                sframeChan.query('Q_SAVE_AS_TEMPLATE', {
-                                    toSave: toSave,
-                                    title: title
-                                }, function () {
-                                    UI.alert(Messages.templateSaved);
-                                    Feedback.send('TEMPLATE_CREATED');
-                                });
-                            };
-                            UI.prompt(Messages.saveTemplatePrompt, title, todo);
-                        });
+                            }
+                            sframeChan.query('Q_SAVE_AS_TEMPLATE', {
+                                toSave: toSave,
+                                title: title
+                            }, function () {
+                                UI.alert(Messages.templateSaved);
+                                Feedback.send('TEMPLATE_CREATED');
+                            });
+                        };
+                        UI.prompt(Messages.saveTemplatePrompt, title, todo);
+                    });
                 }
                 break;
             case 'forget':
                 button = $('<button>', {
                     'class': "fa fa-trash cp-toolbar-icon-forget"
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.fc_delete));
-                callback = typeof callback === "function" ? callback : function () {
-                };
+                callback = typeof callback === "function" ? callback : function () {};
                 button
-                    .click(common.prepareFeedback(type))
-                    .click(function () {
-                        common.isPadStored(function (err, data) {
-                            if (!data) {
-                                return void UI.alert(Messages.autostore_notAvailable);
+                .click(common.prepareFeedback(type))
+                .click(function() {
+                    common.isPadStored(function (err, data) {
+                        if (!data) {
+                            return void UI.alert(Messages.autostore_notAvailable);
+                        }
+                        sframeChan.query('Q_IS_ONLY_IN_SHARED_FOLDER', null, function (err, res) {
+                            if (err || res.error) { return void console.log(err || res.error); }
+                            var msg = Messages.forgetPrompt;
+                            if (res) {
+                                UI.alert(Messages.sharedFolders_forget);
+                                return;
+                            } else if (!common.isLoggedIn()) {
+                                msg = Messages.fm_removePermanentlyDialog;
                             }
-                            sframeChan.query('Q_IS_ONLY_IN_SHARED_FOLDER', null, function (err, res) {
-                                if (err || res.error) {
-                                    return void console.log(err || res.error);
-                                }
-                                var msg = Messages.forgetPrompt;
-                                if (res) {
-                                    UI.alert(Messages.sharedFolders_forget);
-                                    return;
-                                } else if (!common.isLoggedIn()) {
-                                    msg = Messages.fm_removePermanentlyDialog;
-                                }
-                                UI.confirm(msg, function (yes) {
-                                    if (!yes) {
-                                        return;
+                            UI.confirm(msg, function (yes) {
+                                if (!yes) { return; }
+                                sframeChan.query('Q_MOVE_TO_TRASH', null, function (err, obj) {
+                                    err = err || (obj && obj.error);
+                                    if (err) {
+                                        callback(err);
+                                        return void UI.warn(Messages.fm_forbidden);
                                     }
-                                    sframeChan.query('Q_MOVE_TO_TRASH', null, function (err, obj) {
-                                        err = err || (obj && obj.error);
-                                        if (err) {
-                                            callback(err);
-                                            return void UI.warn(Messages.fm_forbidden);
-                                        }
-                                        var msg;
-                                        if (common.isLoggedIn()) {
-                                            msg = Pages.setHTML(h('div'), Messages.movedToTrash);
-                                            $(msg).find('a').attr('href', '/drive/');
-                                            common.fixLinks(msg);
-                                        } else {
-                                            msg = h('div', Messages.deleted);
-                                        }
-                                        UI.alert(msg);
-                                        callback();
-                                        return;
-                                    });
+                                    var msg;
+                                    if (common.isLoggedIn()) {
+                                        msg = Pages.setHTML(h('div'), Messages.movedToTrash);
+                                        $(msg).find('a').attr('href', '/drive/');
+                                        common.fixLinks(msg);
+                                    } else {
+                                        msg = h('div', Messages.deleted);
+                                    }
+                                    UI.alert(msg);
+                                    callback();
+                                    return;
                                 });
-
                             });
+
                         });
                     });
+                });
                 break;
             case 'present':
                 button = $(h('button', {
@@ -900,8 +834,8 @@ define([
                     button
                         .click(common.prepareFeedback(type))
                         .on('click', function () {
-                            common.getHistory(data.histConfig);
-                        });
+                        common.getHistory(data.histConfig);
+                    });
                 }
                 break;
             case 'mediatag':
@@ -950,14 +884,14 @@ define([
                     title: Messages.tags_title,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.fc_hashtag));
                 button.click(common.prepareFeedback(type))
-                    .click(function () {
-                        common.isPadStored(function (err, data) {
-                            if (!data) {
-                                return void UI.alert(Messages.autostore_notAvailable);
-                            }
-                            UIElements.updateTags(common, null);
-                        });
+                .click(function () {
+                    common.isPadStored(function (err, data) {
+                        if (!data) {
+                            return void UI.alert(Messages.autostore_notAvailable);
+                        }
+                        UIElements.updateTags(common, null);
                     });
+                });
                 break;
             case 'toggle':
                 button = $(h('button.cp-toolbar-tools', {
@@ -979,19 +913,13 @@ define([
                 button.click(function (e) {
                     data.element.toggle();
                     var isVisible = data.element.is(':visible');
-                    if (callback) {
-                        callback(isVisible);
-                    }
+                    if (callback) { callback(isVisible); }
                     if (isVisible) {
                         button.addClass('cp-toolbar-button-active');
-                        if (e.originalEvent) {
-                            Feedback.send('TOGGLE_SHOW_' + appType);
-                        }
+                        if (e.originalEvent) { Feedback.send('TOGGLE_SHOW_' + appType); }
                     } else {
                         button.removeClass('cp-toolbar-button-active');
-                        if (e.originalEvent) {
-                            Feedback.send('TOGGLE_HIDE_' + appType);
-                        }
+                        if (e.originalEvent) { Feedback.send('TOGGLE_HIDE_' + appType); }
                     }
                     //updateIcon(isVisible);
                 });
@@ -1002,32 +930,28 @@ define([
                     'class': 'fa fa-info-circle cp-toolbar-icon-properties',
                     title: Messages.propertiesButtonTitle,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
-                    .text(Messages.propertiesButton))
-                    .click(common.prepareFeedback(type))
-                    .click(function () {
-                        var isTop;
-                        try {
-                            isTop = common.getMetadataMgr().getPrivateData().isTop;
-                        } catch (err) {
-                            console.error(err);
-                        }
-                        if (!isTop) {
-                            return void UIElements.openDirectlyConfirmation(common);
-                        }
+                .text(Messages.propertiesButton))
+                .click(common.prepareFeedback(type))
+                .click(function () {
+                    var isTop;
+                    try {
+                        isTop = common.getMetadataMgr().getPrivateData().isTop;
+                    } catch (err) { console.error(err); }
+                    if (!isTop) {
+                        return void UIElements.openDirectlyConfirmation(common);
+                    }
 
-                        sframeChan.event('EV_PROPERTIES_OPEN');
-                    });
+                    sframeChan.event('EV_PROPERTIES_OPEN');
+                });
                 break;
             case 'save': // OnlyOffice save
                 button = $('<button>', {
                     'class': 'fa fa-save',
                     title: Messages.settings_save,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
-                    .text(Messages.settings_save))
-                    .click(common.prepareFeedback(type));
-                if (callback) {
-                    button.click(callback);
-                }
+                .text(Messages.settings_save))
+                .click(common.prepareFeedback(type));
+                if (callback) { button.click(callback); }
                 break;
             case 'newpad':
                 button = $('<button>', {
@@ -1035,10 +959,10 @@ define([
                     'class': 'fa fa-plus cp-toolbar-icon-newpad',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.newButton));
                 button
-                    .click(common.prepareFeedback(type))
-                    .click(function () {
-                        common.createNewPadModal();
-                    });
+                .click(common.prepareFeedback(type))
+                .click(function () {
+                    common.createNewPadModal();
+                });
                 break;
             case 'snapshots':
                 button = $('<button>', {
@@ -1046,13 +970,13 @@ define([
                     'class': 'fa fa-camera cp-toolbar-icon-snapshots',
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.snapshots_button));
                 button
-                    .click(common.prepareFeedback(type))
-                    .click(function () {
-                        if (typeof (data.load) !== "function" || typeof (data.make) !== "function") {
-                            return;
-                        }
-                        UIElements.openSnapshotsModal(common, data.load, data.make, data.remove);
-                    });
+                .click(common.prepareFeedback(type))
+                .click(function () {
+                    if (typeof(data.load) !== "function" || typeof(data.make) !== "function") {
+                        return;
+                    }
+                    UIElements.openSnapshotsModal(common, data.load, data.make, data.remove);
+                });
                 break;
             default:
                 var drawerCls = data.drawer === false ? '' : '.cp-toolbar-drawer-element';
@@ -1062,27 +986,19 @@ define([
                     //title: data.title || '',
                 }, [
                     h('i.fa.' + icon),
-                    h('span.cp-toolbar-name' + drawerCls, data.text)
+                    h('span.cp-toolbar-name'+drawerCls, data.text)
                 ]));
                 var feedbackHandler = common.prepareFeedback(data.name || 'DEFAULT');
                 button[0].addEventListener('click', function () {
                     feedbackHandler();
-                    if (typeof (callback) !== 'function') {
-                        return;
-                    }
+                    if (typeof(callback) !== 'function') { return; }
                     callback();
                 });
-                if (data.style) {
-                    button.attr('style', data.style);
-                }
-                if (data.id) {
-                    button.attr('id', data.id);
-                }
-                if (data.hiddenReadOnly) {
-                    button.addClass('cp-hidden-if-readonly');
-                }
+                if (data.style) { button.attr('style', data.style); }
+                if (data.id) { button.attr('id', data.id); }
+                if (data.hiddenReadOnly) { button.addClass('cp-hidden-if-readonly'); }
                 if (data.name) {
-                    button.addClass('cp-toolbar-icon-' + data.name);
+                    button.addClass('cp-toolbar-icon-'+data.name);
                 }
         }
         if (rightside) {
@@ -1118,9 +1034,9 @@ define([
             'heading': {
                 // Msg.mdToolbar_heading
                 apply: function (str) {
-                    return '\n' + clean(str).split('\n').map(function (line) {
-                        return '# ' + line;
-                    }).join('\n') + '\n';
+                    return '\n'+clean(str).split('\n').map(function (line) {
+                        return '# '+line;
+                    }).join('\n')+'\n';
                 },
                 icon: 'fa-header'
             },
@@ -1132,27 +1048,27 @@ define([
             'quote': {
                 // Msg.mdToolbar_quote
                 apply: function (str) {
-                    return '\n\n' + str.split('\n').map(function (line) {
-                        return '> ' + line;
-                    }).join('\n') + '\n\n';
+                    return '\n\n'+str.split('\n').map(function (line) {
+                        return '> '+line;
+                    }).join('\n')+'\n\n';
                 },
                 icon: 'fa-quote-right'
             },
             'nlist': {
                 // Msg.mdToolbar_nlist
                 apply: function (str) {
-                    return '\n' + clean(str).split('\n').map(function (line) {
-                        return '1. ' + line;
-                    }).join('\n') + '\n';
+                    return '\n'+clean(str).split('\n').map(function (line) {
+                        return '1. '+line;
+                    }).join('\n')+'\n';
                 },
                 icon: 'fa-list-ol'
             },
             'list': {
                 // Msg.mdToolbar_list
                 apply: function (str) {
-                    return '\n' + clean(str).split('\n').map(function (line) {
-                        return '* ' + line;
-                    }).join('\n') + '\n';
+                    return '\n'+clean(str).split('\n').map(function (line) {
+                        return '* '+line;
+                    }).join('\n')+'\n';
                 },
                 icon: 'fa-list-ul'
             },
@@ -1182,7 +1098,7 @@ define([
             }
         };
 
-        if (typeof (cfg.embed) === "function") {
+        if (typeof(cfg.embed) === "function") {
             actions.embed = { // Messages.mdToolbar_embed
                 icon: 'fa-picture-o',
                 action: function () {
@@ -1204,14 +1120,11 @@ define([
                             console.log("Unexpected data type picked " + data.type);
                             return;
                         }
-                        if (data.type !== 'file') {
-                            console.log('unhandled embed type ' + data.type);
-                            return;
-                        }
+                        if (data.type !== 'file') { console.log('unhandled embed type ' + data.type); return; }
                         common.setPadAttribute('atime', +new Date(), null, data.href);
                         var privateDat = common.getMetadataMgr().getPrivateData();
                         var origin = privateDat.fileHost || privateDat.origin;
-                        var src = data.src = data.src.slice(0, 1) === '/' ? origin + data.src : data.src;
+                        var src = data.src = data.src.slice(0,1) === '/' ? origin + data.src : data.src;
                         cfg.embed(h('media-tag', {
                             src: src,
                             'data-crypto-key': 'cryptpad:' + data.key,
@@ -1244,11 +1157,8 @@ define([
                 'class': 'pure-button fa ' + actions[k].icon,
                 title: Messages['mdToolbar_' + k] || k
             }).click(onClick);
-            if (k === "embed") {
-                $toolbar.prepend($b);
-            } else {
-                $toolbar.append($b);
-            }
+            if (k === "embed") { $toolbar.prepend($b); }
+            else { $toolbar.append($b); }
         }
         $('<button>', {
             'class': 'pure-button fa fa-question cp-markdown-help',
@@ -1265,8 +1175,7 @@ define([
             return {
                 toolbar: $(),
                 button: $(),
-                setState: function () {
-                }
+                setState: function () {}
             };
         }
 
@@ -1277,21 +1186,15 @@ define([
         };
         var onClick = function (visible) {
             common.setAttribute(['general', 'markdown-help'], visible, function (e) {
-                if (e) {
-                    return void console.error(e);
-                }
+                if (e) { return void console.error(e); }
             });
         };
 
         var $toolbarButton = common.createButton('toggle', true, cfg, onClick);
         var tbState = true;
         common.getAttribute(['general', 'markdown-help'], function (e, data) {
-            if (e) {
-                return void console.error(e);
-            }
-            if ($(window).height() < 800 && $(window).width() < 800) {
-                return;
-            }
+            if (e) { return void console.error(e); }
+            if ($(window).height() < 800 && $(window).width() < 800) { return; }
             if (data === true && $toolbarButton.length && tbState) {
                 $toolbarButton.click();
             }
@@ -1307,12 +1210,8 @@ define([
                 return;
             }
             common.getAttribute(['general', 'markdown-help'], function (e, data) {
-                if (e) {
-                    return void console.error(e);
-                }
-                if ($(window).height() < 800 && $(window).width() < 800) {
-                    return;
-                }
+                if (e) { return void console.error(e); }
+                if ($(window).height() < 800 && $(window).width() < 800) { return; }
                 if (data === true && $toolbarButton) {
                     // Show the toolbar using the button to make sure the icon in the button is
                     // correct (caret-down / caret-up)
@@ -1424,15 +1323,11 @@ define([
     // NOTE: The callback must stay SYNCHRONOUS
     var LIMIT_REFRESH_RATE = 30000; // milliseconds
     UIElements.createUsageBar = function (common, teamId, cb) {
-        if (AppConfig.hideUsageBar) {
-            return cb('USAGE_BAR_HIDDEN');
-        }
-        if (!common.isLoggedIn()) {
-            return cb("NOT_LOGGED_IN");
-        }
+        if (AppConfig.hideUsageBar) { return cb('USAGE_BAR_HIDDEN'); }
+        if (!common.isLoggedIn()) { return cb("NOT_LOGGED_IN"); }
         // getPinnedUsage updates common.account.usage, and other values
         // so we can just use those and only check for errors
-        var $container = $('<span>', {'class': 'cp-limit-container'});
+        var $container = $('<span>', {'class':'cp-limit-container'});
         var to;
         var todo = function (err, data) {
             if (to) {
@@ -1445,9 +1340,7 @@ define([
                 }, 1000);
                 return;
             }
-            if (err || !data) {
-                return void console.error(err || 'No data');
-            }
+            if (err || !data) { return void console.error(err || 'No data'); }
 
             var usage = data.usage;
             var limit = data.limit;
@@ -1455,14 +1348,14 @@ define([
             $container.html('');
             var unit = Util.magnitudeOfBytes(limit);
 
-            usage = unit === 'GB' ? Util.bytesToGigabytes(usage) :
+            usage = unit === 'GB'? Util.bytesToGigabytes(usage):
                 Util.bytesToMegabytes(usage);
-            limit = unit === 'GB' ? Util.bytesToGigabytes(limit) :
+            limit = unit === 'GB'? Util.bytesToGigabytes(limit):
                 Util.bytesToMegabytes(limit);
 
             var $limit = $('<span>', {'class': 'cp-limit-bar'}).appendTo($container);
-            var quota = limit === 0 ? 1 : usage / limit;
-            var $usage = $('<span>', {'class': 'cp-limit-usage'}).css('width', quota * 100 + '%');
+            var quota = limit === 0 ? 1 : usage/limit;
+            var $usage = $('<span>', {'class': 'cp-limit-usage'}).css('width', quota*100+'%');
             var $buttons = $(h('span.cp-limit-buttons')).appendTo($container);
 
             var urls = common.getMetadataMgr().getPrivateData().accounts;
@@ -1515,13 +1408,9 @@ define([
                 prettyLimit = Messages._getKey('formattedMB', [limit]);
             }
 
-            if (quota < 0.8) {
-                $usage.addClass('cp-limit-usage-normal');
-            } else if (quota < 1) {
-                $usage.addClass('cp-limit-usage-warning');
-            } else {
-                $usage.addClass('cp-limit-usage-above');
-            }
+            if (quota < 0.8) { $usage.addClass('cp-limit-usage-normal'); }
+            else if (quota < 1) { $usage.addClass('cp-limit-usage-warning'); }
+            else { $usage.addClass('cp-limit-usage-above'); }
             var $text = $('<span>', {'class': 'cp-limit-usage-text'});
             $text.html(Messages._getKey('storageStatus', [prettyUsage, prettyLimit])); // TODO avoid use of .html() if possible
             $container.prepend($text);
@@ -1568,28 +1457,18 @@ define([
     //
     // allowed options tags: ['a', 'hr', 'p']
     UIElements.createDropdown = function (config) {
-        if (typeof config !== "object" || !Array.isArray(config.options)) {
-            return;
-        }
-        if (config.feedback && !config.common) {
-            return void console.error("feedback in a dropdown requires sframe-common");
-        }
+        if (typeof config !== "object" || !Array.isArray(config.options)) { return; }
+        if (config.feedback && !config.common) { return void console.error("feedback in a dropdown requires sframe-common"); }
 
         var isElement = function (o) {
             return /HTML/.test(Object.prototype.toString.call(o)) &&
-                typeof (o.tagName) === 'string';
+                typeof(o.tagName) === 'string';
         };
         var allowedTags = ['a', 'li', 'p', 'hr', 'div'];
         var isValidOption = function (o) {
-            if (typeof o !== "object") {
-                return false;
-            }
-            if (isElement(o)) {
-                return true;
-            }
-            if (!o.tag || allowedTags.indexOf(o.tag) === -1) {
-                return false;
-            }
+            if (typeof o !== "object") { return false; }
+            if (isElement(o)) { return true; }
+            if (!o.tag || allowedTags.indexOf(o.tag) === -1) { return false; }
             return true;
         };
 
@@ -1637,27 +1516,19 @@ define([
 
         // Menu
         var $innerblock = $('<ul>', {'class': 'cp-dropdown-content', 'role': 'menu'});
-        if (config.left) {
-            $innerblock.addClass('cp-dropdown-left');
-        }
+        if (config.left) { $innerblock.addClass('cp-dropdown-left'); }
 
         var hide = function () {
-            window.setTimeout(function () {
-                $innerblock.hide();
-            }, 0);
+            window.setTimeout(function () { $innerblock.hide(); }, 0);
         };
 
         var setOptions = function (options) {
             options.forEach(function (o) {
-                if (!isValidOption(o)) {
-                    return;
-                }
-                if (isElement(o)) {
-                    return $innerblock.append(o);
-                }
+                if (!isValidOption(o)) { return; }
+                if (isElement(o)) { return $innerblock.append(o); }
                 var $el = $(h(o.tag, (o.attributes || {})));
 
-                if (typeof (o.content) === 'string' || (o.content instanceof Element)) {
+                if (typeof(o.content) === 'string' || (o.content instanceof Element)) {
                     o.content = [o.content];
                 }
                 if(typeof (o.content) === 'object' && !Array.isArray(o.content)) {
@@ -1668,7 +1539,7 @@ define([
                         if (item instanceof Element) {
                             return void $el.append(item);
                         }
-                        if (typeof (item) === 'string') {
+                        if (typeof(item) === 'string') {
                             $el[0].appendChild(document.createTextNode(item));
                         }
                         if (typeof item === 'object') {
@@ -1707,12 +1578,11 @@ define([
                             });
                         } else {
                             var close = o.action(e);
-                            if (close) {
-                                hide();
-                            }
+                            if (close) { hide(); }
                         }
-                    }
-                });
+                    });
+                }
+
             });
         };
         setOptions(config.options);
@@ -1726,16 +1596,14 @@ define([
         var value = config.initialValue || '';
 
         var setActive = function ($el) {
-            if ($el.length !== 1) {
-                return;
-            }
+            if ($el.length !== 1) { return; }
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
             $el.addClass('cp-dropdown-element-active');
             var scroll = $el.position().top + $innerblock.scrollTop();
             if (scroll < $innerblock.scrollTop()) {
                 $innerblock.scrollTop(scroll);
             } else if (scroll > ($innerblock.scrollTop() + 280)) {
-                $innerblock.scrollTop(scroll - 270);
+                $innerblock.scrollTop(scroll-270);
             }
         };
 
@@ -1747,28 +1615,23 @@ define([
             if (config.noscroll) {
                 var h = $innerblock.outerHeight();
                 if ((topPos + h) > wh) {
-                    $innerblock.css('bottom', button.height + 'px');
+                    $innerblock.css('bottom', button.height+'px');
                 }
             } else {
-                $innerblock.css('max-height', Math.floor(wh - topPos - 1) + 'px');
+                $innerblock.css('max-height', Math.floor(wh - topPos - 1)+'px');
             }
             $innerblock.show();
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
             if (config.isSelect && value) {
                 // We use JSON.stringify here to escape quotes
-                if (typeof (value) === "object") {
-                    value = JSON.stringify(value);
-                }
-                var $val = $innerblock.find('[data-value=' + JSON.stringify(value) + ']');
+                if (typeof(value) === "object") { value = JSON.stringify(value); }
+                var $val = $innerblock.find('[data-value='+JSON.stringify(value)+']');
                 setActive($val);
                 try {
                     $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
-                } catch (e) {
-                }
-            }
-            if (config.feedback) {
-                Feedback.send(config.feedback);
+                } catch (e) {}
             }
+            if (config.feedback) { Feedback.send(config.feedback); }
         };
 
         $container.click(function (e) {
@@ -1851,7 +1714,7 @@ define([
                 var c = String.fromCharCode(e.which);
                 pressed += c;
                 // We use JSON.stringify here to escape quotes
-                var $value = $innerblock.find('[data-value^=' + JSON.stringify(pressed) + ']:first');
+                var $value = $innerblock.find('[data-value^='+JSON.stringify(pressed)+']:first');
                 if ($value.length) {
                     setActive($value);
                     $innerblock.scrollTop($value.position().top + $innerblock.scrollTop());
@@ -1864,19 +1727,17 @@ define([
             $container.setValue = function (val, name, sync) {
                 value = val;
                 // We use JSON.stringify here to escape quotes
-                var $val = $innerblock.find('[data-value=' + JSON.stringify(val) + ']');
+                var $val = $innerblock.find('[data-value='+JSON.stringify(val)+']');
                 var textValue = name || $val.text() || val;
                 var f = function () {
                     $button.find('.cp-dropdown-button-title').text(textValue);
                 };
 
-                if (sync) {
-                    return void f();
-                }
+                if (sync) { return void f(); }
                 setTimeout(f);
             };
             $container.getValue = function () {
-                return typeof (value) === "undefined" ? '' : value;
+                return typeof(value) === "undefined" ? '' : value;
             };
         }
 
@@ -1892,9 +1753,7 @@ define([
         // https://github.com/cryptpad/cryptpad/releases/latest/ ?
 
         var template = function (line, link) {
-            if (!line || !link) {
-                return;
-            }
+            if (!line || !link) { return; }
             var p = Pages.setHTML(h('p'), line);
             var sub = link.cloneNode(true);
             var href;
@@ -1904,9 +1763,7 @@ define([
                 return; // don't return anything to display if their href causes URL to throw
             }
             var a = p.querySelector('a');
-            if (!a) {
-                return;
-            }
+            if (!a) { return; }
             sub.innerText = a.innerText;
             sub.setAttribute('href', href);
             p.replaceChild(sub, a);
@@ -1920,11 +1777,11 @@ define([
         var sourceLine = template(Messages.info_sourceFlavour, Pages.sourceLink);
 
         var content = h('div.cp-info-menu-container', [
-            h('div.logo-block', [
-                h('img', {
-                    src: '/customize/CryptPad_logo.svg?' + urlArgs,
-                    alt: Messages.label_logo
-                }),
+                h('div.logo-block', [
+                    h('img', {
+                        src: '/customize/CryptPad_logo.svg?' + urlArgs,
+                        alt: Messages.label_logo
+                    }),
                 h('h6', "CryptPad"),
                 h('span', Pages.versionString)
             ]),
@@ -1944,13 +1801,12 @@ define([
             {
                 className: 'primary',
                 name: Messages.filePicker_close,
-                onClick: function () {
-                },
+                onClick: function () {},
                 keys: [27],
             },
         ];
 
-        var modal = UI.dialog.customModal(content, {scrollable: true, buttons: buttons});
+        var modal = UI.dialog.customModal(content, {scrollable: true, buttons: buttons });
         UI.openCustomModal(modal);
     };
 
@@ -2006,17 +1862,13 @@ define([
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
-                attributes: {
-                    'class': 'cp-toolbar-menu-profile fa fa-user-circle',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
-                },
+                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.profileButton),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin + '/profile/');
+                        Common.openURL(origin+'/profile/');
                     } else {
-                        Common.gotoURL(origin + '/profile/');
+                        Common.gotoURL(origin+'/profile/');
                     }
                 },
             });
@@ -2031,7 +1883,7 @@ define([
                 },
                 content: h('span', Messages.type.drive),
                 action: function () {
-                    Common.openURL(origin + '/drive/');
+                    Common.openURL(origin+'/drive/');
                 },
             });
         }
@@ -2080,30 +1932,30 @@ define([
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog', 'tabindex': '-1', 'role': 'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.settingsButton),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin + '/settings/');
+                        Common.openURL(origin+'/settings/');
                     } else {
-                        Common.gotoURL(origin + '/settings/');
+                        Common.gotoURL(origin+'/settings/');
                     }
                 },
             });
         }
 
-        options.push({tag: 'hr'});
+        options.push({ tag: 'hr' });
         // Add administration panel link if the user is an admin
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs', 'tabindex': '-1', 'role': 'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '-1', 'role':'menuitem'},
                 content: h('span', Messages.adminPage || 'Admin'),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin + '/admin/');
+                        Common.openURL(origin+'/admin/');
                     } else {
-                        Common.gotoURL(origin + '/admin/');
+                        Common.gotoURL(origin+'/admin/');
                     }
                 },
             });
@@ -2127,9 +1979,9 @@ define([
                 content: h('span', Messages.supportPage || 'Support'),
                 action: function () {
                     if (padType) {
-                        Common.openURL(origin + '/support/');
+                        Common.openURL(origin+'/support/');
                     } else {
-                        Common.gotoURL(origin + '/support/');
+                        Common.gotoURL(origin+'/support/');
                     }
                 },
             });
@@ -2169,7 +2021,7 @@ define([
                 content: h('span', Messages.user_rename)
             });
         }*/
-        options.push({tag: 'hr'});
+        options.push({ tag: 'hr' });
 
         // We have code to hide 2 separators in a row, but in the case of survey, they may be
         // in the DOM but hidden. We need to know if there are other elements in this
@@ -2185,7 +2037,7 @@ define([
                 },
                 content: h('span', priv.plan ? Messages.settings_cat_subscription : Messages.pricing),
                 action: function () {
-                    Common.openURL(priv.plan ? priv.accounts.upgradeURL : '/features.html');
+                    Common.openURL(priv.plan ? priv.accounts.upgradeURL :'/features.html');
                 },
             });
         }
@@ -2206,8 +2058,8 @@ define([
         }
 
         // If you set "" in the admin panel, it will remove the AppConfig survey
-        var surveyURL = typeof (Broadcast.surveyURL) !== "undefined" ? Broadcast.surveyURL
-            : AppConfig.surveyURL;
+        var surveyURL = typeof(Broadcast.surveyURL) !== "undefined" ? Broadcast.surveyURL
+                                        : AppConfig.surveyURL;
         options.push({
             tag: 'a',
             attributes: {
@@ -2220,7 +2072,7 @@ define([
             },
         });
 
-        options.push({tag: 'hr'});
+        options.push({ tag: 'hr' });
         // Add login or logout button depending on the current status
         if (priv.loggedIn) {
             options.push({
@@ -2233,9 +2085,7 @@ define([
                 content: h('span', Messages.logoutEverywhere),
                 action: function () {
                     UI.confirm(Messages.settings_logoutEverywhereConfirm, function (yes) {
-                        if (!yes) {
-                            return;
-                        }
+                        if (!yes) { return; }
                         Common.getSframeChannel().query('Q_LOGOUT_EVERYWHERE', null, function () {
                             Common.gotoURL(origin + '/');
                         });
@@ -2244,18 +2094,18 @@ define([
             });
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out', 'tabindex': '-1', 'role': 'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.logoutButton),
                 action: function () {
                     Common.logout(function () {
-                        Common.gotoURL(origin + '/');
+                        Common.gotoURL(origin+'/');
                     });
                 },
             });
         } else {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in', 'tabindex': '-1', 'role': 'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '-1','role':'menuitem'},
                 content: h('span', Messages.login_login),
                 action: function () {
                     Common.setLoginRedirect('login');
@@ -2264,11 +2114,7 @@ define([
             if (!Config.restrictRegistration) {
                 options.push({
                     tag: 'a',
-                    attributes: {
-                        'class': 'cp-toolbar-menu-register fa fa-user-plus',
-                        'tabindex': '0',
-                        'role': 'menuitem'
-                    },
+                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus','tabindex': '0', 'role':'menuitem'},
                     content: h('span', Messages.login_register),
                     action: function () {
                         Common.setLoginRedirect('register');
@@ -2290,9 +2136,7 @@ define([
 
         options.forEach(function (option) {
             var f = option.action;
-            if (!f) {
-                return;
-            }
+            if (!f) { return; }
             option.action = function () {
                 f();
                 return true;
@@ -2321,35 +2165,23 @@ define([
         var $survey = $userAdmin.find('.cp-toolbar-survey');
         if (!surveyURL) {
             $survey.hide();
-            if (surveyAlone) {
-                $survey.next('hr').hide();
-            }
+            if (surveyAlone) { $survey.next('hr').hide(); }
         }
         Common.makeUniversal('broadcast', {
             onEvent: function (obj) {
                 var cmd = obj.ev;
-                if (cmd !== "SURVEY") {
-                    return;
-                }
+                if (cmd !== "SURVEY") { return; }
                 var url = obj.data;
-                if (url === surveyURL) {
-                    return;
-                }
-                if (url && !Util.isValidURL(url)) {
-                    return;
-                }
+                if (url === surveyURL) { return; }
+                if (url && !Util.isValidURL(url)) { return; }
                 surveyURL = url;
                 if (!url) {
                     $survey.hide();
-                    if (surveyAlone) {
-                        $survey.next('hr').hide();
-                    }
+                    if (surveyAlone) { $survey.next('hr').hide(); }
                     return;
                 }
                 $survey.show();
-                if (surveyAlone) {
-                    $survey.next('hr').show();
-                }
+                if (surveyAlone) { $survey.next('hr').show(); }
             }
         });
 
@@ -2360,7 +2192,7 @@ define([
         $userAdmin.find('.cp-dropdown-content').append($lang);
         */
 
-        var $displayName = $userAdmin.find('.' + displayNameCls);
+        var $displayName = $userAdmin.find('.'+displayNameCls);
 
         var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
         var loadingAvatar;
@@ -2378,9 +2210,7 @@ define([
                 UIElements.createUserAdminMenu(Common, config);
                 return;
             }
-            if (!myData) {
-                return;
-            }
+            if (!myData) { return; }
             if (loadingAvatar) {
                 // Try again in 200ms
                 window.clearTimeout(to);
@@ -2398,9 +2228,7 @@ define([
                     oldUid = uid;
                     oldName = newName;
                     $userAdmin.find('> button').removeClass('cp-avatar');
-                    if ($img) {
-                        $userAdmin.find('> button').addClass('cp-avatar');
-                    }
+                    if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
                     loadingAvatar = false;
                 }, uid);
                 return;
@@ -2453,6 +2281,7 @@ define([
     };
 
 
+
     UIElements.createNewPadModal = function (common) {
         // if in drive, show new pad modal instead
         if ($(".cp-app-drive-element-row.cp-app-drive-new-ghost").length !== 0) {
@@ -2464,7 +2293,7 @@ define([
             $body: $('body')
         });
         var $modal = modal.$modal;
-        var $title = $(h('h3', [h('i.fa.fa-plus'), ' ', Messages.fm_newButton]));
+        var $title = $(h('h3', [ h('i.fa.fa-plus'), ' ', Messages.fm_newButton ]));
 
         var $description = $(Pages.setHTML(h('p'), Messages.creation_newPadModalDescription));
         $modal.find('.cp-modal').append($title);
@@ -2474,20 +2303,16 @@ define([
         var i = 0;
 
         var types = AppConfig.availablePadTypes.filter(function (p) {
-            if (AppConfig.hiddenTypes.indexOf(p) !== -1) {
-                return;
-            }
+            if (AppConfig.hiddenTypes.indexOf(p) !== -1) { return; }
             if (!common.isLoggedIn() && AppConfig.registeredOnlyTypes &&
-                AppConfig.registeredOnlyTypes.indexOf(p) !== -1) {
-                return;
-            }
+                AppConfig.registeredOnlyTypes.indexOf(p) !== -1) { return; }
             return true;
         });
 
         types.forEach(function (p) {
             var $element = $('<li>', {
                 'class': 'cp-icons-element',
-                'id': 'cp-newpad-icons-' + (i++)
+                'id': 'cp-newpad-icons-'+ (i++)
             }).prepend(UI.getIcon(p)).appendTo($container);
             $element.append($('<span>', {'class': 'cp-icons-name'})
                 .text(Messages.type[p]));
@@ -2508,7 +2333,7 @@ define([
         var next = function () {
             selected = ++selected % types.length;
             $container.find('.cp-icons-element-selected').removeClass('cp-icons-element-selected');
-            $container.find('#cp-newpad-icons-' + selected).addClass('cp-icons-element-selected');
+            $container.find('#cp-newpad-icons-'+selected).addClass('cp-icons-element-selected');
         };
 
         $modal.off('keydown');
@@ -2538,9 +2363,7 @@ define([
     UIElements.openFilePicker = function (common, types, cb) {
         var sframeChan = common.getSframeChannel();
         sframeChan.query("Q_FILE_PICKER_OPEN", types, function (err, data) {
-            if (err) {
-                return;
-            }
+            if (err) { return; }
             cb(data);
         });
     };
@@ -2562,9 +2385,7 @@ define([
         };
         var onConfirm = function (yes) {
             if (!yes) {
-                if (focus) {
-                    focus.focus();
-                }
+                if (focus) { focus.focus(); }
                 return;
             }
             delete pickerCfg.hidden;
@@ -2583,9 +2404,7 @@ define([
                         UI.removeLoadingScreen();
                         Feedback.send('TEMPLATE_USED');
                     });
-                    if (focus) {
-                        focus.focus();
-                    }
+                    if (focus) { focus.focus(); }
                     return;
                 }
             });
@@ -2595,9 +2414,7 @@ define([
             if (data) {
                 common.openFilePicker(pickerCfgInit);
                 focus = document.activeElement;
-                if (force) {
-                    return void onConfirm(true);
-                }
+                if (force) { return void onConfirm(true); }
                 UI.confirm(Messages.useTemplate, onConfirm, {
                     ok: Messages.useTemplateOK,
                     cancel: Messages.useTemplateCancel,
@@ -2635,9 +2452,7 @@ define([
     */
     UIElements.getPadCreationScreen = function (common, cfg, appCfg, cb) {
         appCfg = appCfg || {};
-        if (!common.isLoggedIn()) {
-            return void cb();
-        }
+        if (!common.isLoggedIn()) { return void cb(); }
         var sframeChan = common.getSframeChannel();
         var metadataMgr = common.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
@@ -2645,9 +2460,7 @@ define([
         if (privateData.offline) {
             var onChange = function () {
                 var privateData = metadataMgr.getPrivateData();
-                if (privateData.offline) {
-                    return;
-                }
+                if (privateData.offline) { return; }
                 UIElements.getPadCreationScreen(common, cfg, appCfg, cb);
                 metadataMgr.off('change', onChange);
             };
@@ -2660,13 +2473,13 @@ define([
         var fromContent = privateData.fromContent;
 
         var $body = $('body');
-        var $creationContainer = $('<div>', {id: 'cp-creation-container'}).appendTo($body);
+        var $creationContainer = $('<div>', { id: 'cp-creation-container' }).appendTo($body);
         var urlArgs = (Config.requireConf && Config.requireConf.urlArgs) || '';
 
-        var logo = h('img', {src: '/customize/CryptPad_logo.svg?' + urlArgs});
+        var logo = h('img', { src: '/customize/CryptPad_logo.svg?' + urlArgs });
         var fill1 = h('div.cp-creation-fill.cp-creation-logo', logo);
         var fill2 = h('div.cp-creation-fill');
-        var $creation = $('<div>', {id: 'cp-creation', tabindex: 1});
+        var $creation = $('<div>', { id: 'cp-creation', tabindex:1 });
         $creationContainer.append([fill1, $creation, fill2]);
 
         var createHelper = function (href, text) {
@@ -2677,13 +2490,11 @@ define([
 
         // Title
         //$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle));
-        var newPadH3Title = Messages._getKey('creation_new', [Messages.type[type]]);
+        var newPadH3Title = Messages._getKey('creation_new',[Messages.type[type]]);
 
         var early = common.checkRestrictedApp(type);
         var domain = Config.httpUnsafeOrigin || 'CryptPad';
-        if (/^http/.test(domain)) {
-            domain = domain.replace(/^https?\:\/\//, '');
-        }
+        if (/^http/.test(domain)) { domain = domain.replace(/^https?\:\/\//, ''); }
 
         var title = h('div.cp-creation-title', [
             UI.getFileIcon({type: type})[0],
@@ -2727,7 +2538,7 @@ define([
                 return h('div.cp-creation-team', {
                     'data-id': id,
                     title: data.name,
-                }, [
+                },[
                     avatar,
                     h('span.cp-creation-team-name', data.name)
                 ]);
@@ -2755,7 +2566,7 @@ define([
                 teamValue = $(this).attr('data-id');
             });
             if (privateData.storeInTeam) {
-                $team.find('[data-id="' + privateData.storeInTeam + '"]').addClass('cp-selected');
+                $team.find('[data-id="'+privateData.storeInTeam+'"]').addClass('cp-selected');
                 teamValue = privateData.storeInTeam;
             }
         }
@@ -2780,8 +2591,8 @@ define([
                     value: 3
                 }),
                 h('select#cp-creation-expire-unit', [
-                    h('option', {value: 'hour'}, Messages.creation_expireHours),
-                    h('option', {value: 'day'}, Messages.creation_expireDays),
+                    h('option', { value: 'hour' }, Messages.creation_expireHours),
+                    h('option', { value: 'day' }, Messages.creation_expireDays),
                     h('option', {
                         value: 'month',
                         selected: 'selected'
@@ -2837,8 +2648,7 @@ define([
 
         var selected = 0; // Selected template in the list (highlighted)
         var TEMPLATES_DISPLAYED = big ? 6 : 3; // Max templates displayed per page
-        var next = function () {
-        }; // Function called when pressing tab to highlight the next template
+        var next = function () {}; // Function called when pressing tab to highlight the next template
         var i = 0; // Index of the first template displayed in the current page
         sframeChan.query("Q_CREATE_TEMPLATES", type, function (err, res) {
             if (!res.data || !Array.isArray(res.data)) {
@@ -2847,9 +2657,7 @@ define([
             var allData = res.data.slice().sort(function (a, b) {
                 if (a.used === b.used) {
                     // Sort by name
-                    if (a.name === b.name) {
-                        return 0;
-                    }
+                    if (a.name === b.name) { return 0; }
                     return a.name < b.name ? -1 : 1;
                 }
                 return b.used - a.used;
@@ -2869,13 +2677,9 @@ define([
                 icon: UI.getFileIcon({type: type})
             });
             var redraw = function (index) {
-                if (index < 0) {
-                    i = 0;
-                } else if (index > allData.length - 1) {
-                    return;
-                } else {
-                    i = index;
-                }
+                if (index < 0) { i = 0; }
+                else if (index > allData.length - 1) { return; }
+                else { i = index; }
                 var data = allData.slice(i, i + TEMPLATES_DISPLAYED);
                 var $container = $(templates).find('.cp-creation-template-container').html('');
                 data.forEach(function (obj, idx) {
@@ -2885,12 +2689,8 @@ define([
                         'title': name,
                     }).appendTo($container);
                     $span.data('id', obj.id);
-                    if (obj.content) {
-                        $span.data('content', obj.content);
-                    }
-                    if (idx === selected) {
-                        $span.addClass('cp-creation-template-selected');
-                    }
+                    if (obj.content) { $span.data('content', obj.content); }
+                    if (idx === selected) { $span.addClass('cp-creation-template-selected'); }
                     if (!obj.thumbnail) {
                         $span.append(obj.icon || h('span.cptools.cptools-template'));
                     }
@@ -2905,24 +2705,19 @@ define([
 
                     // Add thumbnail if it exists
                     if (obj.thumbnail) {
-                        common.addThumbnail(obj.thumbnail, $span, function () {
-                        });
+                        common.addThumbnail(obj.thumbnail, $span, function () {});
                     }
                 });
                 $(right).off('click').removeClass('hidden').click(function () {
                     selected = 0;
                     redraw(i + TEMPLATES_DISPLAYED);
                 });
-                if (i >= allData.length - TEMPLATES_DISPLAYED) {
-                    $(right).addClass('hidden');
-                }
+                if (i >= allData.length - TEMPLATES_DISPLAYED ) { $(right).addClass('hidden'); }
                 $(left).off('click').removeClass('hidden').click(function () {
                     selected = TEMPLATES_DISPLAYED - 1;
                     redraw(i - TEMPLATES_DISPLAYED);
                 });
-                if (i < TEMPLATES_DISPLAYED) {
-                    $(left).addClass('hidden');
-                }
+                if (i < TEMPLATES_DISPLAYED) { $(left).addClass('hidden'); }
             };
             if (fromFileData) {
                 var todo = function (thumbnail) {
@@ -2936,19 +2731,19 @@ define([
                 };
                 todo();
                 sframeChan.query("Q_GET_FILE_THUMBNAIL", null, function (err, res) {
-                    if (err || (res && res.error)) {
-                        return;
-                    }
+                    if (err || (res && res.error)) { return; }
                     todo(res.data);
                 });
-            } else if (fromContent) {
+            }
+            else if (fromContent) {
                 allData = [{
                     name: fromContent.title,
                     id: 0,
                     icon: h('span.cptools.cptools-poll'),
                 }];
                 redraw(0);
-            } else {
+            }
+            else {
                 redraw(0);
             }
 
@@ -2965,8 +2760,8 @@ define([
                     return void redraw(i - TEMPLATES_DISPLAYED);
                 }
                 selected = revert ?
-                    (--selected < 0 ? 0 : selected) :
-                    ++selected >= max ? max - 1 : selected;
+                            (--selected < 0 ? 0 : selected) :
+                            ++selected >= max ? max-1 : selected;
                 $creation.find('.cp-creation-template-element')
                     .removeClass('cp-creation-template-selected');
                 $($creation.find('.cp-creation-template-element').get(selected))
@@ -2975,9 +2770,7 @@ define([
 
             $w.on('resize', function () {
                 var _big = $w.width() > 800;
-                if (big === _big) {
-                    return;
-                }
+                if (big === _big) { return; }
                 big = _big;
                 if (!big) {
                     $(left).removeClass('fa-chevron-left').addClass('fa-chevron-up');
@@ -3044,26 +2837,19 @@ define([
             var ownedVal = $('#cp-creation-owned').is(':checked') ? 1 : 0;
             // Life time
             var expireVal = 0;
-            if ($('#cp-creation-expire').is(':checked')) {
+            if($('#cp-creation-expire').is(':checked')) {
                 var unit = 0;
                 switch ($('#cp-creation-expire-unit').val()) {
-                    case "hour" :
-                        unit = 3600;
-                        break;
-                    case "day"  :
-                        unit = 3600 * 24;
-                        break;
-                    case "month":
-                        unit = 3600 * 24 * 30;
-                        break;
-                    default:
-                        unit = 0;
+                    case "hour" : unit = 3600;           break;
+                    case "day"  : unit = 3600 * 24;      break;
+                    case "month": unit = 3600 * 24 * 30; break;
+                    default: unit = 0;
                 }
                 expireVal = ($('#cp-creation-expire-val').val() || 0) * unit;
             }
             // Password
             var passwordVal = $('#cp-creation-password').is(':checked') ?
-                $('#cp-creation-password-val').val() : undefined;
+                                $('#cp-creation-password-val').val() : undefined;
 
             var $template = $creation.find('.cp-creation-template-selected');
             var templateId = $template.data('id') || undefined;
@@ -3088,18 +2874,14 @@ define([
             var val = getFormValues();
 
             common.setAttribute(['general', 'creation', 'owned'], val.owned, function (e) {
-                if (e) {
-                    return void console.error(e);
-                }
+                if (e) { return void console.error(e); }
             });
             common.setAttribute(['general', 'creation', 'expire'], val.expire, function (e) {
-                if (e) {
-                    return void console.error(e);
-                }
+                if (e) { return void console.error(e); }
             });
 
             if (val.expire) {
-                Feedback.send('EXPIRING_PAD-' + val.expire);
+                Feedback.send('EXPIRING_PAD-'+val.expire);
             }
 
             $creationContainer.remove();
@@ -3156,13 +2938,9 @@ define([
                 // what if they don't have a keyboard (ie. mobile)
                 msg += Messages.errorCopy;
             }
-            if (toolbar && typeof toolbar.deleted === "function") {
-                toolbar.deleted();
-            }
+            if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
         } else if (err.type === 'EDELETED') {
-            if (priv.burnAfterReading) {
-                return void cb();
-            }
+            if (priv.burnAfterReading) { return void cb(); }
 
             if (autoStoreModal[priv.channel]) {
                 autoStoreModal[priv.channel].delete();
@@ -3187,11 +2965,8 @@ define([
             }
 
             if (err.ownDeletion) {
-                if (toolbar && typeof toolbar.deleted === "function") {
-                    toolbar.deleted();
-                }
-                (cb || function () {
-                })();
+                if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
+                (cb || function () {})();
                 return;
             }
 
@@ -3203,11 +2978,8 @@ define([
                     fromServerError: true,
                     loaded: err.loaded,
                 });
-                if (toolbar && typeof toolbar.deleted === "function") {
-                    toolbar.deleted();
-                }
-                (cb || function () {
-                })();
+                if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
+                (cb || function () {})();
                 return;
             }
 
@@ -3216,28 +2988,21 @@ define([
                 msg += Messages.errorCopy;
             }
 
-            if (toolbar && typeof toolbar.deleted === "function") {
-                toolbar.deleted();
-            }
+            if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
         } else if (err.type === 'ERESTRICTED') {
             msg = Messages.restrictedError;
             if (!common.isLoggedIn()) {
                 msg = UIElements.loginErrorScreenContent(common);
             }
 
-            if (toolbar && typeof toolbar.failed === "function") {
-                toolbar.failed(true);
-            }
+            if (toolbar && typeof toolbar.failed === "function") { toolbar.failed(true); }
         } else if (err.type === 'HASH_NOT_FOUND' && priv.isHistoryVersion) {
             msg = Messages.oo_deletedVersion;
-            if (toolbar && typeof toolbar.failed === "function") {
-                toolbar.failed(true);
-            }
+            if (toolbar && typeof toolbar.failed === "function") { toolbar.failed(true); }
         }
         sframeChan.event('EV_SHARE_OPEN', {hidden: true});
         UI.errorLoadingScreen(msg, Boolean(err.loaded), Boolean(err.loaded));
-        (cb || function () {
-        })();
+        (cb || function () {})();
     };
 
     UIElements.displayPasswordPrompt = function (common, cfg, isError) {
@@ -3304,14 +3069,8 @@ define([
         };
 
 
-        $password.find('.cp-password-input').on('keydown', function (e) {
-            if (e.which === 13) {
-                submit();
-            }
-        });
-        $(button).on('click', function () {
-            submit();
-        });
+        $password.find('.cp-password-input').on('keydown', function (e) { if (e.which === 13) { submit(); } });
+        $(button).on('click', function () { submit(); });
 
 
         var block = h('div#cp-loading-password-prompt', [
@@ -3346,17 +3105,13 @@ define([
     };
     UIElements.getBurnAfterReadingWarning = function (common) {
         var priv = common.getMetadataMgr().getPrivateData();
-        if (!priv.burnAfterReading) {
-            return;
-        }
+        if (!priv.burnAfterReading) { return; }
         return h('div.alert.alert-danger.cp-burn-after-reading', Messages.burnAfterReading_warningDeleted);
     };
 
     var crowdfundingState = false;
     UIElements.displayCrowdfunding = function (common, force) {
-        if (crowdfundingState) {
-            return;
-        }
+        if (crowdfundingState) { return; }
         var priv = common.getMetadataMgr().getPrivateData();
 
 
@@ -3398,23 +3153,15 @@ define([
             return void todo();
         }
 
-        if (AppConfig.disableCrowdfundingMessages) {
-            return;
-        }
-        if (priv.plan) {
-            return;
-        }
+        if (AppConfig.disableCrowdfundingMessages) { return; }
+        if (priv.plan) { return; }
 
         crowdfundingState = true;
         common.getAttribute(['general', 'crowdfunding'], function (err, val) {
-            if (err || val === false) {
-                return;
-            }
+            if (err || val === false) { return; }
             common.getSframeChannel().query('Q_GET_PINNED_USAGE', null, function (err, obj) {
                 var quotaMb = obj.quota / (1024 * 1024);
-                if (quotaMb < 10) {
-                    return;
-                }
+                if (quotaMb < 10) { return; }
                 todo();
             });
         });
@@ -3422,9 +3169,7 @@ define([
 
     var storePopupState = false;
     UIElements.displayStorePadPopup = function (common, data) {
-        if (storePopupState) {
-            return;
-        }
+        if (storePopupState) { return; }
         storePopupState = true;
         // We won't display the popup for dropped files or already stored pads
         if (data && data.stored) {
@@ -3436,14 +3181,12 @@ define([
         var priv = common.getMetadataMgr().getPrivateData();
 
         // This pad will be deleted automatically, it shouldn't be stored
-        if (priv.burnAfterReading) {
-            return;
-        }
+        if (priv.burnAfterReading) { return; }
 
 
         var typeMsg = priv.pathname.indexOf('/file/') !== -1 ? Messages.autostore_file :
-            priv.pathname.indexOf('/drive/') !== -1 ? Messages.autostore_sf :
-                Messages.autostore_pad;
+                        priv.pathname.indexOf('/drive/') !== -1 ? Messages.autostore_sf :
+                          Messages.autostore_pad;
         var text = Messages._getKey('autostore_notstored', [typeMsg]);
         var footer = Pages.setHTML(h('span'), Messages.autostore_settings);
 
@@ -3478,9 +3221,7 @@ define([
         });
         var waitingForStoringCb = false;
         $(store).click(function () {
-            if (waitingForStoringCb) {
-                return;
-            }
+            if (waitingForStoringCb) { return; }
             waitingForStoringCb = true;
             common.getSframeChannel().query("Q_AUTOSTORE_STORE", null, function (err, obj) {
                 waitingForStoringCb = false;
@@ -3580,9 +3321,7 @@ define([
         var buttons = [{
             name: Messages.friendRequest_later,
             onClick: function () {
-                if (clicked) {
-                    return true;
-                }
+                if (clicked) { return true; }
                 clicked = true;
                 Feedback.send('LINK_RECEIVED_LATER');
             },
@@ -3591,9 +3330,7 @@ define([
             className: 'primary',
             name: Messages.fc_open,
             onClick: function () {
-                if (clicked) {
-                    return true;
-                }
+                if (clicked) { return true; }
                 clicked = true;
                 common.openUnsafeURL(url);
                 Feedback.send("LINK_RECEIVED_OPEN");
@@ -3603,9 +3340,7 @@ define([
             className: 'primary',
             name: Messages.toolbar_storeInDrive,
             onClick: function () {
-                if (clicked) {
-                    return;
-                }
+                if (clicked) { return; }
                 clicked = true;
                 common.getSframeChannel().query("Q_DRIVE_USEROBJECT", {
                     cmd: "addLink",
@@ -3644,7 +3379,7 @@ define([
         $(link).click(function (e) {
             e.preventDefault();
             e.stopPropagation();
-            var obj = {pw: msg.content.password || ''};
+            var obj = { pw: msg.content.password || '' };
             common.openURL(Hash.getNewPadURL(msg.content.href, obj));
         });
 
@@ -3655,9 +3390,7 @@ define([
 
         var dismiss = function () {
             common.mailbox.dismiss(data, function (err) {
-                if (err) {
-                    console.log(err);
-                }
+                if (err) { console.log(err); }
             });
         };
         var answer = function (yes) {
@@ -3687,7 +3420,7 @@ define([
                     err = err || (res && res.error);
                     if (err) {
                         var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                            : Messages.error;
+                                                                      : Messages.error;
                         console.error(err);
                         dismiss();
                         return void UI.warn(text);
@@ -3715,7 +3448,7 @@ define([
                             }
                         });
                     } else {
-                        sframeChan.query('Q_ACCEPT_OWNERSHIP', data, function (err, res) {
+                        sframeChan.query('Q_ACCEPT_OWNERSHIP', data, function (err, res) {
                             if (err || (res && res.error)) {
                                 return void console.error(err | res.error);
                             }
@@ -3786,9 +3519,7 @@ define([
                 curvePublic: msg.content.user.curvePublic
             });
             common.mailbox.dismiss(data, function (err) {
-                if (err) {
-                    console.log(err);
-                }
+                if (err) { console.log(err); }
             });
         };
         var module = common.makeUniversal('team');
@@ -3801,9 +3532,7 @@ define([
                 value: [priv.edPublic]
             }, function (err, res) {
                 err = err || (res && res.error);
-                if (!err) {
-                    return;
-                }
+                if (!err) { return; }
                 waitFor.abort();
                 cb(err);
             });
@@ -3816,9 +3545,7 @@ define([
                 value: [priv.edPublic]
             }, waitFor(function (err, res) {
                 err = err || (res && res.error);
-                if (!err) {
-                    return;
-                }
+                if (!err) { return; }
                 waitFor.abort();
                 cb(err);
             }));
@@ -3830,9 +3557,7 @@ define([
                 f(msg.content.teamChannel, waitFor, cb);
                 f(msg.content.chatChannel, waitFor, cb);
                 f(msg.content.rosterChannel, waitFor, cb);
-            }).nThen(function () {
-                cb();
-            });
+            }).nThen(function () { cb(); });
         };
 
         var todo = function (yes) {
@@ -3842,7 +3567,7 @@ define([
                     if (err) {
                         console.error(err);
                         var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                            : Messages.error;
+                                                                      : Messages.error;
                         return void UI.warn(text);
                     }
                     UI.log(Messages.saved);
@@ -3855,16 +3580,12 @@ define([
                         teamChannel: msg.content.teamChannel,
                         answer: true
                     }, function (obj) {
-                        if (obj && obj.error) {
-                            console.error(obj.error);
-                        }
+                        if (obj && obj.error) { console.error(obj.error); }
                     });
 
                     // Remove yourself from the pending owners
                     changeAll(false, function (err) {
-                        if (err) {
-                            console.error(err);
-                        }
+                        if (err) { console.error(err); }
                     });
                 });
                 return;
@@ -3873,9 +3594,7 @@ define([
             // DECLINE
             // Remove yourself from the pending owners
             changeAll(false, function (err) {
-                if (err) {
-                    console.error(err);
-                }
+                if (err) { console.error(err); }
                 // Send notification to the sender
                 answer(false);
                 // Set our role back to ADMIN
@@ -3883,9 +3602,7 @@ define([
                     teamChannel: msg.content.teamChannel,
                     answer: false
                 }, function (obj) {
-                    if (obj && obj.error) {
-                        console.error(obj.error);
-                    }
+                    if (obj && obj.error) { console.error(obj.error); }
                 });
             });
         };
@@ -3917,7 +3634,7 @@ define([
         var msg = data.content.msg;
 
         var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
-        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
+        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
 
         var verified = UIElements.getVerifiedFriend(common, msg.author, name);
 
@@ -3958,16 +3675,13 @@ define([
                 }, function (obj) {
                     if (obj && obj.error) {
                         if (obj.error === 'ENOENT') {
-                            common.mailbox.dismiss(data, function () {
-                            });
+                            common.mailbox.dismiss(data, function () {});
                             return void UI.alert(Messages.deletedError);
                         }
                         return void UI.warn(Messages.error);
                     }
                     answer(true);
-                    if (priv.app !== 'teams') {
-                        common.openURL('/teams/');
-                    }
+                    if (priv.app !== 'teams') { common.openURL('/teams/'); }
                 });
                 return;
             }
@@ -3995,13 +3709,9 @@ define([
     getSource['contacts'] = function (common, sources) {
         var priv = common.getMetadataMgr().getPrivateData();
         Object.keys(priv.friends || {}).forEach(function (key) {
-            if (key === 'me') {
-                return;
-            }
+            if (key === 'me') { return; }
             var f = priv.friends[key];
-            if (!f.curvePublic || sources[f.curvePublic]) {
-                return;
-            }
+            if (!f.curvePublic || sources[f.curvePublic]) { return; }
             sources[f.curvePublic] = {
                 avatar: f.avatar,
                 name: f.displayName,
@@ -4013,52 +3723,35 @@ define([
         });
     };
     UIElements.addMentions = function (common, options) {
-        if (!options.$input) {
-            return;
-        }
+        if (!options.$input) { return; }
         var $t = options.$input;
 
-        var getValue = function () {
-            return $t.val();
-        };
-        var setValue = function (val) {
-            $t.val(val);
-        };
+        var getValue = function () { return $t.val(); };
+        var setValue = function (val) { $t.val(val); };
 
         var div = false;
         if (options.contenteditable) {
             div = true;
-            getValue = function () {
-                return $t.html();
-            };
-            setValue = function () {
-            }; // Not used, we insert data at the node level
+            getValue = function () { return $t.html(); };
+            setValue = function () {}; // Not used, we insert data at the node level
             $t.on('paste', function (e) {
                 try {
                     insertTextAtCursor(e.originalEvent.clipboardData.getData('text'));
                     e.preventDefault();
-                } catch (err) {
-                    console.error(err);
-                }
+                } catch (err) { console.error(err); }
             });
 
             // Fix backspace with "contenteditable false" children
             $t.on('keydown', function (e) {
-                if (e.which !== 8 && e.which !== 46) {
-                    return;
-                } // Backspace or del
+                if (e.which !== 8 && e.which !== 46) { return; } // Backspace or del
                 var sel = document.getSelection();
-                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) {
-                    return;
-                } // text nodes only
+                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) { return; } // text nodes only
 
                 // Only fix node located after mentions
                 var n = sel.anchorNode;
                 var prev = n && n.previousSibling;
                 // Check if our caret is just after a mention
-                if (!prev || !prev.classList || !prev.classList.contains('cp-mentions')) {
-                    return;
-                }
+                if (!prev || !prev.classList || !prev.classList.contains('cp-mentions')) { return; }
 
                 // Del: if we're at offset 0, make sure we won't delete the text node
                 if (e.which === 46) {
@@ -4087,9 +3780,7 @@ define([
         // Add the sources
         // NOTE: Sources must have a "name". They can have an "avatar".
         var sources = options.sources || {};
-        if (!getSource[options.type]) {
-            return;
-        }
+        if (!getSource[options.type]) { return; }
         getSource[options.type](common, sources);
 
 
@@ -4097,31 +3788,25 @@ define([
         var sort = function (a, b) {
             var _a = a.label.toLowerCase();
             var _b = b.label.toLowerCase();
-            if (_a.label < _b.label) {
-                return -1;
-            }
-            if (_b.label < _a.label) {
-                return 1;
-            }
+            if (_a.label < _b.label) { return -1; }
+            if (_b.label < _a.label) { return 1; }
             return 0;
         };
 
         // Get the text between the last @ before the cursor and the cursor
         var extractLast = function (term, offset) {
-            offset = typeof (offset) !== "undefined" ? offset : $t[0].selectionStart;
-            var startOffset = term.slice(0, offset).lastIndexOf('@');
-            return term.slice(startOffset + 1, offset);
+            offset = typeof(offset) !== "undefined" ? offset : $t[0].selectionStart;
+            var startOffset = term.slice(0,offset).lastIndexOf('@');
+            return term.slice(startOffset+1, offset);
         };
         // Insert the autocomplete value in the input field
         var insertValue = function (value, offset, content) {
-            offset = typeof (offset) !== "undefined" ? offset : $t[0].selectionStart;
+            offset = typeof(offset) !== "undefined" ? offset : $t[0].selectionStart;
             content = content || getValue();
-            var startOffset = content.slice(0, offset).lastIndexOf('@');
+            var startOffset = content.slice(0,offset).lastIndexOf('@');
             var length = offset - startOffset;
-            if (length <= 0) {
-                return;
-            }
-            var result = content.slice(0, startOffset) + value + content.slice(offset);
+            if (length <= 0) { return; }
+            var result = content.slice(0,startOffset) + value + content.slice(offset);
             if (content) {
                 return {
                     result: result,
@@ -4133,7 +3818,7 @@ define([
         // Set the value to receive from the autocomplete
         var toInsert = function (data, key) {
             var name = UI.getDisplayName(data.name.replace(/[^a-zA-Z0-9]+/g, "-"));
-            return "[@" + name + "|" + key + "]";
+            return "[@"+name+"|"+key+"]";
         };
 
         // Fix the functions when suing a contenteditable div
@@ -4142,33 +3827,26 @@ define([
             // Use getSelection to get the cursor position in contenteditable
             extractLast = function () {
                 var sel = document.getSelection();
-                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) {
-                    return;
-                }
+                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) { return; }
                 return _extractLast(sel.anchorNode.nodeValue, sel.anchorOffset);
             };
             var _insertValue = insertValue;
-            insertValue = function (value) {
+            insertValue = function (value) {
                 // Get the selected node
                 var sel = document.getSelection();
-                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) {
-                    return;
-                }
+                if (sel.anchorNode.nodeType !== Node.TEXT_NODE) { return; }
                 var node = sel.anchorNode;
 
                 // Remove the "term"
-                var insert = _insertValue("", sel.anchorOffset, node.nodeValue);
+                var insert =_insertValue("", sel.anchorOffset, node.nodeValue);
                 if (insert) {
                     node.nodeValue = insert.result;
                 }
                 var breakAt = insert ? insert.startOffset : sel.anchorOffset;
 
                 var el;
-                if (typeof (value) === "string") {
-                    el = document.createTextNode(value);
-                } else {
-                    el = value;
-                }
+                if (typeof(value) === "string") { el = document.createTextNode(value); }
+                else { el = value; }
 
                 node.parentNode.insertBefore(el, node.splitText(breakAt));
                 var next = el.nextSibling;
@@ -4213,7 +3891,7 @@ define([
 
 
         // don't navigate away from the field on tab when selecting an item
-        $t.on("keydown", function (e) {
+        $t.on("keydown", function(e) {
             // Tab or enter
             if ((e.which === 13 || e.which === 9)) {
                 try {
@@ -4222,17 +3900,15 @@ define([
                         e.preventDefault();
                         e.stopPropagation();
                     }
-                } catch (err) {
-                    console.error(err, $t);
-                }
+                } catch (err) { console.error(err, $t); }
             }
         }).autocomplete({
             minLength: 0,
-            source: function (data, cb) {
+            source: function(data, cb) {
                 var term = data.term;
                 var results = [];
                 if (term.indexOf("@") >= 0) {
-                    term = extractLast(data.term) || '';
+                    term = extractLast(data.term) || '';
                     results = Object.keys(sources).filter(function (key) {
                         var data = sources[key];
                         return data.name.toLowerCase().indexOf(term.toLowerCase()) !== -1;
@@ -4253,16 +3929,15 @@ define([
                     var menu = $t.autocomplete("instance").menu.activeMenu;
                     menu.css({
                         'overflow-y': 'auto',
-                        'max-height': (max - pos.bottom) + 'px'
+                        'max-height': (max-pos.bottom)+'px'
                     });
-                } catch (e) {
-                }
+                } catch (e) {}
             },
-            focus: function () {
+            focus: function() {
                 // prevent value inserted on focus
                 return false;
             },
-            select: function (event, ui) {
+            select: function(event, ui) {
                 // add the selected item
                 var key = ui.item.value;
                 var data = sources[key];
@@ -4270,12 +3945,10 @@ define([
                 insertValue(value);
                 return false;
             }
-        }).autocomplete("instance")._renderItem = function (ul, item) {
+        }).autocomplete( "instance" )._renderItem = function( ul, item ) {
             var key = item.value;
             var obj = sources[key];
-            if (!obj) {
-                return;
-            }
+            if (!obj) { return; }
             var avatar = h('span.cp-avatar');
             var displayName = UI.getDisplayName(obj.name);
 
@@ -4296,20 +3969,15 @@ define([
 
     UIElements.is24h = function () {
         try {
-            return !new Intl.DateTimeFormat(navigator.language, {hour: 'numeric'}).format(0).match(/AM/);
-        } catch (e) {
-        }
+            return !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
+        } catch (e) {}
         return false;
     };
 
     UIElements.fixInlineBRs = function (htmlString) {
-        if (!htmlString && typeof (htmlString) === 'string') {
-            return;
-        }
+        if (!htmlString && typeof(htmlString) === 'string') { return; }
         var lines = htmlString.split('<br>');
-        if (lines.length === 1) {
-            return lines;
-        }
+        if (lines.length === 1) { return lines; }
         var len = lines.length - 1;
         var result = [];
         for (var i = 0; i <= len; i++) {
@@ -4325,7 +3993,7 @@ define([
         var modal;
         var readOnly = common.getMetadataMgr().getPrivateData().readOnly;
 
-        var container = h('div.cp-snapshots-container', {tabindex: 1});
+        var container = h('div.cp-snapshots-container', {tabindex:1});
         var $container = $(container);
 
         var input = h('input', {
@@ -4343,7 +4011,7 @@ define([
         var refresh = function () {
             var metadataMgr = common.getMetadataMgr();
             var md = metadataMgr.getMetadata();
-            var snapshots = md.snapshots || {};
+            var snapshots = md.snapshots || {};
 
             var list = Object.keys(snapshots).sort(function (h1, h2) {
                 var s1 = snapshots[h1];
@@ -4378,7 +4046,7 @@ define([
                     refresh();
                 });
 
-                return h('span.cp-snapshot-element', {tabindex: 1}, [
+                return h('span.cp-snapshot-element', {tabindex:1}, [
                     h('i.fa.fa-camera'),
                     h('span.cp-snapshot-title', [
                         h('span', s.title),
@@ -4393,9 +4061,7 @@ define([
 
             $container.html('').append(list);
             setTimeout(function () {
-                if (list.length) {
-                    return void $container.focus();
-                }
+                if (list.length) { return void $container.focus(); }
                 $input.focus();
             });
         };
@@ -4404,8 +4070,7 @@ define([
         var buttons = [{
             className: 'cancel',
             name: Messages.filePicker_close,
-            onClick: function () {
-            },
+            onClick: function () {},
             keys: [27],
         }];
         if (!readOnly) {
@@ -4415,9 +4080,7 @@ define([
                 name: Messages.snapshots_new,
                 onClick: function () {
                     var val = $input.val();
-                    if (!val) {
-                        return true;
-                    }
+                    if (!val) { return true; }
                     $container.html('').append(h('div.cp-snapshot-spinner'));
                     var to = setTimeout(function () {
                         UI.spinner($container.find('div')).get().show();
@@ -4436,7 +4099,7 @@ define([
             });
         }
 
-        modal = UI.openCustomModal(UI.dialog.customModal(content, {buttons: buttons}));
+        modal = UI.openCustomModal(UI.dialog.customModal(content, {buttons: buttons }));
     };
 
     return UIElements;

From 5c63cafefae0d064a2a488e7e8390351b96f4911 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 17 Nov 2023 14:10:05 +0100
Subject: [PATCH 67/87] Revert autoformatting on "navigation inside dropdown
 works correctly"

This partially reverts commit ebfafea3267d71bfd71e033edc61d68bedec4d91.
---
 package-lock.json     | 475 +++++++++++++++++++++++++++++-------------
 www/common/toolbar.js | 397 ++++++++++++-----------------------
 2 files changed, 464 insertions(+), 408 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51f93cf61..189259d0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,9 +106,9 @@
       }
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.13",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
-      "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
+      "version": "1.17.12",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz",
+      "integrity": "sha512-kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -120,12 +120,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.8.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz",
-      "integrity": "sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
+      "version": "20.6.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz",
+      "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA=="
     },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.10",
@@ -795,13 +792,12 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dependencies": {
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -949,17 +945,66 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/cli": {
@@ -1176,19 +1221,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
@@ -1312,9 +1344,9 @@
       }
     },
     "node_modules/drawio": {
-      "name": "drawio-cp-npm",
+      "name": "drawio-cp",
       "version": "21.7.5",
-      "resolved": "git+ssh://git@github.com/cryptpad/drawio-npm.git#3d33ff2b65289dd92c03be16dfcde4cdaf77e516"
+      "resolved": "git+ssh://git@github.com/cryptpad/drawio-npm.git#b430ab78be9944f19721c3489c9ce95bc1abe2ca"
     },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
@@ -1429,17 +1461,66 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/express": {
@@ -1805,12 +1886,9 @@
       "dev": true
     },
     "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/gar": {
       "version": "1.0.4",
@@ -1830,14 +1908,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dependencies": {
-        "function-bind": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "has-symbols": "^1.0.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1936,31 +2014,20 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz",
       "integrity": "sha512-zGRpnr2l5w/s8PxkrquUJoVeR06KvqPelrYqiSyQV7QEBqCYivpb6UzXYWC6JDBVtNFOT0rzJRFhkfJgxzmILA=="
     },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "function-bind": "^1.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4.0"
       }
     },
     "node_modules/has-proto": {
@@ -2048,17 +2115,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/html2canvas": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
@@ -2216,14 +2272,22 @@
       }
     },
     "node_modules/is-accessor-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
-      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "kind-of": "^6.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-arrayish": {
@@ -2238,26 +2302,43 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "node_modules/is-data-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
-      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "kind-of": "^6.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-directory": {
@@ -3047,16 +3128,47 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/object-copy/node_modules/kind-of": {
@@ -3071,9 +3183,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3828,20 +3940,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
-      "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/set-getter": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
@@ -3983,17 +4081,66 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/snapdragon/node_modules/source-map": {
@@ -4114,16 +4261,61 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/statuses": {
@@ -4397,11 +4589,6 @@
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
     },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index a0772880e..655d9e7e8 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -14,7 +14,7 @@ define([
     '/customize/messages.js',
     '/customize/pages.js',
 ], function ($, Config, ApiConfig, Broadcast, UIElements, UI, Hash, Util, Feedback, MT, h,
-             MessengerUI, Messages, Pages) {
+MessengerUI, Messages, Pages) {
     var Common;
 
     var Bar = {
@@ -52,8 +52,7 @@ define([
     // User admin menu
     var USERADMIN_CLS = Bar.constants.user = 'cp-toolbar-user-dropdown';
     var USERNAME_CLS = Bar.constants.username = 'cp-toolbar-user-name';
-    /*var READONLY_CLS = */
-    Bar.constants.readonly = 'cp-toolbar-readonly';
+    /*var READONLY_CLS = */Bar.constants.readonly = 'cp-toolbar-readonly';
     var USERBUTTON_CLS = Bar.constants.changeUsername = "cp-toolbar-user-rename";
 
     // Create the toolbar element
@@ -64,23 +63,17 @@ define([
 
     var observeChildren = function ($content) {
         var reorderDOM = Util.throttle(function ($content, observer) {
-            if (!$content.length) {
-                return;
-            }
+            if (!$content.length) { return; }
 
             // List all children based on their "order" property
             var map = {};
             $content[0].childNodes.forEach((node) => {
                 try {
-                    if (!node.attributes) {
-                        return;
-                    }
+                    if (!node.attributes) { return; }
                     var order = getComputedStyle(node).getPropertyValue("order");
                     var a = map[order] = map[order] || [];
                     a.push(node);
-                } catch (e) {
-                    console.error(e, node);
-                }
+                } catch (e) { console.error(e, node); }
             });
 
             // Disconnect the observer while we're reordering to avoid infinite loop
@@ -89,9 +82,7 @@ define([
                 return Number(a) - Number(b);
             }).forEach(function (k) {
                 var arr = map[k];
-                if (!Number(k)) {
-                    return;
-                } // No need to "append" if order is 0
+                if (!Number(k)) { return; } // No need to "append" if order is 0
                 // Reorder
                 arr.forEach(function (node) {
                     $content.append(node);
@@ -100,8 +91,8 @@ define([
             observer.start();
         }, 100);
 
-        let observer = new MutationObserver(function (mutations) {
-            mutations.forEach(function (mutation) {
+        let observer = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
                 if (mutation.addedNodes.length) {
                     reorderDOM($content, observer);
                 }
@@ -116,14 +107,12 @@ define([
     };
 
     var createRealtimeToolbar = function (config) {
-        if (!config.$container) {
-            return;
-        }
+        if (!config.$container) { return; }
         var $container = config.$container;
 
         var priv = config.metadataMgr.getPrivateData();
         var isEmbed = Bar.isEmbed = priv.isEmbed ||
-            (priv.app === 'form' && priv.readOnly && !priv.form_auditorHash);
+                (priv.app === 'form' && priv.readOnly && !priv.form_auditorHash);
         if (isEmbed) {
             $container.hide();
         }
@@ -144,22 +133,22 @@ define([
         $('<span>', {'class': USERADMIN_CLS + ' cp-dropdown-container'}).hide().appendTo($userContainer);
 
         $toolbar.append($topContainer);
-        var $bottom = $(h('div.' + BOTTOM_CLS, [
-            h('div.' + BOTTOM_LEFT_CLS),
-            h('div.' + BOTTOM_MID_CLS),
-            h('div.' + BOTTOM_RIGHT_CLS)
+        var $bottom = $(h('div.'+BOTTOM_CLS, [
+            h('div.'+BOTTOM_LEFT_CLS),
+            h('div.'+BOTTOM_MID_CLS),
+            h('div.'+BOTTOM_RIGHT_CLS)
         ])).appendTo($toolbar);
-        $toolbar.append(h('div.' + HISTORY_CLS));
-        $toolbar.append(h('div.' + SNAPSHOTS_CLS));
+        $toolbar.append(h('div.'+HISTORY_CLS));
+        $toolbar.append(h('div.'+SNAPSHOTS_CLS));
 
-        var $file = $toolbar.find('.' + BOTTOM_LEFT_CLS);
+        var $file = $toolbar.find('.'+BOTTOM_LEFT_CLS);
 
         if (!config.hideDrawer) {
             var $drawer = $(h('button.' + FILE_CLS, [
                 h('i.fa.fa-file-o'),
                 h('span.cp-button-name', Messages.toolbar_file)
             ])).appendTo($file).hide();
-            var $drawerContent = $(h('div.' + DRAWER_CLS, {tabindex: 1})).hide();
+            var $drawerContent = $(h('div.'+ DRAWER_CLS, {tabindex: 1})).hide();
             UI.createDrawer($drawer, $drawerContent);
         }
 
@@ -179,7 +168,7 @@ define([
 
     // Userlist elements
 
-    var getOtherUsers = function (config) {
+    var getOtherUsers = function(config) {
         //var userList = config.userList.getUserlist();
         var userData = config.metadataMgr.getMetadata().users;
 
@@ -188,20 +177,16 @@ define([
 
         // Display only one time each user (if he is connected in multiple tabs)
         var uids = [];
-        Object.keys(userData).forEach(function (user) {
+        Object.keys(userData).forEach(function(user) {
             //if (user !== userNetfluxId) {
-            var data = userData[user] || {};
-            var userId = data.uid;
-            if (!userId) {
-                return;
-            }
-            //data.netfluxId = user;
-            if (uids.indexOf(userId) === -1) {// && (!myUid || userId !== myUid)) {
-                uids.push(userId);
-                list.push(data);
-            } else {
-                i++;
-            }
+                var data = userData[user] || {};
+                var userId = data.uid;
+                if (!userId) { return; }
+                //data.netfluxId = user;
+                if (uids.indexOf(userId) === -1) {// && (!myUid || userId !== myUid)) {
+                    uids.push(userId);
+                    list.push(data);
+                } else { i++; }
             //}
         });
         return {
@@ -224,12 +209,8 @@ define([
     };
     var showColors = false;
     var updateUserList = function (toolbar, config, forceOffline) {
-        if (!config.displayed || config.displayed.indexOf('userlist') === -1) {
-            return;
-        }
-        if (toolbar.isAlone) {
-            return;
-        }
+        if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
+        if (toolbar.isAlone) { return; }
         // Make sure the elements are displayed
         var $userButtons = toolbar.userlist;
         var $userlistContent = toolbar.userlistContent;
@@ -273,11 +254,12 @@ define([
         }
 
 
+
         // Update the userlist
         var $editUsers = $userlistContent.find('.' + USERLIST_CLS).html('');
 
         var $editUsersList = $('<div>', {'class': 'cp-toolbar-userlist-others'})
-            .appendTo($editUsers);
+                                .appendTo($editUsers);
 
         var degradedLimit = Config.degradedLimit || 8;
         if (toolbar.isDeleted) {
@@ -300,13 +282,9 @@ define([
         var $spansmall = $('<span>').html(fa_editusers + ' ' + numberOfEditUsers + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers);
         $userButtons.find('.cp-dropdown-button-title').html('').append($spansmall);
 
-        if (!online || toolbar.isDeleted) {
-            return;
-        }
+        if (!online || toolbar.isDeleted) { return; }
 
-        if (metadataMgr.isDegraded() === true) {
-            return;
-        }
+        if (metadataMgr.isDegraded() === true) { return; }
 
         // Display the userlist
 
@@ -332,10 +310,7 @@ define([
                         'class': 'fa fa-pencil cp-toolbar-userlist-button',
                         title: Messages.user_rename
                     }).appendTo($nameSpan);
-                    $button.hover(function (e) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                    });
+                    $button.hover(function (e) { e.preventDefault(); e.stopPropagation(); });
                     $button.mouseenter(function (e) {
                         e.preventDefault();
                         e.stopPropagation();
@@ -378,10 +353,8 @@ define([
                         $button.click();
                         $nameInput.val(editingUserName.value);
                         $nameInput[0].setSelectionRange(editingUserName.select[0],
-                            editingUserName.select[1]);
-                        setTimeout(function () {
-                            $nameInput.focus();
-                        });
+                                                     editingUserName.select[1]);
+                        setTimeout(function () { $nameInput.focus(); });
                     }
                 }
             } else if (Common.isLoggedIn() && data.curvePublic && !friends[data.curvePublic]
@@ -432,7 +405,7 @@ define([
                 $span.addClass('cp-userlist-clickable');
                 $span.attr('title', Messages._getKey('userlist_visitProfile', [name]));
                 $span.click(function () {
-                    Common.openURL(origin + '/profile/#' + data.profile);
+                    Common.openURL(origin+'/profile/#' + data.profile);
                 });
             }
             Common.displayAvatar($span, data.avatar, name, function () {
@@ -455,12 +428,8 @@ define([
         if (config.metadataMgr) {
             var metadataMgr = config.metadataMgr;
             metadataMgr.onChange(function () {
-                if (metadataMgr.isConnected()) {
-                    toolbar.connected = true;
-                }
-                if (!toolbar.connected) {
-                    return;
-                }
+                if (metadataMgr.isConnected()) {toolbar.connected = true;}
+                if (!toolbar.connected) { return; }
                 updateUserList(toolbar, config);
             });
             setTimeout(function () {
@@ -490,7 +459,7 @@ define([
         var $container = $('<span>', {id: 'cp-toolbar-userlist-drawer-open', title: Messages.userListButton});
 
         var $button = $('<button>').appendTo($container);
-        $('<span>', {'class': 'cp-dropdown-button-title'}).appendTo($button);
+        $('<span>',{'class': 'cp-dropdown-button-title'}).appendTo($button);
 
         toolbar.$bottomR.prepend($container);
 
@@ -503,10 +472,7 @@ define([
             $button.removeClass('cp-toolbar-button-active');
         };
         var show = function () {
-            if (Bar.isEmbed) {
-                $content.hide();
-                return;
-            }
+            if (Bar.isEmbed) { $content.hide(); return; }
             $content.show();
             $button.addClass('cp-toolbar-button-active');
         };
@@ -518,18 +484,15 @@ define([
         */
         $button.click(function () {
             var visible = $content.is(':visible');
-            if (visible) {
-                hide();
-            } else {
-                show();
-            }
+            if (visible) { hide(); }
+            else { show(); }
             visible = !visible;
             Common.setAttribute(['toolbar', 'userlist-drawer'], visible);
-            Feedback.send(visible ? 'USERLIST_SHOW' : 'USERLIST_HIDE');
+            Feedback.send(visible?'USERLIST_SHOW': 'USERLIST_HIDE');
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || window.innerWidth < 800) {
+            if (val === false || window.innerWidth < 800)  {
                 return void hide();
             }
             show();
@@ -544,7 +507,7 @@ define([
         var down = h('i.fa.fa-chevron-down', {title: Messages.toolbar_expand});
         var notif = h('span.cp-collapsed-notif');
 
-        var $button = $(h('button.cp-toolbar-collapse', [
+        var $button = $(h('button.cp-toolbar-collapse',[
             up,
             down,
             notif
@@ -580,9 +543,7 @@ define([
         if (!config.metadataMgr) {
             throw new Error("You must provide a `metadataMgr` to display the chat");
         }
-        if (Config.availablePadTypes.indexOf('contacts') === -1) {
-            return;
-        }
+        if (Config.availablePadTypes.indexOf('contacts') === -1) { return; }
         var $content = $('<div>', {'class': 'cp-toolbar-chat-drawer'});
         $content.on('drop dragover', function (e) {
             e.preventDefault();
@@ -617,10 +578,7 @@ define([
             config.$contentContainer.removeClass('cp-chat-visible');
         };
         var show = function () {
-            if (Bar.isEmbed) {
-                $content.hide();
-                return;
-            }
+            if (Bar.isEmbed) { $content.hide(); return; }
             $content.show();
             // scroll down chat
             var $messagebox = $content.find('.cp-app-contacts-messages');
@@ -640,11 +598,8 @@ define([
         */
         $button.click(function () {
             var visible = $content.is(':visible');
-            if (visible) {
-                hide(true);
-            } else {
-                show();
-            }
+            if (visible) { hide(true); }
+            else { show(); }
             visible = !visible;
             Common.setAttribute(['toolbar', 'chat-drawer'], visible);
         });
@@ -681,8 +636,8 @@ define([
             }
             var privateData = config.metadataMgr.getPrivateData();
             var title = (config.title && config.title.getTitle && config.title.getTitle())
-                || (config.title && config.title.defaultName)
-                || "";
+                        || (config.title && config.title.defaultName)
+                        || "";
             Common.getSframeChannel().event('EV_SHARE_OPEN', {
                 title: title,
                 auditorHash: privateData.form_auditorHash
@@ -711,8 +666,8 @@ define([
                 return void UI.warn(Messages.deletedFromServer);
             }
             var title = (config.title && config.title.getTitle && config.title.getTitle())
-                || (config.title && config.title.defaultName)
-                || "";
+                        || (config.title && config.title.defaultName)
+                        || "";
             Common.getSframeChannel().event('EV_ACCESS_OPEN', {
                 title: title
             });
@@ -739,7 +694,7 @@ define([
         });
         $shareBlock.click(function () {
             var title = (config.title && config.title.getTitle && config.title.getTitle())
-                || "";
+                        || "";
             Common.getSframeChannel().event('EV_SHARE_OPEN', {
                 title: title,
                 file: true
@@ -780,11 +735,11 @@ define([
         }).hide();
         if (config.readOnly === 1) {
             $hoverable.append($('<span>', {'class': 'cp-toolbar-title-readonly'})
-                .text('(' + Messages.readonly + ')'));
+                .text('('+Messages.readonly+')'));
             return $titleContainer;
         }
         $hoverable.append($('<span>', {'class': 'cp-toolbar-title-readonly cp-toolbar-title-unsync'})
-            .text('(' + Messages.readonly + ')'));
+            .text('('+Messages.readonly+')'));
         var $input = $('<input>', {
             type: 'text',
             placeholder: placeholder,
@@ -813,17 +768,13 @@ define([
             return true;
         });
         var save = function () {
-            if (toolbar.history) {
-                return;
-            }
+            if (toolbar.history) { return; }
             var name = $input.val().trim();
             if (name === "") {
                 name = $input.attr('placeholder');
             }
             updateTitle(name, function (err/*, newtitle*/) {
-                if (err) {
-                    return console.error(err);
-                }
+                if (err) { return console.error(err); }
                 //$text.text(newtitle);
                 $input.hide();
                 $text.show();
@@ -847,13 +798,9 @@ define([
         $saveIcon.click(save);
 
         var displayInput = function () {
-            if (toolbar.connected === false) {
-                return;
-            }
-            if (toolbar.history) {
-                return;
-            }
-            $input.width(Math.max(($text.width() + 10), 300) + 'px');
+            if (toolbar.connected === false) { return; }
+            if (toolbar.history) { return; }
+            $input.width(Math.max(($text.width() + 10), 300)+'px');
             $text.hide();
             //$pencilIcon.css('display', 'none');
             var inputVal = suggestName() || "";
@@ -882,9 +829,7 @@ define([
 
 
     var createPageTitle = function (toolbar, config) {
-        if (!config.pageTitle) {
-            return;
-        }
+        if (!config.pageTitle) { return; }
         var $titleContainer = $('<span>', {
             'class': TITLE_CLS
         }).appendTo(toolbar.$top);
@@ -918,7 +863,7 @@ define([
         var isAnonSF = privateData.newSharedFolder && !privateData.accountName;
         var toMain = inDrive.test(pathname) && !isAnonSF;
 
-        var href = toMain ? origin + '/index.html' : origin + '/drive/';
+        var href = toMain ? origin+'/index.html' : origin+'/drive/';
         var buttonTitle = toMain ? Messages.header_homeTitle : Messages.header_logoTitle;
         var $aTag = $('<a>', {
             href: href,
@@ -937,9 +882,7 @@ define([
             Common.gotoURL(href);
         };
 
-        var onContext = function (e) {
-            e.stopPropagation();
-        };
+        var onContext = function (e) { e.stopPropagation(); };
 
         $aTag.click(onClick).contextmenu(onContext);
 
@@ -950,37 +893,25 @@ define([
 
     var typing = -1;
     var kickSpinner = function (toolbar, config/*, local*/) {
-        if (!toolbar.spinner) {
-            return;
-        }
-        if (toolbar.isErrorState) {
-            return;
-        }
+        if (!toolbar.spinner) { return; }
+        if (toolbar.isErrorState) { return; }
         var $spin = toolbar.spinner;
 
         if (typing === -1) {
             typing = 1;
             $spin.text(Messages.typing);
             $spin.interval = window.setInterval(function () {
-                if (toolbar.isErrorState) {
-                    return;
-                }
-                var dots = Array(typing + 1).join('.');
+                if (toolbar.isErrorState) { return; }
+                var dots = Array(typing+1).join('.');
                 $spin.text(Messages.typing + dots);
                 typing++;
-                if (typing > 3) {
-                    typing = 0;
-                }
+                if (typing > 3) { typing = 0; }
             }, 500);
         }
         var onSynced = function () {
-            if ($spin.timeout) {
-                clearTimeout($spin.timeout);
-            }
+            if ($spin.timeout) { clearTimeout($spin.timeout); }
             $spin.timeout = setTimeout(function () {
-                if (toolbar.isErrorState) {
-                    return;
-                }
+                if (toolbar.isErrorState) { return; }
                 window.clearInterval($spin.interval);
                 typing = -1;
                 $spin.text(Messages.saved);
@@ -989,11 +920,7 @@ define([
         if (config.spinner) {
             var h = function () {
                 onSynced();
-                try {
-                    config.spinner.onSync.unreg(h);
-                } catch (e) {
-                    console.error(e);
-                }
+                try { config.spinner.onSync.unreg(h); } catch (e) { console.error(e); }
             };
             config.spinner.onSync.reg(h);
             return;
@@ -1002,15 +929,11 @@ define([
     };
     var ks = function (toolbar, config, local) {
         return function () {
-            if (toolbar.connected) {
-                kickSpinner(toolbar, config, local);
-            }
+            if (toolbar.connected) { kickSpinner(toolbar, config, local); }
         };
     };
     var createSpinner = function (toolbar, config) {
-        if (config.readOnly === 1) {
-            return;
-        }
+        if (config.readOnly === 1) { return; }
         var $spin = $('<span>', {'class': SPINNER_CLS}).appendTo(toolbar.title);
         $spin.text(Messages.synchronizing);
 
@@ -1038,7 +961,7 @@ define([
 
     var createLimit = function (toolbar, config) {
         var $limitIcon = $('<span>', {'class': 'fa fa-exclamation-triangle'});
-        var $limit = toolbar.$userAdmin.find('.' + LIMIT_CLS).attr({
+        var $limit = toolbar.$userAdmin.find('.'+LIMIT_CLS).attr({
             'title': Messages.pinLimitReached
         }).append($limitIcon).hide();
 
@@ -1048,9 +971,7 @@ define([
         l.href = origin;
 
         var todo = function (e, overLimit) {
-            if (e) {
-                return void console.error("Unable to get the pinned usage", e);
-            }
+            if (e) { return void console.error("Unable to get the pinned usage", e); }
             if (overLimit) {
                 $limit.show().click(function () {
                     if (ApiConfig.allowSubscriptions && Config.upgradeURL) {
@@ -1084,7 +1005,7 @@ define([
             throw new Error("You must provide a `metadataMgr` to display the user menu");
         }
         var metadataMgr = config.metadataMgr;
-        var $userAdmin = toolbar.$userAdmin.find('.' + USERADMIN_CLS).show();
+        var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
         var userMenuCfg = {
             $initBlock: $userAdmin,
         };
@@ -1130,7 +1051,7 @@ define([
                 userMenuButton.blur();
                 const dropdownActive = $(".cp-dropdown-content");
                 if (dropdownActive.length > 0) {
-                    setTimeout(function () {
+                    setTimeout(function() {
                         let items = dropdownActive.find('li:visible');
                         const firstVisibleItem = items.filter(function () {
                             return !($(this).find('hr').length > 0 || $(this).hasClass('cp-user-menu-logo') || $(this).hasClass('cp-toolbar-account'));
@@ -1174,7 +1095,8 @@ define([
                                     nextItem.attr('tabindex', '0').focus();
                                     searchCharacters = '';
                                 }
-                            } else if (e.key === 'Escape') {
+                            }
+                            else if (e.key === 'Escape') {
                                 dropdownActive.find('li').attr('tabindex', '-1');
                                 dropdownActive.attr('tabindex', '-1');
                                 $(document).off('keydown');
@@ -1197,16 +1119,14 @@ define([
     };
 
     var createMaintenance = function (toolbar, config) {
-        var $notif = toolbar.$top.find('.' + MAINTENANCE_CLS);
+        var $notif = toolbar.$top.find('.'+MAINTENANCE_CLS);
         var button = h('button.cp-maintenance-wrench.fa.fa-wrench');
         $notif.append(button);
 
 
         var m = Broadcast.maintenance;
         $(button).click(function () {
-            if (!m || !m.start || !m.end) {
-                return;
-            }
+            if (!m || !m.start || !m.end) { return; }
             UI.alert(Messages._getKey('broadcast_maintenance', [
                 new Date(m.start).toLocaleString(),
                 new Date(m.end).toLocaleString(),
@@ -1217,9 +1137,7 @@ define([
         Common.makeUniversal('broadcast', {
             onEvent: function (obj) {
                 var cmd = obj.ev;
-                if (cmd !== "MAINTENANCE") {
-                    return;
-                }
+                if (cmd !== "MAINTENANCE") { return; }
                 var data = obj.data;
                 if (!data) {
                     return void $notif.hide();
@@ -1232,7 +1150,7 @@ define([
                 to = setTimeout(function () {
                     m = undefined;
                     $notif.hide();
-                }, m.end - (+new Date()));
+                }, m.end-(+new Date()));
                 $notif.css('display', '');
             }
         });
@@ -1242,15 +1160,15 @@ define([
             to = setTimeout(function () {
                 m = undefined;
                 $notif.hide();
-            }, m.end - (+new Date()));
+            }, m.end-(+new Date()));
         } else {
             $notif.hide();
         }
     };
 
     var createNotifications = function (toolbar, config) {
-        var $notif = toolbar.$top.find('.' + NOTIFICATIONS_CLS).show();
-        var openNotifsApp = h('li', {}, h('div.cp-notifications-gotoapp', {tabindex: '0'}, h('p', Messages.openNotificationsApp || "Open notifications App")));
+        var $notif = toolbar.$top.find('.'+NOTIFICATIONS_CLS).show();
+        var openNotifsApp = h('li', {}, h('div.cp-notifications-gotoapp', { tabindex: '0' }, h('p', Messages.openNotificationsApp || "Open notifications App")));
         $(openNotifsApp).on('click keypress', function (event) {
             if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                 Common.openURL("/notifications/");
@@ -1271,9 +1189,7 @@ define([
             $(allowNotif).on('click keypress', function (event) {
                 if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                     Common.getSframeChannel().event('Q_ASK_NOTIFICATION', null, function (e, allow) {
-                        if (!allow) {
-                            return;
-                        }
+                        if (!allow) { return; }
                         $(allowNotif).remove();
                     });
                 }
@@ -1281,9 +1197,7 @@ define([
 
             var onChange = function () {
                 var privateData = metadataMgr.getPrivateData();
-                if (!privateData.notifications) {
-                    return;
-                }
+                if (!privateData.notifications) { return; }
                 $allow.remove();
                 metadataMgr.off('change', onChange);
             };
@@ -1307,7 +1221,7 @@ define([
         $button.attr('title', Messages.notificationsPage);
         $button.attr('aria-haspopup', 'menu');
         $button.attr("aria-expanded", "false");
-        $button.click(function () {
+        $button.click(function() {
             if ($button.attr("aria-expanded") === "true") {
                 $button.attr("aria-expanded", "false");
             } else {
@@ -1359,7 +1273,7 @@ define([
 
     // Events
     var initClickEvents = function (toolbar) {
-        var removeDropdowns = function () {
+        var removeDropdowns =  function () {
             window.setTimeout(function () {
                 $('body').find('.cp-dropdown-content').hide();
             });
@@ -1370,9 +1284,7 @@ define([
                 return;
             }
             var $title = toolbar.title;
-            if (!$title.find('input').is(':visible')) {
-                return;
-            }
+            if (!$title.find('input').is(':visible')) { return; }
 
             // Press enter
             var ev = $.Event("keyup");
@@ -1411,25 +1323,17 @@ define([
     var initNotifications = function (toolbar, config) {
         // Display notifications when users are joining/leaving the session
         var oldUserData;
-        if (!config.metadataMgr) {
-            return;
-        }
+        if (!config.metadataMgr) { return; }
         var metadataMgr = config.metadataMgr;
-        var notify = function (type, name, oldname, uid) {
-            if (toolbar.isAlone) {
-                return;
-            }
+        var notify = function(type, name, oldname, uid) {
+            if (toolbar.isAlone) { return; }
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
-            if (typeof name === "undefined") {
-                return;
-            }
-            if (Config.disableUserlistNotifications) {
-                return;
-            }
+            if (typeof name === "undefined") { return; }
+            if (Config.disableUserlistNotifications) { return; }
             name = getFancyGuestName(name, uid);
             oldname = getFancyGuestName(oldname, uid);
 
-            switch (type) {
+            switch(type) {
                 case 1:
                     UI.log(Messages._getKey("notifyJoined", [name]));
                     break;
@@ -1458,9 +1362,7 @@ define([
 
             var count = 0;
             Object.keys(data).forEach(function (k) {
-                if (data[k] && data[k].uid === user.uid) {
-                    count++;
-                }
+                if (data[k] && data[k].uid === user.uid) { count++; }
             });
             return count;
         };
@@ -1477,9 +1379,7 @@ define([
                     if (netfluxIds.indexOf(u) === -1) {
                         var temp = JSON.parse(JSON.stringify(oldUserData[u]));
                         delete oldUserData[u];
-                        if (temp && newdata[userNetfluxId] && temp.uid === newdata[userNetfluxId].uid) {
-                            return;
-                        }
+                        if (temp && newdata[userNetfluxId] && temp.uid === newdata[userNetfluxId].uid) { return; }
                         if (userPresent(u, temp, newdata || oldUserData) < 1) {
                             notify(-1, temp.name, undefined, temp.uid);
                         }
@@ -1487,9 +1387,7 @@ define([
                 }
             }
             // Update the "oldUserData" object and notify for new users and names changed
-            if (typeof newdata === "undefined") {
-                return;
-            }
+            if (typeof newdata === "undefined") { return; }
             if (typeof oldUserData === "undefined") {
                 oldUserData = JSON.parse(JSON.stringify(newdata));
                 return;
@@ -1516,6 +1414,7 @@ define([
     };
 
 
+
     // Main
 
     Bar.create = function (cfg) {
@@ -1530,17 +1429,17 @@ define([
         toolbar.firstConnection = true;
 
         var $toolbar = toolbar.$toolbar = createRealtimeToolbar(config);
-        toolbar.$bottom = $toolbar.find('.' + Bar.constants.bottom);
-        toolbar.$bottomL = $toolbar.find('.' + Bar.constants.bottomL);
-        toolbar.$bottomM = $toolbar.find('.' + Bar.constants.bottomM);
-        toolbar.$bottomR = $toolbar.find('.' + Bar.constants.bottomR);
-        toolbar.$leftside = $toolbar.find('.' + Bar.constants.leftside);
-        toolbar.$rightside = $toolbar.find('.' + Bar.constants.rightside);
-        toolbar.$file = $toolbar.find('.' + Bar.constants.file);
-        toolbar.$drawer = $toolbar.find('.' + Bar.constants.drawer);
-        toolbar.$top = $toolbar.find('.' + Bar.constants.top);
-        toolbar.$history = $toolbar.find('.' + Bar.constants.history);
-        toolbar.$user = $toolbar.find('.' + Bar.constants.userAdmin);
+        toolbar.$bottom = $toolbar.find('.'+Bar.constants.bottom);
+        toolbar.$bottomL = $toolbar.find('.'+Bar.constants.bottomL);
+        toolbar.$bottomM = $toolbar.find('.'+Bar.constants.bottomM);
+        toolbar.$bottomR = $toolbar.find('.'+Bar.constants.bottomR);
+        toolbar.$leftside = $toolbar.find('.'+Bar.constants.leftside);
+        toolbar.$rightside = $toolbar.find('.'+Bar.constants.rightside);
+        toolbar.$file = $toolbar.find('.'+Bar.constants.file);
+        toolbar.$drawer = $toolbar.find('.'+Bar.constants.drawer);
+        toolbar.$top = $toolbar.find('.'+Bar.constants.top);
+        toolbar.$history = $toolbar.find('.'+Bar.constants.history);
+        toolbar.$user = $toolbar.find('.'+Bar.constants.userAdmin);
 
         observeChildren(toolbar.$drawer);
         observeChildren(toolbar.$bottomL);
@@ -1552,7 +1451,7 @@ define([
             observeChildren(config.$contentContainer);
         }
 
-        toolbar.$userAdmin = $toolbar.find('.' + Bar.constants.userAdmin);
+        toolbar.$userAdmin = $toolbar.find('.'+Bar.constants.userAdmin);
 
         // Create the subelements
         var tb = {};
@@ -1587,7 +1486,7 @@ define([
             toolbar.$bottom.removeClass('cp-toolbar-small');
             var w = $(window).width();
             var size = toolbar.$bottomL.width() + toolbar.$bottomM.width() +
-                toolbar.$bottomR.width();
+                       toolbar.$bottomR.width();
             if (size > w) {
                 toolbar.$bottom.addClass('cp-toolbar-small');
             }
@@ -1596,20 +1495,12 @@ define([
         $(window).on('resize', checkSize);
 
         var addElement = toolbar.addElement = function (arr, additionalCfg, init) {
-            if (typeof additionalCfg === "object") {
-                $.extend(true, config, additionalCfg);
-            }
+            if (typeof additionalCfg === "object") { $.extend(true, config, additionalCfg); }
             arr.forEach(function (el) {
-                if (typeof el !== "string" || !el.trim()) {
-                    return;
-                }
+                if (typeof el !== "string" || !el.trim()) { return; }
                 if (typeof tb[el] === "function") {
-                    if (!init && config.displayed.indexOf(el) !== -1) {
-                        return;
-                    } // Already done
-                    if (!init) {
-                        config.displayed.push(el);
-                    }
+                    if (!init && config.displayed.indexOf(el) !== -1) { return; } // Already done
+                    if (!init) { config.displayed.push(el); }
                     toolbar[el] = tb[el](toolbar, config);
                 }
             });
@@ -1622,9 +1513,7 @@ define([
 
         toolbar['linkToMain'] = createLinkToMain(toolbar, config);
 
-        if (!config.realtime) {
-            toolbar.connected = true;
-        }
+        if (!config.realtime) { toolbar.connected = true; }
 
         initClickEvents(toolbar, config);
         initNotifications(toolbar, config);
@@ -1641,30 +1530,22 @@ define([
             //checkLag(toolbar, config);
         };
         toolbar.initializing = function (/*userId*/) {
-            if (toolbar.history) {
-                return;
-            }
+            if (toolbar.history) { return; }
             toolbar.connected = false;
             if (toolbar.spinner) {
                 toolbar.spinner.text(Messages.initializing);
             }
         };
         toolbar.reconnecting = function (/*userId*/) {
-            if (toolbar.history) {
-                return;
-            }
+            if (toolbar.history) { return; }
             toolbar.connected = false;
             if (toolbar.spinner) {
                 var state = -1;
                 var interval = window.setInterval(function () {
-                    if (toolbar.connected) {
-                        clearInterval(interval);
-                    }
-                    var dots = Array(state + 1).join('.');
+                    if (toolbar.connected) { clearInterval(interval); }
+                    var dots = Array(state+1).join('.');
                     toolbar.spinner.text(Messages.reconnecting + dots);
-                    if (++state > 3) {
-                        state = 0;
-                    }
+                    if (++state > 3) { state = 0; }
                 }, 500);
                 toolbar.spinner.text(Messages.reconnecting);
             }
@@ -1676,9 +1557,7 @@ define([
 
         toolbar.errorState = function (state, error) {
             toolbar.isErrorState = state;
-            if (state) {
-                toolbar.connected = false;
-            }
+            if (state) { toolbar.connected = false; }
             if (toolbar.spinner) {
                 if (!state) {
                     return void kickSpinner(toolbar, config);
@@ -1711,22 +1590,16 @@ define([
         // Show user colors in the userlist only if the app is compatible and if the user
         // wants to see the cursors
         toolbar.showColors = function () {
-            if (!config.metadataMgr) {
-                return;
-            }
+            if (!config.metadataMgr) { return; }
             var privateData = config.metadataMgr.getPrivateData();
             var show = Util.find(privateData, ['settings', 'general', 'cursor', 'show']);
-            if (show === false) {
-                return;
-            }
+            if (show === false) { return; }
             showColors = true;
         };
 
         // If we had to create a new chainpad instance, reset the one used in the toolbar
         toolbar.resetChainpad = function (chainpad) {
-            if (config.readOnly === 1) {
-                return;
-            }
+            if (config.readOnly === 1) { return; }
             if (config.realtime !== chainpad) {
                 config.realtime = chainpad;
                 config.realtime.onPatch(ks(toolbar, config));
@@ -1777,12 +1650,8 @@ define([
         // On log out, remove permanently the realtime elements of the toolbar
         Common.onLogout(function () {
             failed();
-            if (toolbar.useradmin) {
-                toolbar.useradmin.hide();
-            }
-            if (toolbar.userlist) {
-                toolbar.userlist.hide();
-            }
+            if (toolbar.useradmin) { toolbar.useradmin.hide(); }
+            if (toolbar.userlist) { toolbar.userlist.hide(); }
         });
 
         return toolbar;

From de7b8e99f12c84acf14410f4c4f34869728f78b8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 17 Nov 2023 14:13:26 +0100
Subject: [PATCH 68/87] Revert autoformatting on "temporary disabled keyboard
 access to drive content"

This partially reverts commit 58daaa21523628e5ee452ace5e6a55fad9a6cc82.
---
 www/common/drive-ui.js | 2008 ++++++++++++++++------------------------
 1 file changed, 800 insertions(+), 1208 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index f265bad21..6861487c8 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -39,17 +39,15 @@ define([
     ProxyManager,
     AppConfig,
     Messages,
-    Pages) {
+    Pages)
+{
 
     var APP = window.APP = {
         editable: false,
         online: false,
         mobile: function () {
-            if (window.matchMedia) {
-                return !window.matchMedia('(any-pointer:fine)').matches;
-            } else {
-                return $('body').width() <= 600;
-            }
+            if (window.matchMedia) { return !window.matchMedia('(any-pointer:fine)').matches; }
+            else { return $('body').width() <= 600; }
         },
         isMac: navigator.platform === "MacIntel",
         allowFolderUpload: File.prototype.hasOwnProperty("webkitRelativePath"),
@@ -150,9 +148,7 @@ define([
     var DEBUG = config.DEBUG = false;
     var debug = config.debug = DEBUG ? function () {
         console.log.apply(console, arguments);
-    } : function () {
-        return;
-    };
+    } : function () { return; };
     var logError = config.logError = function () {
         console.error.apply(console, arguments);
     };
@@ -161,7 +157,7 @@ define([
     var localStore = window.cryptpadStore;
     APP.store = {};
 
-    $(window).keydown(function (e) {
+    $(window).keydown(function (e) {
         if (e.which === 70 && e.ctrlKey) {
             e.preventDefault();
             e.stopPropagation();
@@ -173,7 +169,7 @@ define([
     });
 
     var makeLS = function (teamId) {
-        var suffix = teamId ? ('-' + teamId) : '';
+        var suffix = teamId ? ('-' + teamId) :  '';
         var LS_LAST = "app-drive-lastOpened" + suffix;
         var LS_OPENED = "app-drive-openedFolders" + suffix;
 
@@ -189,15 +185,13 @@ define([
             return path;
         };
         LS.setLastOpenedFolder = function (path) {
-            if (path[0] === SEARCH) {
-                return;
-            }
+            if (path[0] === SEARCH) { return; }
             APP.store[LS_LAST] = JSON.stringify(path);
             localStore.put(LS_LAST, JSON.stringify(path));
         };
 
         LS.wasFolderOpened = function (path) {
-            var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
+            var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
             return stored.indexOf(JSON.stringify(path)) !== -1;
         };
         LS.setFolderOpened = function (path, opened) {
@@ -218,7 +212,7 @@ define([
         LS.removeFoldersOpened = function (parentPath) {
             var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
             var s = JSON.stringify(parentPath).slice(0, -1);
-            for (var i = stored.length - 1; i >= 0; i--) {
+            for (var i = stored.length - 1 ; i >= 0 ; i--) {
                 if (stored[i].indexOf(s) === 0) {
                     stored.splice(i, 1);
                 }
@@ -232,7 +226,7 @@ define([
             var newParentPath = parentPath.slice();
             newParentPath[newParentPath.length - 1] = newName;
             var sNew = JSON.stringify(newParentPath).slice(0, -1);
-            for (var i = 0; i < stored.length; i++) {
+            for (var i = 0 ; i < stored.length ; i++) {
                 if (stored[i].indexOf(s) === 0) {
                     stored[i] = stored[i].replace(s, sNew);
                 }
@@ -244,14 +238,10 @@ define([
             var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
             var s = JSON.stringify(previousPath).slice(0, -1);
             var sNew = JSON.stringify(newPath).slice(0, -1);
-            if (s === sNew) {
-                return;
-            } // move to itself
-            if (sNew.indexOf(s) === 0) {
-                return;
-            } // move to subfolder
+            if (s === sNew ) { return; } // move to itself
+            if (sNew.indexOf(s) === 0) { return; } // move to subfolder
             sNew = JSON.stringify(newPath.concat(previousPath[previousPath.length - 1])).slice(0, -1);
-            for (var i = 0; i < stored.length; i++) {
+            for (var i = 0 ; i < stored.length ; i++) {
                 if (stored[i].indexOf(s) === 0) {
                     stored[i] = stored[i].replace(s, sNew);
                 }
@@ -265,16 +255,14 @@ define([
 
     var getViewModeClass = function (forceList) {
         var mode = APP.store[LS_VIEWMODE];
-        if (mode === 'list' || forceList) {
-            return 'cp-app-drive-content-list';
-        }
+        if (mode === 'list' || forceList) { return 'cp-app-drive-content-list'; }
         return 'cp-app-drive-content-grid';
     };
     var getViewMode = function () {
         return APP.store[LS_VIEWMODE] || 'grid';
     };
     var setViewMode = function (mode) {
-        if (typeof (mode) !== "string") {
+        if (typeof(mode) !== "string") {
             logError("Incorrect view mode: ", mode);
             return;
         }
@@ -287,9 +275,7 @@ define([
     // If isHistory is true, update the "APP.history" flag
     // isSf is used to detect offline shared folders: setEditable is called on displayDirectory
     var setEditable = function (state, isHistory, isSf) {
-        if (APP.closed || !APP.$content || !$.contains(document.documentElement, APP.$content[0])) {
-            return;
-        }
+        if (APP.closed || !APP.$content || !$.contains(document.documentElement, APP.$content[0])) { return; }
         if (isHistory) {
             APP.history = !state;
         } else if (!isSf) {
@@ -297,9 +283,7 @@ define([
         }
         state = APP.online && !APP.history && state;
         APP.editable = !APP.readOnly && state;
-        if (APP.editable) {
-            onConnectEvt.fire();
-        }
+        if (APP.editable) { onConnectEvt.fire(); }
 
         if (!state) {
             APP.$content.addClass('cp-app-drive-readonly');
@@ -309,7 +293,8 @@ define([
                 $('#cp-app-drive-connection-state').hide();
             }
             $('[draggable="true"]').attr('draggable', false);
-        } else {
+        }
+        else {
             APP.$content.removeClass('cp-app-drive-readonly');
             $('#cp-app-drive-connection-state').hide();
             $('[draggable="false"]').attr('draggable', true);
@@ -317,9 +302,7 @@ define([
     };
 
     var copyObjectValue = function (objRef, objToCopy) {
-        for (var k in objRef) {
-            delete objRef[k];
-        }
+        for (var k in objRef) { delete objRef[k]; }
         $.extend(true, objRef, objToCopy);
     };
 
@@ -348,20 +331,18 @@ define([
         return $(".cp-app-drive-element-selected");
     };
 
-    var getNewPadTypes = function () {
-        var arr = [];
-        AppConfig.availablePadTypes.forEach(function (type) {
-            if (AppConfig.hiddenTypes.indexOf(type) !== -1) {
-                return;
-            }
-            if (!APP.loggedIn && AppConfig.registeredOnlyTypes &&
-                AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
-                return;
-            }
-            arr.push(type);
-        });
-        return arr;
-    };
+        var getNewPadTypes = function () {
+            var arr = [];
+            AppConfig.availablePadTypes.forEach(function (type) {
+                if (AppConfig.hiddenTypes.indexOf(type) !== -1) { return; }
+                if (!APP.loggedIn && AppConfig.registeredOnlyTypes &&
+                    AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
+                    return;
+                }
+                arr.push(type);
+            });
+            return arr;
+        };
 
     var createContextMenu = function (common) {
         var metadataMgr = common.getMetadataMgr();
@@ -370,8 +351,8 @@ define([
         APP.premiumPlan = priv.plan;
         var getOpenIn = function (app) {
             var icon = AppConfig.applicationsIcon[app];
-            var cls = icon.indexOf('cptools') === 0 ? 'cptools ' + icon : 'fa ' + icon;
-            var html = '<i class="' + cls + '"></i>' + Messages.type[app];
+            var cls = icon.indexOf('cptools') === 0 ? 'cptools '+icon : 'fa '+icon;
+            var html = '<i class="'+cls+'"></i>' + Messages.type[app];
             return Messages._getKey('fc_openIn', [html]);
         };
         var restricted = {};
@@ -380,15 +361,11 @@ define([
             return enabled.includes(app);
         };
         getNewPadTypes().forEach(function (app) {
-            if (!Array.isArray(AppConfig.availablePadTypes)) {
-                return void enabled.push(app);
-            }
+            if (!Array.isArray(AppConfig.availablePadTypes)) { return void enabled.push(app); }
             var registered = common.isLoggedIn() || !(AppConfig.registeredOnlyTypes || []).includes(app);
             restricted[app] = common.checkRestrictedApp(app);
             var e = AppConfig.availablePadTypes.includes(app) && registered && restricted[app] >= 0;
-            if (e) {
-                enabled.push(app);
-            }
+            if (e) { enabled.push(app); }
         });
         var menu = h('div.cp-contextmenu.dropdown.cp-unselectable', [
             h('ul.dropdown-menu', {
@@ -1062,20 +1039,20 @@ define([
             //     APP.onElementClick(ev, $(el));
             // };
 
-            // var $selection = findSelectedElements();
-            // if ($selection.length === 0) { return void click($elements.first()[0]); }
-            //
-            // var lastIndex = typeof sel.endSelected === "number" ? sel.endSelected :
-            //                 typeof sel.startSelected === "number" ? sel.startSelected :
-            //                 $elements.index($selection.last()[0]);
-            // var length = $elements.length;
-            // if (length === 0) { return; }
-            // // List mode
-            // if (getViewMode() === "list") {
-            //     if (e.which === 40) { click($elements.get(Math.min(lastIndex+1, length -1))); }
-            //     if (e.which === 38) { click($elements.get(Math.max(lastIndex-1, 0))); }
-            //     return;
-            // }
+            var $selection = findSelectedElements();
+            if ($selection.length === 0) { return void click($elements.first()[0]); }
+
+            var lastIndex = typeof sel.endSelected === "number" ? sel.endSelected :
+                            typeof sel.startSelected === "number" ? sel.startSelected :
+                            $elements.index($selection.last()[0]);
+            var length = $elements.length;
+            if (length === 0) { return; }
+            // List mode
+            if (getViewMode() === "list") {
+                if (e.which === 40) { click($elements.get(Math.min(lastIndex+1, length -1))); }
+                if (e.which === 38) { click($elements.get(Math.max(lastIndex-1, 0))); }
+                return;
+            }
 
             // Icon mode
             // Get the vertical and horizontal position of lastIndex
@@ -1092,26 +1069,26 @@ define([
             //     c : lastIndex - Math.floor(lastIndex/cols)*cols
             // };
 
-            // if (e.which === 37) {
-            //     if (lastPos.c === 0) { return; }
-            //     click($elements.get(Math.max(lastIndex-1, 0)));
-            //     return;
-            // }
-            // if (e.which === 38) {
-            //     if (lastPos.l === 0) { return; }
-            //     click($elements.get(Math.max(lastIndex-cols, 0)));
-            //     return;
-            // }
-            // if (e.which === 39) {
-            //     if (lastPos.c === cols-1) { return; }
-            //     click($elements.get(Math.min(lastIndex+1, length-1)));
-            //     return;
-            // }
-            // if (e.which === 40) {
-            //     if (lastPos.l === lines-1) { return; }
-            //     click($elements.get(Math.min(lastIndex+cols, length-1)));
-            //     return;
-            // }
+            if (e.which === 37) {
+                if (lastPos.c === 0) { return; }
+                click($elements.get(Math.max(lastIndex-1, 0)));
+                return;
+            }
+            if (e.which === 38) {
+                if (lastPos.l === 0) { return; }
+                click($elements.get(Math.max(lastIndex-cols, 0)));
+                return;
+            }
+            if (e.which === 39) {
+                if (lastPos.c === cols-1) { return; }
+                click($elements.get(Math.min(lastIndex+1, length-1)));
+                return;
+            }
+            if (e.which === 40) {
+                if (lastPos.l === lines-1) { return; }
+                click($elements.get(Math.min(lastIndex+cols, length-1)));
+                return;
+            }
         };
 
         var compareDays = function (date1, date2) {
@@ -1144,13 +1121,9 @@ define([
             $content.find('.cp-app-drive-element.cp-border-color-file').each(function (i, el) {
                 var path = $(el).data('path');
                 var id = manager.find(path);
-                if (!id) {
-                    return;
-                }
+                if (!id) { return; }
                 var _data = manager.getFileData(id);
-                if (!_data || _data.channel < 48) {
-                    return;
-                }
+                if (!_data || _data.channel < 48) { return; }
                 mts.push({
                     channel: _data.channel,
                     href: _data.href,
@@ -1180,13 +1153,9 @@ define([
         var FILTER_BY = "filterBy";
 
         var refreshDeprecated = function () {
-            if (!APP.passwordModal) {
-                return;
-            }
+            if (!APP.passwordModal) { return; }
             var deprecated = files.sharedFoldersTemp;
-            if (JSONSortify(deprecated) === APP.deprecatedSF) {
-                return;
-            }
+            if (JSONSortify(deprecated) === APP.deprecatedSF) { return; }
             APP.deprecatedSF = JSONSortify(deprecated);
             if (typeof (deprecated) === "object" && Object.keys(deprecated).length) {
                 var nt = nThen;
@@ -1194,8 +1163,7 @@ define([
                     var data = deprecated[fId];
                     var sfId = manager.user.userObject.getSFIdFromHref(data.href);
                     if (folders[fId] || sfId) { // This shared folder is already stored in the drive...
-                        return void manager.delete([['sharedFoldersTemp', fId]], function () {
-                        });
+                        return void manager.delete([['sharedFoldersTemp', fId]], function () { });
                     }
                     nt = nt(function (waitFor) {
                         UI.openCustomModal(APP.passwordModal(fId, data, waitFor()));
@@ -1212,9 +1180,7 @@ define([
             var path = type ? [FILTER, type, currentPath] : currentPath;
             APP.displayDirectory(path, undefined, () => {
                 refreshDeprecated();
-                if (typeof (cb) === "function") {
-                    cb();
-                }
+                if (typeof(cb) === "function") { cb(); }
             });
         };
 
@@ -1240,11 +1206,11 @@ define([
             var parsed = Hash.parsePadUrl(href);
 
             if (parsed.hashData && parsed.hashData.type === 'file' && !app
-                && (defaultInApp.indexOf(data.fileType) === -1 || app === false)) {
+                    && (defaultInApp.indexOf(data.fileType) === -1 || app === false)) {
                 return void previewMediaTag(data);
             }
 
-            var obj = {t: APP.team};
+            var obj = { t: APP.team };
 
             var priv = metadataMgr.getPrivateData();
             var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
@@ -1255,9 +1221,7 @@ define([
             // Get hidden hash
             var secret = Hash.getSecrets(parsed.type, parsed.hash, data.password);
             var opts = {};
-            if (isRo) {
-                opts.view = true;
-            }
+            if (isRo) { opts.view = true; }
             var hash = Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
             var hiddenHref = Hash.hashToHref(hash, parsed.type);
             common.openURL(Hash.getNewPadURL(hiddenHref, obj));
@@ -1300,30 +1264,23 @@ define([
         };
 
         var getFolderColor = function (path) {
-            if (path.length === 0) {
-                return;
-            }
+            if (path.length === 0) { return; }
             return manager.getFolderData(path).color || "";
         };
 
         var setFolderColor = function ($element, path, color) {
-            if ($element.length === 0) {
-                return;
-            }
+            if ($element.length === 0) { return; }
             $element.find(".cp-app-drive-icon-folder").css("color", color);
             manager.setFolderData({
                 path: path,
                 key: "color",
                 value: color
-            }, function () {
-            });
+            }, function () {});
         };
 
 
         var filterContextMenu = function (type, paths) {
-            if (!paths || paths.length === 0) {
-                logError('no paths');
-            }
+            if (!paths || paths.length === 0) { logError('no paths'); }
 
             $contextMenu.find('li').hide();
 
@@ -1332,24 +1289,16 @@ define([
             var editable = true;
 
             if (type === "content") {
-                if (APP.$content.data('readOnlyFolder')) {
-                    editable = false;
-                }
+                if (APP.$content.data('readOnlyFolder')) { editable = false; }
                 // Return true in filter to hide
                 filter = function ($el, className) {
-                    if (className === 'newfolder') {
-                        return;
-                    }
+                    if (className === 'newfolder') { return; }
                     if (className === 'newsharedfolder') {
                         // Hide the new shared folder menu if we're already in a shared folder
                         return manager.isInSharedFolder(currentPath) || APP.disableSF;
                     }
-                    if (className === 'uploadfiles') {
-                        return;
-                    }
-                    if (className === 'uploadfolder') {
-                        return !APP.allowFolderUpload;
-                    }
+                    if (className === 'uploadfiles') { return; }
+                    if (className === 'uploadfolder') { return !APP.allowFolderUpload; }
                     if (className === 'newdoc') {
                         return;
                     }
@@ -1367,9 +1316,7 @@ define([
                     var $element = p.element;
 
                     if (APP.$content.data('readOnlyFolder') &&
-                        manager.isSubpath(path, currentPath)) {
-                        editable = false;
-                    }
+                            manager.isSubpath(path, currentPath)) { editable = false; }
 
                     if (!$element.closest("#cp-app-drive-tree").length) {
                         hide.push('expandall');
@@ -1481,7 +1428,7 @@ define([
                     }
                     // If we're not in the trash nor in a shared folder, hide "remove"
                     if (!manager.isInSharedFolder(path)
-                        && !$element.is('.cp-app-drive-element-sharedf')) {
+                            && !$element.is('.cp-app-drive-element-sharedf')) {
                         // This isn't a shared folder: can't delete shared folder
                         hide.push('removesf');
                     } else if (type === "tree") {
@@ -1520,21 +1467,19 @@ define([
                 }
 
                 filter = function ($el, className) {
-                    if (hide.indexOf(className) !== -1) {
-                        return true;
-                    }
+                    if (hide.indexOf(className) !== -1) { return true; }
                 };
             }
 
-            switch (type) {
+            switch(type) {
                 case 'content':
                     show = ['newfolder', 'newsharedfolder', 'uploadfiles', 'uploadfolder', 'newdoc'];
                     break;
                 case 'tree':
                     show = ['open', 'openro', 'preview', 'openincode', 'expandall', 'collapseall',
-                        'color', 'download', 'share', 'savelocal', 'rename', 'delete',
-                        'makeacopy', 'openinsheet', 'openindoc', 'openinpresentation',
-                        'deleteowned', 'removesf', 'access', 'properties', 'hashtag'];
+                            'color', 'download', 'share', 'savelocal', 'rename', 'delete',
+                            'makeacopy', 'openinsheet', 'openindoc', 'openinpresentation',
+                            'deleteowned', 'removesf', 'access', 'properties', 'hashtag'];
                     break;
                 case 'default':
                     show = ['open', 'openro', 'preview', 'openincode', 'openinsheet', 'openindoc', 'openinpresentation', 'share', 'download', 'openparent', 'delete', 'deleteowned', 'properties', 'access', 'hashtag', 'makeacopy', 'savelocal', 'rename'];
@@ -1551,15 +1496,9 @@ define([
             var filtered = [];
             show.forEach(function (className) {
                 var $el = $contextMenu.find('.cp-app-drive-context-' + className);
-                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) {
-                    return;
-                }
-                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) {
-                    return;
-                }
-                if (filter($el, className)) {
-                    return;
-                }
+                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) { return; }
+                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) { return; }
+                if (filter($el, className)) { return; }
                 $el.parent('li').show();
                 filtered.push('.cp-app-drive-context-' + className);
             });
@@ -1639,9 +1578,7 @@ define([
             // New scroll value
             var v = st + pos + eh - h;
             // If the element is completely visile, don't change the scroll position
-            if (pos + eh <= h && pos >= 0) {
-                return;
-            }
+            if (pos+eh <= h && pos >= 0) { return; }
             $content.scrollTop(v);
         };
 
@@ -1651,9 +1588,7 @@ define([
             removeInput();
             $element = findDataHolder($element);
             // If we're selecting a new element with the left click, hide the menu
-            if (e) {
-                APP.hideMenu();
-            }
+            if (e) { APP.hideMenu(); }
             // Remove the selection if we don't hold ctrl key or if we are right-clicking
             if (!e || !e.ctrlKey) {
                 removeSelected(e && e.shiftKey);
@@ -1713,17 +1648,14 @@ define([
                 var $el = $(el);
                 if ($el.is(".dropdown-divider")) {
                     $el.css("display", showSep ? "list-item" : "none");
-                    if (showSep) {
-                        $lastVisibleSep = $el;
-                    }
+                    if (showSep) { $lastVisibleSep = $el; }
                     showSep = false;
-                } else if ($el.is("li") && $el.css("display") !== "none") {
+                }
+                else if ($el.is("li") && $el.css("display") !== "none") {
                     showSep = true;
                 }
             });
-            if (!showSep && $lastVisibleSep) {
-                $lastVisibleSep.css("display", "none");
-            } // remove last divider if no options after
+            if (!showSep && $lastVisibleSep) { $lastVisibleSep.css("display", "none"); } // remove last divider if no options after
         };
 
         // prepare and display contextmenu
@@ -1745,7 +1677,7 @@ define([
                 hideSeparators($(menu));
             });
             // show contextmenu at cursor position
-            $menu.css({display: "block"});
+            $menu.css({ display: "block" });
             if (APP.mobile()) {
                 $menu.css({
                     top: ($("#cp-app-drive-toolbar-context-mobile").offset().top + 32) + 'px',
@@ -1765,7 +1697,7 @@ define([
                 });
             } else if (e.pageY + h <= wH) {
                 $menu.css({
-                    top: e.pageY + 'px',
+                    top: e.pageY+'px',
                     bottom: ''
                 });
             } else {
@@ -1774,14 +1706,14 @@ define([
                     top: ''
                 });
             }
-            if (w > wW) {
+            if(w > wW) {
                 $menu.css({
                     left: '0px',
                     right: ''
                 });
             } else if (e.pageX + w <= wW) {
                 $menu.css({
-                    left: e.pageX + 'px',
+                    left: e.pageX+'px',
                     right: ''
                 });
             } else {
@@ -1801,9 +1733,7 @@ define([
                 var paths;
                 if (type === 'content') {
                     paths = [{path: $(e.target).closest('#' + FOLDER_CONTENT_ID).data('path')}];
-                    if (!paths) {
-                        return;
-                    }
+                    if (!paths) { return; }
                     removeSelected();
                 } else {
                     var $element = findDataHolder($(e.target));
@@ -1819,9 +1749,7 @@ define([
                         removeSelected();
                     }
 
-                    if (type === 'trash' && !$element.data('path')) {
-                        return;
-                    }
+                    if (type === 'trash' && !$element.data('path')) { return; }
 
                     if (!$element.length) {
                         logError("Unable to locate the .element tag", e.target);
@@ -1864,9 +1792,7 @@ define([
 
         var getElementName = function (path) {
             var file = manager.find(path);
-            if (!file) {
-                return;
-            }
+            if (!file) { return; }
             if (manager.isSharedFolder(file)) {
                 return manager.getSharedFolderData(file).title;
             }
@@ -1874,9 +1800,7 @@ define([
         };
         // moveElements is able to move several paths to a new location
         var moveElements = function (paths, newPath, copy, cb) {
-            if (!APP.editable) {
-                return;
-            }
+            if (!APP.editable) { return; }
             // Cancel drag&drop from TRASH to TRASH
             if (manager.isPathIn(newPath, [TRASH]) && paths.length && paths[0][0] === TRASH) {
                 return;
@@ -1887,30 +1811,22 @@ define([
                 });
                 cb();
             };
-            if (paths.some(function (p) {
-                return manager.comparePath(newPath, p);
-            })) {
-                return void cb();
-            }
+            if (paths.some(function (p) { return manager.comparePath(newPath, p); })) { return void cb(); }
             manager.move(paths, newPath, newCb, copy);
         };
         // Delete paths from the drive and/or shared folders (without moving them to the trash)
         var deletePaths = function (paths, pathsList) {
             pathsList = pathsList || [];
             if (paths) {
-                paths.forEach(function (p) {
-                    pathsList.push(p.path);
-                });
+                paths.forEach(function (p) { pathsList.push(p.path); });
             }
             var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [pathsList.length]);
             if (pathsList.length === 1) {
                 msg = Messages.fm_removePermanentlyDialog;
             }
-            UI.confirm(msg, function (res) {
+            UI.confirm(msg, function(res) {
                 $(window).focus();
-                if (!res) {
-                    return;
-                }
+                if (!res) { return; }
                 manager.delete(pathsList, function () {
                     pathsList.forEach(LS.removeFoldersOpened);
                     removeSelected();
@@ -1932,9 +1848,7 @@ define([
                     var ePath = $(elmt).data('path');
                     if (ePath) {
                         var val = manager.find(ePath);
-                        if (!val) {
-                            return;
-                        } // Error? A ".selected" element is not in the object
+                        if (!val) { return; } // Error? A ".selected" element is not in the object
                         paths.push({
                             path: ePath,
                             value: {
@@ -1948,9 +1862,7 @@ define([
                 removeSelected();
                 selectElement($element);
                 var val = manager.find(path);
-                if (!val) {
-                    return;
-                } // The element is not in the object
+                if (!val) { return; } // The element is not in the object
                 paths = [{
                     path: path,
                     value: {
@@ -1970,7 +1882,8 @@ define([
             var $el;
             if ($target.is(".cp-app-drive-path-element")) {
                 $el = $target;
-            } else {
+            }
+            else {
                 $el = findDataHolder($target);
             }
             var newPath = $el.data('path');
@@ -1978,7 +1891,7 @@ define([
             if (newPath && manager.isSharedFolder(dropEl)) {
                 newPath.push(manager.user.userObject.ROOT);
             } else if ((!newPath || manager.isFile(dropEl))
-                && $target.parents('#cp-app-drive-content')) {
+                    && $target.parents('#cp-app-drive-content')) {
                 newPath = currentPath;
             }
             return newPath;
@@ -2002,7 +1915,7 @@ define([
             path = path || "";
             if (item.isFile) {
                 // Get file
-                item.file(w(function (file) {
+                item.file(w(function(file) {
                     file.fix_path = path + file.name;
                     files.push(file);
                 }));
@@ -2012,8 +1925,8 @@ define([
                 // this API is not supported in Opera or IE
                 // https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItem/webkitGetAsEntry
                 // all other browsers will recurse over subfolders and upload everything
-                dirReader.readEntries(w(function (entries) {
-                    for (var i = 0; i < entries.length; i++) {
+                dirReader.readEntries(w(function(entries) {
+                    for (var i=0; i<entries.length; i++) {
                         traverseFileTree(entries[i], path + item.name + "/", w, files);
                     }
                 }));
@@ -2038,9 +1951,7 @@ define([
 
             // ask for folder name and files options, then upload all the files!
             APP.FM.showFolderUploadModal(availableName, function (folderUploadOptions) {
-                if (!folderUploadOptions) {
-                    return;
-                }
+                if (!folderUploadOptions) { return; }
 
                 // verfify folder name is possible, and update files path
                 availableName = manager.user.userObject.getAvailableName(manager.find(currentFolder), folderUploadOptions.folderName);
@@ -2052,11 +1963,9 @@ define([
 
                 // uploadSteps is an array of objects {folders: [], files: []}, containing all the folders and files to create safely
                 // at the index i + 1, the files and folders are children of the folders at the index i
-                var maxSteps = files.reduce(function (max, file) {
-                    return Math.max(max, file.path.length);
-                }, 0);
+                var maxSteps = files.reduce(function (max, file) { return Math.max(max, file.path.length); }, 0);
                 var uploadSteps = [];
-                for (var i = 0; i < maxSteps; i++) {
+                for (var i = 0 ; i < maxSteps ; i++) {
                     uploadSteps[i] = {
                         folders: [],
                         files: [],
@@ -2064,7 +1973,7 @@ define([
                 }
                 files.forEach(function (file) {
                     // add steps to create subfolders containing file
-                    for (var depth = 0; depth < file.path.length - 1; depth++) {
+                    for (var depth = 0 ; depth < file.path.length - 1 ; depth++) {
                         var subfolderStr = file.path.slice(0, depth + 1).join("/");
                         if (uploadSteps[depth].folders.indexOf(subfolderStr) === -1) {
                             uploadSteps[depth].folders.push(subfolderStr);
@@ -2077,9 +1986,7 @@ define([
                 // add folders, then add files when theirs folders have been created
                 // wait for the folders to be created to go to the next step (don't wait for the files)
                 var stepByStep = function (uploadSteps, i) {
-                    if (i >= uploadSteps.length) {
-                        return;
-                    }
+                    if (i >= uploadSteps.length) { return; }
                     nThen(function (waitFor) {
                         // add folders
                         uploadSteps[i].folders.forEach(function (folder) {
@@ -2111,9 +2018,7 @@ define([
             var data = ev.dataTransfer.getData("text");
 
             var newPath = findDropPath(ev.target);
-            if (!newPath) {
-                return;
-            }
+            if (!newPath) { return; }
             var sfId = manager.isInSharedFolder(newPath);
             if (sfId && folders[sfId] && folders[sfId].readOnly) {
                 return void UI.warn(Messages.fm_forbidden);
@@ -2123,9 +2028,7 @@ define([
             if (fileDrop.length) {
                 // Filter out all the folders and use the correct function to upload them
                 fileDrop = Array.prototype.slice.call(fileDrop).map(function (file) {
-                    if (file.kind !== "file") {
-                        return;
-                    }
+                    if (file.kind !== "file") { return; }
                     var f = file.getAsFile();
                     if (!f.type && f.size % 4096 === 0) {
                         // It's a folder!
@@ -2152,9 +2055,7 @@ define([
             }
 
             var oldPaths = JSON.parse(data).path;
-            if (!oldPaths) {
-                return;
-            }
+            if (!oldPaths) { return; }
             // A moved element should be removed from its previous location
             var movedPaths = [];
 
@@ -2185,9 +2086,7 @@ define([
         };
 
         var addDragAndDropHandlers = function ($element, path, isFolder, droppable) {
-            if (!APP.editable) {
-                return;
-            }
+            if (!APP.editable) { return; }
             // "dragenter" is fired for an element and all its children
             // "dragleave" may be fired when entering a child
             // --> we use pointer-events: none in CSS, but we still need a counter to avoid some issues
@@ -2205,9 +2104,7 @@ define([
             });
 
             // Add drop handlers if we are not in the trash and if the element is a folder
-            if (!droppable || !isFolder) {
-                return;
-            }
+            if (!droppable || !isFolder) { return; }
 
             $element.on('dragover', function (e) {
                 e.preventDefault();
@@ -2283,9 +2180,7 @@ define([
         };
         var thumbsUrls = {};
         var addFileData = function (element, $element) {
-            if (!manager.isFile(element)) {
-                return;
-            }
+            if (!manager.isFile(element)) { return; }
 
             var data = manager.getFileData(element);
             if (data.static) {
@@ -2297,13 +2192,11 @@ define([
             }
 
             var href = data.href || data.roHref;
-            if (!data) {
-                return void logError("No data for the file", element);
-            }
+            if (!data) { return void logError("No data for the file", element); }
 
             var hrefData = Hash.parsePadUrl(href);
             if (hrefData.type) {
-                $element.addClass('cp-border-color-' + hrefData.type);
+                $element.addClass('cp-border-color-'+hrefData.type);
             }
 
             var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
@@ -2344,7 +2237,8 @@ define([
                 $element.prepend(img);
                 $(img).addClass('cp-app-drive-element-grid cp-app-drive-element-thumbnail');
                 $(img).attr("draggable", false);
-            } else {
+            }
+            else {
                 common.displayThumbnail(href || data.roHref, data.channel, data.password, $element, function ($thumb) {
                     // Called only if the thumbnail exists
                     // Remove the .hide() added by displayThumnail() because it hides the icon in list mode too
@@ -2369,9 +2263,7 @@ define([
         };
 
         var addFolderData = function (element, key, $span) {
-            if (!element || !manager.isFolder(element)) {
-                return;
-            }
+            if (!element || !manager.isFolder(element)) { return; }
             // The element with the class '.name' is underlined when the 'li' is hovered
             var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
             var $ro;
@@ -2440,17 +2332,13 @@ define([
             var data = manager.getSharedFolderData(id);
             var parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
             var roParsed = Hash.parsePadUrl(data.roHref) || {};
-            if (!parsed.hash && !roParsed.hash) {
-                return void console.error("Invalid href: " + (data.href || data.roHref));
-            }
+            if (!parsed.hash && !roParsed.hash) { return void console.error("Invalid href: "+(data.href || data.roHref)); }
             var friends = common.getFriends();
             var ro = folders[id] && folders[id].version >= 2;
             // If we're a viewer and this is an old shared folder (no read-only mode), we
             // can't share the read-only URL and we don't have access to the edit one.
             // We should hide the share button.
-            if (!data.href && !ro) {
-                return;
-            }
+            if (!data.href && !ro) { return; }
 
             $shareBlock.click(function () {
                 Share.getShareModal(common, {
@@ -2481,9 +2369,7 @@ define([
             var element;
             if (isTrash && Array.isArray(elPath)) {
                 key = elPath[0];
-                elPath.forEach(function (k) {
-                    newPath.push(k);
-                });
+                elPath.forEach(function (k) { newPath.push(k); });
                 element = manager.find(newPath);
             } else {
                 key = elPath;
@@ -2497,8 +2383,8 @@ define([
             var $icon = !isFolder ? getFileIcon(element) : undefined;
             var ro = manager.isReadOnlyFile(element);
             // ro undefined means it's an old hash which doesn't support read-only
-            var roClass = typeof (ro) === 'undefined' ? '.cp-app-drive-element-noreadonly' :
-                ro ? '.cp-app-drive-element-readonly' : '';
+            var roClass = typeof(ro) === 'undefined' ? '.cp-app-drive-element-noreadonly' :
+                            ro ? '.cp-app-drive-element-readonly' : '';
             var liClass = '.cp-app-drive-element-file';
             var restrictedClass = restricted ? '.cp-app-drive-element-restricted' : '';
             if (isSharedFolder) {
@@ -2533,9 +2419,7 @@ define([
                     APP.displayDirectory(newPath);
                     return;
                 }
-                if (isTrash) {
-                    return;
-                }
+                if (isTrash) { return; }
                 openFile(root[key]);
             });
             var invalid;
@@ -2556,7 +2440,7 @@ define([
             });
             var droppable = !isTrash && !APP.$content.data('readOnlyFolder') && !restricted;
             addDragAndDropHandlers($element, newPath, isFolder, droppable);
-            $element.click(function (e) {
+            $element.click(function(e) {
                 e.stopPropagation();
                 onElementClick(e, $element);
             });
@@ -2570,9 +2454,7 @@ define([
             var isNewFolder = APP.newFolder && manager.comparePath(newPath, APP.newFolder);
             if (isNewFolder) {
                 appStatus.onReady(function () {
-                    window.setTimeout(function () {
-                        displayRenameInput($element, newPath);
-                    }, 0);
+                    window.setTimeout(function () { displayRenameInput($element, newPath); }, 0);
                 });
                 delete APP.newFolder;
             }
@@ -2580,9 +2462,7 @@ define([
             if (isSharedFolder && APP.convertedFolder === element) {
                 setTimeout(function () {
                     var $fakeButton = createShareButton(element, $('<div>'));
-                    if (!$fakeButton) {
-                        return;
-                    }
+                    if (!$fakeButton) { return; }
                     $fakeButton.click();
                 }, 100);
             }
@@ -2611,35 +2491,16 @@ define([
         var getPrettyName = function (name) {
             var pName;
             switch (name) {
-                case ROOT:
-                    pName = ROOT_NAME;
-                    break;
-                case TRASH:
-                    pName = TRASH_NAME;
-                    break;
-                case TEMPLATE:
-                    pName = TEMPLATE_NAME;
-                    break;
-                case FILES_DATA:
-                    pName = FILES_DATA_NAME;
-                    break;
-                case SEARCH:
-                    pName = SEARCH_NAME;
-                    break;
-                case RECENT:
-                    pName = RECENT_NAME;
-                    break;
-                case OWNED:
-                    pName = OWNED_NAME;
-                    break;
-                case TAGS:
-                    pName = TAGS_NAME;
-                    break;
-                case SHARED_FOLDER:
-                    pName = SHARED_FOLDER_NAME;
-                    break;
-                default:
-                    pName = name;
+                case ROOT: pName = ROOT_NAME; break;
+                case TRASH: pName = TRASH_NAME; break;
+                case TEMPLATE: pName = TEMPLATE_NAME; break;
+                case FILES_DATA: pName = FILES_DATA_NAME; break;
+                case SEARCH: pName = SEARCH_NAME; break;
+                case RECENT: pName = RECENT_NAME; break;
+                case OWNED: pName = OWNED_NAME; break;
+                case TAGS: pName = TAGS_NAME; break;
+                case SHARED_FOLDER: pName = SHARED_FOLDER_NAME; break;
+                default: pName = name;
             }
             return pName;
         };
@@ -2700,9 +2561,7 @@ define([
 
         // Create the title block with the "parent folder" button
         var createTitle = function ($container, path, noStyle) {
-            if (!path || path.length === 0) {
-                return;
-            }
+            if (!path || path.length === 0) { return; }
             var isTrash = manager.isPathIn(path, [TRASH]);
             // we assume that users viewing shared folders may want to see the "bread-crumb"
             if (!APP.newSharedFolder && APP.mobile() && !noStyle) { // noStyle means title in search result
@@ -2710,7 +2569,7 @@ define([
             }
             var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
             var el = isVirtual ? undefined : manager.find(path);
-            path = path[0] === SEARCH ? path.slice(0, 1) : path;
+            path = path[0] === SEARCH ? path.slice(0,1) : path;
             var isInTrashRoot = manager.isInTrashRoot(path);
 
             var $outer = $('<div>', {'class': 'cp-app-drive-path'});
@@ -2720,16 +2579,9 @@ define([
 
             var skipNext = false; // When encountering a shared folder, skip a key in the path
             path.forEach(function (p, idx) {
-                if (isTrash && [2, 3].indexOf(idx) !== -1) {
-                    return;
-                }
-                if (skipNext) {
-                    skipNext = false;
-                    return;
-                }
-                if (APP.newSharedFolder && priv.isEmbed && p === ROOT && !idx) {
-                    return;
-                }
+                if (isTrash && [2,3].indexOf(idx) !== -1) { return; }
+                if (skipNext) { skipNext = false; return; }
+                if (APP.newSharedFolder && priv.isEmbed && p === ROOT && !idx) { return; }
                 var name = p;
 
                 if (manager.isFile(el) && isInTrashRoot && idx === 1) {
@@ -2738,11 +2590,11 @@ define([
 
                 // Check if the current element is a shared folder. If it is, get its
                 // name and skip the next itme in the path (it will be "root")
-                var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx + 1));
+                var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx+1));
 
                 // If we're in trash root, check if the "element" is a shared folder
                 if (isTrash && idx === 1) {
-                    currentEl = manager.find(path.slice(0, idx + 3));
+                    currentEl = manager.find(path.slice(0, idx+3));
                 }
 
                 // Name and skip next...
@@ -2759,9 +2611,7 @@ define([
                         $span.click(function (e) {
                             e.stopPropagation();
                             var sliceEnd = idx + 1;
-                            if (isTrash && idx === 1) {
-                                sliceEnd = 4;
-                            } // Make sure we don't show the index or 'element' and 'path'
+                            if (isTrash && idx === 1) { sliceEnd = 4; } // Make sure we don't show the index or 'element' and 'path'
                             APP.displayDirectory(path.slice(0, sliceEnd));
                         });
                     }
@@ -2771,9 +2621,8 @@ define([
                 $span.data("path", path.slice(0, idx + 1));
                 addDragAndDropHandlers($span, path.slice(0, idx), true, true);
 
-                if (idx === 0) {
-                    name = p === SHARED_FOLDER ? name : getPrettyName(p);
-                } else if (!(APP.newSharedFolder && priv.isEmbed && idx === 1)) {
+                if (idx === 0) { name = p === SHARED_FOLDER ? name : getPrettyName(p); }
+                else if (!(APP.newSharedFolder && priv.isEmbed && idx === 1)) {
                     var $span2 = $('<span>', {
                         'class': 'cp-app-drive-path-element cp-app-drive-path-separator'
                     }).text(' / ');
@@ -2791,10 +2640,9 @@ define([
         };
 
 
+
         var createInfoBox = function (path) {
-            if (APP.readOnly || $content.data('readOnlyFolder')) {
-                return;
-            }
+            if (APP.readOnly || $content.data('readOnlyFolder')) { return; }
             var $box = $('<div>', {'class': 'cp-app-drive-content-info-box'});
             var msg;
             switch (path[0]) {
@@ -2824,7 +2672,7 @@ define([
             if (history.isHistoryMode && history.sfId) {
                 // Shared folder history: always display the warning
                 var sfName = (manager.getSharedFolderData(history.sfId) || {}).title || Messages.fm_sharedFolderName;
-                msg = Messages._getKey('fm_info_sharedFolderHistory', [sfName]);
+                msg = Messages._getKey('fm_info_sharedFolderHistory', [sfName]);
                 return $(common.fixLinks($box.html(msg)));
             }
             if (!APP.loggedIn) {
@@ -2858,15 +2706,15 @@ define([
 
         var getOppositeViewMode = function (viewMode) {
             viewMode = viewMode || getViewMode();
-            var newViewMode = viewMode === 'grid' ? 'list' : 'grid';
+            var newViewMode = viewMode === 'grid'? 'list': 'grid';
             return newViewMode;
         };
 
         // Create the button allowing the user to switch from list to icons modes
         var createViewModeButton = function ($container) {
             var viewMode = getViewMode();
-            var gridIcon = h('i.fa.fa-th-large', {title: Messages.fm_viewGridButton});
-            var listIcon = h('i.fa.fa-list', {title: Messages.fm_viewListButton});
+            var gridIcon = h('i.fa.fa-th-large', { title: Messages.fm_viewGridButton });
+            var listIcon = h('i.fa.fa-list', { title: Messages.fm_viewListButton });
 
             var $button = $(h('button.cp-app-drive-viewmode-button', [
                 gridIcon,
@@ -2914,8 +2762,7 @@ define([
             var buttons = [{
                 className: 'cancel',
                 name: Messages.cancelButton,
-                onClick: function () {
-                },
+                onClick: function () {},
                 keys: [27]
             }];
             if (hasOwned) {
@@ -2946,7 +2793,7 @@ define([
         };
         var createEmptyTrashButton = function () {
             var button = h('button.btn.btn-danger', [
-                h('i.fa.' + faTrash),
+                h('i.fa.'+faTrash),
                 h('span', Messages.fc_empty)
             ]);
             $(button).click(function () {
@@ -2964,7 +2811,7 @@ define([
             var content = h('div', [
                 h('h4', Messages.sharedFolders_create),
                 h('label', {for: 'cp-app-drive-sf-name'}, Messages.sharedFolders_create_name),
-                h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder, tabindex: '1'}),
+                h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder,tabindex:'1'}),
                 h('label', {for: 'cp-app-drive-sf-password'}, Messages.fm_shareFolderPassword),
                 UI.passwordInput({id: 'cp-app-drive-sf-password'}),
                 h('span', {
@@ -2982,9 +2829,7 @@ define([
             });
 
             UI.confirm(content, function (yes) {
-                if (!yes) {
-                    return void cb();
-                }
+                if (!yes) { return void cb(); }
 
                 // Get the values
                 var newName = $(content).find('#cp-app-drive-sf-name').val();
@@ -3036,18 +2881,9 @@ define([
             ]);
             var content = h('p', [
                 h('label', {for: 'cp-app-drive-link-name'}, Messages.fm_link_name),
-                name = h('input#cp-app-drive-link-name', {
-                    autocomplete: 'off',
-                    placeholder: Messages.fm_link_name_placeholder,
-                    tabindex: '1'
-                }),
+                name = h('input#cp-app-drive-link-name', { autocomplete: 'off', placeholder: Messages.fm_link_name_placeholder, tabindex:'1'}),
                 h('label', {for: 'cp-app-drive-link-url'}, Messages.fm_link_url),
-                url = h('input#cp-app-drive-link-url', {
-                    type: 'url',
-                    autocomplete: 'off',
-                    placeholder: Messages.form_input_ph_url,
-                    tabindex: '1'
-                }),
+                url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off', placeholder: Messages.form_input_ph_url,tabindex:'1'}),
                 warning,
             ]);
 
@@ -3075,8 +2911,7 @@ define([
             var buttons = [{
                 className: 'cancel',
                 name: Messages.cancelButton,
-                onClick: function () {
-                },
+                onClick: function () {},
                 keys: [27]
             }];
             buttons.push({
@@ -3088,9 +2923,7 @@ define([
                     var $name = $(name);
                     var n = $name.val().trim() || $name.attr('placeholder');
                     var u = $url.val().trim();
-                    if (!n || !u) {
-                        return true;
-                    }
+                    if (!n || !u) { return true; }
                     if (!Util.isValidURL(u)) {
                         UI.warn(Messages.fm_link_invalid);
                         return true;
@@ -3135,9 +2968,7 @@ define([
                             if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
                                 event.preventDefault();
                                 addSharedFolderModal(function (obj) {
-                                    if (!obj) {
-                                        return;
-                                    }
+                                    if (!obj) { return; }
                                     manager.addSharedFolder(currentPath, obj, refresh);
                                 });
                             }
@@ -3167,7 +2998,8 @@ define([
             }
             $block.find('a.cp-app-drive-new-doc, li.cp-app-drive-new-doc')
                 .on('click auxclick keypress', function (event) {
-                    if (event.type === 'click' || event.type === 'auxclick' || (event.type === 'keypress' && event.which === 13)) {
+                    if (event.type === 'click' || event.type === 'auxclick' || (event.type === 'keypress' && event.which === 13))
+                    {
                         event.preventDefault();
                         var type = $(this).attr('data-type') || 'pad';
                         var path = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
@@ -3190,7 +3022,7 @@ define([
                         name: Messages.fm_sharedFolder,
                     });
                 }
-                options.push({separator: true});
+                options.push({ separator: true });
                 options.push({
                     class: 'cp-app-drive-new-fileupload',
                     icon: getIcon('fileupload')[0],
@@ -3203,13 +3035,13 @@ define([
                         name: Messages.uploadFolderButton,
                     });
                 }
-                options.push({separator: true});
+                options.push({ separator: true });
                 options.push({
                     class: 'cp-app-drive-new-link',
                     icon: getIcon('link')[0],
                     name: Messages.fm_link_new,
                 });
-                options.push({separator: true});
+                options.push({ separator: true });
             }
             getNewPadTypes().forEach(function (type) {
                 var typeClass = 'cp-app-drive-new-doc';
@@ -3232,9 +3064,7 @@ define([
             if (APP.store[FILTER_BY]) {
                 var typeFilter = APP.store[FILTER_BY];
                 options = options.filter((obj) => {
-                    if (obj.separator) {
-                        return false;
-                    }
+                    if (obj.separator) { return false; }
 
                     if (typeFilter === 'link') {
                         return obj.class.includes('cp-app-drive-new-link');
@@ -3251,16 +3081,10 @@ define([
             return options;
         };
         var createNewButton = function (isInRoot, $container) {
-            if (!APP.editable) {
-                return;
-            }
-            if (!APP.loggedIn) {
-                return;
-            } // Anonymous users can use the + menu in the toolbar
+            if (!APP.editable) { return; }
+            if (!APP.loggedIn) { return; } // Anonymous users can use the + menu in the toolbar
 
-            if (!manager.isPathIn(currentPath, [ROOT, 'hrefArray'])) {
-                return;
-            }
+            if (!manager.isPathIn(currentPath, [ROOT, 'hrefArray'])) { return; }
 
             // Create dropdown
             var options = getNewPadOptions(isInRoot).map(function (obj) {
@@ -3372,9 +3196,7 @@ define([
             });
         };
         var createFilterButton = function (isTemplate, $container) {
-            if (!APP.loggedIn) {
-                return;
-            }
+            if (!APP.loggedIn) { return; }
 
             // Create dropdown
             var options = [];
@@ -3484,17 +3306,17 @@ define([
             // Add handlers
             if (APP.store[FILTER_BY]) {
                 $block.find('a.cp-app-drive-rm-filter')
-                    .click(function () {
-                        APP.store[FILTER_BY] = undefined;
-                        APP.displayDirectory(currentPath);
-                    });
+                .click(function () {
+                    APP.store[FILTER_BY] = undefined;
+                    APP.displayDirectory(currentPath);
+                });
             }
             $block.find('a.cp-app-drive-filter-doc')
-                .click(function () {
-                    var type = $(this).attr('data-type') || 'invalid-filter';
-                    APP.store[FILTER_BY] = type;
-                    APP.displayDirectory([FILTER, type, currentPath]);
-                });
+            .click(function () {
+                var type = $(this).attr('data-type') || 'invalid-filter';
+                APP.store[FILTER_BY] = type;
+                APP.displayDirectory([FILTER, type, currentPath]);
+            });
 
             $container.append($block);
         };
@@ -3504,10 +3326,10 @@ define([
         var SORT_FILE_DESC = 'sortFilesDesc';
 
         var getSortFileDesc = function () {
-            return APP.store[SORT_FILE_DESC] + "" === "true";
+            return APP.store[SORT_FILE_DESC]+"" === "true";
         };
         var getSortFolderDesc = function () {
-            return APP.store[SORT_FOLDER_DESC] + "" === "true";
+            return APP.store[SORT_FOLDER_DESC]+"" === "true";
         };
 
         var onSortByClick = function () {
@@ -3531,12 +3353,11 @@ define([
                 }
             } else {
                 ['cp-app-drive-element-type',
-                    'cp-app-drive-element-atime', 'cp-app-drive-element-ctime'].some(function (c) {
+                 'cp-app-drive-element-atime', 'cp-app-drive-element-ctime'].some(function (c) {
                     if ($span.hasClass(c)) {
                         var nValue = c.replace(/cp-app-drive-element-/, '');
-                        if (value === nValue) {
-                            descValue = descValue ? false : true;
-                        } else {
+                        if (value === nValue) { descValue = descValue ? false : true; }
+                        else {
                             // atime and ctime should be ordered in a desc order at the first click
                             value = nValue;
                             descValue = value !== 'title';
@@ -3557,7 +3378,7 @@ define([
             if (getSortFolderDesc()) {
                 $icon = $sortDescIcon.clone();
             }
-            if (typeof (APP.store[SORT_FOLDER_DESC]) !== "undefined") {
+            if (typeof(APP.store[SORT_FOLDER_DESC]) !== "undefined") {
                 $list.find('.cp-app-drive-sort-foldername').addClass('cp-app-drive-sort-active').prepend($icon);
             }
         };
@@ -3570,14 +3391,14 @@ define([
                     h('i.fa.fa-minus'),
                     Messages.fm_type,
                 ],
-            }, {
+            },{
                 tag: 'a',
                 attributes: {'class': 'cp-app-drive-element-atime'},
                 content: [
                     h('i.fa.fa-minus'),
                     Messages.fm_lastAccess,
                 ],
-            }, {
+            },{
                 tag: 'a',
                 attributes: {'class': 'cp-app-drive-element-ctime'},
                 content: [
@@ -3603,8 +3424,7 @@ define([
                 'class': 'cp-app-drive-element-header cp-app-drive-element-list'
             });
             var clickCls = clickable ? 'cp-app-drive-sort-clickable ' : '';
-            var onClick = clickable ? onSortByClick : function () {
-            };
+            var onClick = clickable ? onSortByClick : function () {};
             //var $fohElement = $('<span>', {'class': 'element'}).appendTo($folderHeader);
             var $fhIcon = $('<span>', {'class': 'cp-app-drive-content-icon'});
             var $name = $('<span>', {
@@ -3625,10 +3445,8 @@ define([
                 'class': 'cp-app-drive-element-filler cp-app-drive-element-list'
             });
             $fohElement.append($fhIcon).append($name).append($state)
-                .append($subfolders).append($files).append($filler);
-            if (clickable) {
-                addFolderSortIcon($fohElement);
-            }
+                        .append($subfolders).append($files).append($filler);
+            if (clickable) { addFolderSortIcon($fohElement); }
             return $fohElement;
         };
         var addFileSortIcon = function ($list) {
@@ -3637,11 +3455,8 @@ define([
                 $icon = $sortDescIcon.clone();
             }
             var classSorted;
-            if (APP.store[SORT_FILE_BY] === '') {
-                classSorted = 'cp-app-drive-sort-filename';
-            } else if (APP.store[SORT_FILE_BY]) {
-                classSorted = 'cp-app-drive-element-' + APP.store[SORT_FILE_BY];
-            }
+            if (APP.store[SORT_FILE_BY] === '') { classSorted = 'cp-app-drive-sort-filename'; }
+            else if (APP.store[SORT_FILE_BY]) { classSorted = 'cp-app-drive-element-' + APP.store[SORT_FILE_BY]; }
             if (classSorted) {
                 $list.find('.' + classSorted).addClass('cp-app-drive-sort-active').prepend($icon).find('i').hide();
             }
@@ -3651,8 +3466,7 @@ define([
                 'class': 'cp-app-drive-element-header cp-app-drive-element-list'
             });
             var clickCls = clickable ? 'cp-app-drive-sort-clickable ' : '';
-            var onClick = clickable ? onSortByClick : function () {
-            };
+            var onClick = clickable ? onSortByClick : function () {};
             //var $fihElement = $('<span>', {'class': 'element'}).appendTo($fileHeader);
             var $fhIcon = $('<span>', {'class': 'cp-app-drive-content-icon'});
             var $fhName = $('<span>', {
@@ -3673,9 +3487,7 @@ define([
             // If displayTitle is false, it means the "name" is the title, so do not display the "name" header
             $fihElement.append($fhIcon).append($fhName).append($fhSort).append($fhState).append($fhType);
             $fihElement.append($fhAdate).append($fhCdate);
-            if (clickable) {
-                addFileSortIcon($fihElement);
-            }
+            if (clickable) { addFileSortIcon($fihElement); }
             return $fihElement;
         };
 
@@ -3689,9 +3501,7 @@ define([
             var keys = oldkeys.filter(function (e) {
                 return useId ? test(e) : (path && test(root[e]));
             });
-            if (keys.length < 2) {
-                return keys;
-            }
+            if (keys.length < 2) { return keys; }
             var mult = asc ? 1 : -1;
             var getProp = function (_el) {
                 var el = useId ? _el : root[_el];
@@ -3704,35 +3514,29 @@ define([
                     return String((el && el.key) || _el).toLowerCase();
                 }
                 var data = manager.getFileData(el);
-                if (!data) {
-                    return '';
-                }
+                if (!data) { return ''; }
                 if (prop === 'type') {
                     var hrefData = Hash.parsePadUrl(data.href || data.roHref);
                     return hrefData.type;
                 }
                 if (prop === 'atime' || prop === 'ctime') {
-                    return typeof (data[prop]) === "number" ? data[prop] : new Date(data[prop]);
+                    return typeof(data[prop]) === "number" ? data[prop] : new Date(data[prop]);
                 }
                 return (manager.getTitle(el) || "").toLowerCase();
             };
             var props = {};
             keys.forEach(function (k) {
                 var uid = k;
-                if (typeof (k) === "object") {
+                if (typeof(k) === "object") {
                     uid = k.uid = Util.uid();
                 }
                 props[uid] = getProp(k);
             });
-            keys.sort(function (a, b) {
+            keys.sort(function(a, b) {
                 var _a = props[(a && a.uid) || a];
                 var _b = props[(b && b.uid) || b];
-                if (_a < _b) {
-                    return mult * -1;
-                }
-                if (_b < _a) {
-                    return mult;
-                }
+                if (_a < _b) { return mult * -1; }
+                if (_b < _a) { return mult; }
                 return 0;
             });
             return keys;
@@ -3742,9 +3546,7 @@ define([
             var keys = oldkeys.filter(function (e) {
                 return test(e.element);
             });
-            if (keys.length < 2) {
-                return keys;
-            }
+            if (keys.length < 2) { return keys; }
             var mult = asc ? 1 : -1;
             var getProp = function (el, prop) {
                 if (prop && !folder) {
@@ -3752,10 +3554,10 @@ define([
                     var e = manager.getFileData(element);
                     if (!e) {
                         e = {
-                            href: el,
-                            title: Messages.fm_noname,
-                            atime: 0,
-                            ctime: 0
+                            href : el,
+                            title : Messages.fm_noname,
+                            atime : 0,
+                            ctime : 0
                         };
                     }
                     if (prop === 'type') {
@@ -3768,13 +3570,9 @@ define([
                 }
                 return (el.name || "").toLowerCase();
             };
-            keys.sort(function (a, b) {
-                if (getProp(a, prop) < getProp(b, prop)) {
-                    return mult * -1;
-                }
-                if (getProp(a, prop) > getProp(b, prop)) {
-                    return mult * 1;
-                }
+            keys.sort(function(a, b) {
+                if (getProp(a, prop) < getProp(b, prop)) { return mult * -1; }
+                if (getProp(a, prop) > getProp(b, prop)) { return mult * 1; }
                 return 0;
             });
             return keys;
@@ -3790,9 +3588,7 @@ define([
                 .filter(function (e) {
                     var id = useId ? e : root[e];
                     var data = manager.getFileData(id);
-                    if (type === 'link') {
-                        return data.static;
-                    }
+                    if (type === 'link') { return data.static; }
                     var href = data.href || data.roHref;
                     return href ? (href.split('/')[1] === type) : true;
                     // if types are unreachable, display files to avoid misleading the user
@@ -3803,16 +3599,14 @@ define([
         var createNewPadIcons = function ($block, isInRoot) {
             var $container = $('<ul>');
             getNewPadOptions(isInRoot).forEach(function (obj) {
-                if (obj.separator) {
-                    return;
-                }
+                if (obj.separator) { return; }
 
                 var $element = $('<li>', {
                     'class': obj.class + ' cp-app-drive-element-row ' +
                         'cp-app-drive-element-grid',
-                    'tabindex': 1
+                        'tabindex': 1
                 }).prepend(obj.icon).appendTo($container);
-                $element.append($('<span>', {'class': 'cp-app-drive-new-name'}).text(obj.name));
+                $element.append($('<span>', { 'class': 'cp-app-drive-new-name' }).text(obj.name));
 
                 if (obj.type) {
                     $element.attr('data-type', obj.type);
@@ -3825,9 +3619,7 @@ define([
             return $container;
         };
         var createGhostIcon = function ($list) {
-            if (APP.$content.data('readOnlyFolder') || !APP.editable) {
-                return;
-            }
+            if (APP.$content.data('readOnlyFolder') || !APP.editable) { return; }
             var isInRoot = currentPath[0] === ROOT;
             var $element = $('<li>', {
                 'class': 'cp-app-drive-element-row cp-app-drive-new-ghost'
@@ -3840,15 +3632,13 @@ define([
                     $body: $('body')
                 });
                 var $modal = modal.$modal;
-                var $title = $(h('h3', [h('i.fa.fa-plus'), ' ', Messages.fm_newButton]));
+                var $title = $(h('h3', [ h('i.fa.fa-plus'), ' ', Messages.fm_newButton ]));
                 var $description = $('<p>').text(Messages.fm_newButtonTitle);
                 $modal.find('.cp-modal').append($title);
                 $modal.find('.cp-modal').append($description);
                 var $content = createNewPadIcons($modal, isInRoot);
                 $modal.find('.cp-modal').append($content);
-                window.setTimeout(function () {
-                    modal.show();
-                });
+                window.setTimeout(function () { modal.show(); });
                 addNewPadHandlers($modal, isInRoot);
             });
         };
@@ -3861,7 +3651,7 @@ define([
             }
         };
         var collapseTreeButton = function () {
-            APP.$collapseButton = APP.$collapseButton || common.createButton('', true, {
+            APP.$collapseButton = APP.$collapseButton || common.createButton('', true, {
                 text: Messages.drive_treeButton,
                 name: 'files',
                 icon: 'fa-hdd-o',
@@ -3888,9 +3678,7 @@ define([
                 APP.toolbar.$bottomR.append(APP.$burnThisDrive);
             }
             // this button is not useful for unregistered users who do not have a tree worth looking at
-            if (APP.loggedIn) {
-                collapseTreeButton();
-            }
+            if (APP.loggedIn) { collapseTreeButton(); }
             return $toolbar;
         };
 
@@ -3911,15 +3699,15 @@ define([
                 var file = manager.getFileData(id);
                 if (!file) {
                     //debug("Unsorted or template returns an element not present in filesData: ", href);
-                    file = {title: Messages.fm_noname};
+                    file = { title: Messages.fm_noname };
                     //return;
                 }
                 var idx = files[rootName].indexOf(id);
                 var $icon = getFileIcon(id);
                 var ro = manager.isReadOnlyFile(id);
                 // ro undefined mens it's an old hash which doesn't support read-only
-                var roClass = typeof (ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
-                    ro ? ' cp-app-drive-element-readonly' : '';
+                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                                ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-file cp-app-drive-element-row' + roClass,
                     draggable: draggable
@@ -3934,7 +3722,7 @@ define([
                     openFile(id);
                 });
                 addFileData(id, $element);
-                $element.click(function (e) {
+                $element.click(function(e) {
                     e.stopPropagation();
                     onElementClick(e, $element);
                 });
@@ -3966,7 +3754,7 @@ define([
                 var $icon = getFileIcon(id);
                 var ro = manager.isReadOnlyFile(id);
                 // ro undefined maens it's an old hash which doesn't support read-only
-                var roClass = typeof (ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
                     ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass
@@ -3977,7 +3765,7 @@ define([
                 addFileData(id, $element);
                 $element.data('path', [FILES_DATA, id]);
                 $element.data('element', id);
-                $element.click(function (e) {
+                $element.click(function(e) {
                     e.stopPropagation();
                     onElementClick(e, $element);
                 });
@@ -4000,9 +3788,7 @@ define([
                     return;
                 }
                 root[key].forEach(function (el, idx) {
-                    if (!manager.isFile(el.element) && !manager.isFolder(el.element)) {
-                        return;
-                    }
+                    if (!manager.isFile(el.element) && !manager.isFolder(el.element)) { return; }
                     var spath = [key, idx, 'element'];
                     filesList.push({
                         element: el.element,
@@ -4017,9 +3803,7 @@ define([
             var sortedFiles = sortTrashElements(false, filesList, APP.store[SORT_FILE_BY], !getSortFileDesc);
 
             if (typeFilter) {
-                var ids = sortedFiles.map(function (obj) {
-                    return obj.element;
-                });
+                var ids = sortedFiles.map(function (obj) { return obj.element; });
                 var idsFilter = filterPads(ids, typeFilter, false, true);
                 sortedFiles = sortedFiles.filter(function (obj) {
                     return (idsFilter.indexOf(obj.element) !== -1);
@@ -4033,16 +3817,12 @@ define([
                 $content.append($empty);
             }
 
-            if (!typeFilter && manager.hasSubfolder(root, true)) {
-                $list.append($folderHeader);
-            }
+            if (!typeFilter && manager.hasSubfolder(root, true)) { $list.append($folderHeader); }
             sortedFolders.forEach(function (f) {
                 var $element = createElement([TRASH], f.spath, root, true);
                 $list.append($element);
             });
-            if (manager.hasFile(root, true)) {
-                $list.append($fileHeader);
-            }
+            if (manager.hasFile(root, true)) { $list.append($fileHeader); }
             sortedFiles.forEach(function (f) {
                 var $element = createElement([TRASH], f.spath, root, false);
                 $list.append($element);
@@ -4072,9 +3852,7 @@ define([
                     return;
                 }
                 var currentValue = $input.val().trim();
-                if (search.to) {
-                    window.clearTimeout(search.to);
-                }
+                if (search.to) { window.clearTimeout(search.to); }
                 if (e.which === 13) {
                     spinner.spin();
                     var newLocation = [SEARCH, $input.val()];
@@ -4099,27 +3877,23 @@ define([
                     return;
                 }
 
-                if (currentValue.length < 2) {
-                    return;
-                } // Don't autosearch 1 character
+                if (currentValue.length < 2) { return; } // Don't autosearch 1 character
                 search.to = window.setTimeout(function () {
                     var newLocation = [SEARCH, $input.val()];
                     search.cursor = $input[0].selectionStart;
-                    if (currentValue === search.value) {
-                        return;
-                    }
+                    if (currentValue === search.value) { return; }
                     if (!manager.comparePath(newLocation, currentPath.slice())) {
                         searching = true;
                         APP.displayDirectory(newLocation);
                     }
                 }, 500);
-            }).on('click mousedown mouseup', function (e) {
+            }).on('click mousedown mouseup', function (e) {
                 e.stopPropagation();
             }).val(value || '').appendTo($div);
             $input[0].selectionStart = search.cursor || 0;
             $input[0].selectionEnd = search.cursor || 0;
 
-            var cancel = h('span.fa.fa-times.cp-app-drive-search-cancel', {title: Messages.cancel});
+            var cancel = h('span.fa.fa-times.cp-app-drive-search-cancel', {title:Messages.cancel});
             cancel.addEventListener('click', function () {
                 $input.val('');
                 search.cursor = 0;
@@ -4133,7 +3907,7 @@ define([
                 $input.focus();
             });
 
-            if (typeof (value) === "string" && value.trim()) {
+            if (typeof(value) === "string" && value.trim()) {
                 spinner.spin();
             } else {
                 searching = false;
@@ -4155,9 +3929,7 @@ define([
                     // if r.id === null, then it's a folder, not a file
                     r.paths.forEach(function (path) {
                         if (!r.inSharedFolder &&
-                            APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) {
-                            return;
-                        }
+                            APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) { return; }
                         var _path = path.slice();
                         var key = path.pop();
                         var root = manager.find(path);
@@ -4185,7 +3957,7 @@ define([
                     $element.off('contextmenu');
                     $element.contextmenu(openContextMenu('default'));
                     $element.data('context', 'default');
-                    if (folder) {
+                    if (folder) {
                         $element.find('.cp-app-drive-element-list').css({
                             visibility: 'hidden'
                         }).text('');
@@ -4201,16 +3973,12 @@ define([
 
                     $list.append($element);
                 };
-                if (_folders.length) {
-                    getFolderListHeader(true, true).appendTo($list);
-                }
+                if (_folders.length) { getFolderListHeader(true, true).appendTo($list); }
                 _folders.forEach(function (el) {
                     var obj = el;
                     addEl(obj, true);
                 });
-                if (_files.length) {
-                    getFileListHeader(true).appendTo($list);
-                }
+                if (_files.length) { getFileListHeader(true).appendTo($list); }
                 _files.forEach(function (el) {
                     var obj = sortable[el];
                     addEl(obj, false);
@@ -4227,20 +3995,18 @@ define([
 
             var now = new Date();
             var last1 = new Date(now);
-            last1.setDate(last1.getDate() - 1);
+            last1.setDate(last1.getDate()-1);
             var last7 = new Date(now);
-            last7.setDate(last7.getDate() - 7);
+            last7.setDate(last7.getDate()-7);
             var last28 = new Date(now);
-            last28.setDate(last28.getDate() - 28);
+            last28.setDate(last28.getDate()-28);
 
             var header7, header28, headerOld;
             var i = 0;
             var channels = [];
 
             if (typeFilter) {
-                var ids = filesList.map(function (arr) {
-                    return arr[0];
-                });
+                var ids = filesList.map(function (arr) { return arr[0]; });
                 var idsFilter = filterPads(ids, typeFilter, false, true);
                 filesList = filesList.filter(function (arr) {
                     return (idsFilter.indexOf(arr[0]) !== -1);
@@ -4253,29 +4019,19 @@ define([
             filesList.some(function (arr) {
                 var id = arr[0];
                 var file = arr[1];
-                if (!file || !file.atime) {
-                    return;
-                }
+                if (!file || !file.atime) { return; }
 
                 if (file.atime <= last28 && i >= limit) {
                     return true;
                 }
 
                 var paths = manager.findFile(id);
-                if (!paths.length) {
-                    return;
-                }
+                if (!paths.length) { return; }
                 var path = paths[0];
-                if (manager.isPathIn(path, [TRASH])) {
-                    return;
-                }
+                if (manager.isPathIn(path, [TRASH])) { return; }
 
-                if (!file.channel) {
-                    file.channel = id;
-                }
-                if (channels.indexOf(file.channel) !== -1) {
-                    return;
-                }
+                if (!file.channel) { file.channel = id; }
+                if (channels.indexOf(file.channel) !== -1) { return; }
                 channels.push(file.channel);
 
                 if (!header7 && file.atime < last1) {
@@ -4315,26 +4071,22 @@ define([
         // Owned pads category
         var displayOwned = function ($container) {
             var list = manager.getOwnedPads();
-            if (list.length === 0) {
-                return;
-            }
+            if (list.length === 0) { return; }
             var $fileHeader = getFileListHeader(true);
             $container.append($fileHeader);
             var sortedFiles = sortElements(false, false, list, APP.store[SORT_FILE_BY], !getSortFileDesc(), true);
             sortedFiles.forEach(function (id) {
                 var paths = manager.findFile(id);
-                if (!paths.length) {
-                    return;
-                }
+                if (!paths.length) { return; }
                 var path = paths[0];
                 var $icon = getFileIcon(id);
                 var ro = manager.isReadOnlyFile(id);
                 // ro undefined maens it's an old hash which doesn't support read-only
-                var roClass = typeof (ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
                     ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-notrash ' +
-                        'cp-app-drive-element-file cp-app-drive-element-row' + roClass
+                             'cp-app-drive-element-file cp-app-drive-element-row' + roClass
                 });
                 $element.prepend($icon).dblclick(function () {
                     openFile(id);
@@ -4342,7 +4094,7 @@ define([
                 addFileData(id, $element);
                 $element.data('path', path);
                 $element.data('element', id);
-                $element.click(function (e) {
+                $element.click(function(e) {
                     e.stopPropagation();
                     onElementClick(e, $element);
                 });
@@ -4355,9 +4107,7 @@ define([
         // Tags category
         var displayTags = function ($container) {
             var list = manager.getTagsList();
-            if (Object.keys(list).length === 0) {
-                return;
-            }
+            if (Object.keys(list).length === 0) { return; }
             var sortedTags = Object.keys(list);
             sortedTags.sort(function (a, b) {
                 return list[b] - list[a];
@@ -4369,7 +4119,7 @@ define([
                 ])
             ];
             sortedTags.forEach(function (tag) {
-                var tagLink = h('a', {href: '#'}, '#' + tag);
+                var tagLink = h('a', { href: '#' }, '#' + tag);
                 $(tagLink).click(function () {
                     if (displayedCategories.indexOf(SEARCH) !== -1) {
                         APP.displayDirectory([SEARCH, '#' + tag]);
@@ -4398,32 +4148,22 @@ define([
 
             var realPath = [ROOT, SHARED_FOLDER].concat(path);
 
-            if (manager.hasSubfolder(root)) {
-                $list.append($folderHeader);
-            }
+            if (manager.hasSubfolder(root)) { $list.append($folderHeader); }
             // display sub directories
             var keys = Object.keys(root);
             var sortedFolders = sortElements(true, realPath, keys, null, !getSortFolderDesc());
             var sortedFiles = sortElements(false, realPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
             sortedFolders.forEach(function (key) {
-                if (manager.isFile(root[key])) {
-                    return;
-                }
+                if (manager.isFile(root[key])) { return; }
                 var $element = createElement(realPath, key, root, true);
                 $element.appendTo($list);
             });
-            if (manager.hasFile(root)) {
-                $list.append($fileHeader);
-            }
+            if (manager.hasFile(root)) { $list.append($fileHeader); }
             // display files
             sortedFiles.forEach(function (key) {
-                if (manager.isFolder(root[key])) {
-                    return;
-                }
+                if (manager.isFolder(root[key])) { return; }
                 var $element = createElement(realPath, key, root, false);
-                if (!$element) {
-                    return;
-                }
+                if (!$element) { return; }
                 $element.appendTo($list);
             });
         };
@@ -4431,18 +4171,12 @@ define([
         // Display the selected directory into the content part (rightside)
         // NOTE: Elements in the trash are not using the same storage structure as the others
         var _displayDirectory = function (path, force) {
-            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) {
-                return;
-            }
+            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
 
             APP.hideMenu();
 
-            if (!APP.editable) {
-                debug("Read-only mode");
-            }
-            if (!appStatus.isReady && !force) {
-                return;
-            }
+            if (!APP.editable) { debug("Read-only mode"); }
+            if (!appStatus.isReady && !force) { return; }
 
             // Fix path obvious issues
             if (!path || path.length === 0) {
@@ -4473,9 +4207,7 @@ define([
             var typeFilter;
             var isFilter = path[0] === FILTER;
             if (isFilter) {
-                if (path.length < 3) {
-                    return;
-                }
+                if (path.length < 3) { return; }
                 typeFilter = path[1];
                 path = path[2];
                 currentPath = path;
@@ -4505,11 +4237,9 @@ define([
                 // ANON_SHARED_FOLDER
                 path.push(manager.user.userObject.ROOT);
                 root = manager.find(path);
-                if (!root) {
-                    return;
-                }
+                if (!root) { return; }
             }
-            if (!isVirtual && typeof (root) === "undefined") {
+            if (!isVirtual && typeof(root) === "undefined") {
                 log(Messages.fm_unknownFolderError);
                 debug("Unable to locate the selected directory: ", path);
                 if (path.length === 1 && path[0] === ROOT) {
@@ -4522,9 +4252,7 @@ define([
                 _displayDirectory(parentPath, true);
                 return;
             }
-            if (!isSearch) {
-                delete APP.Search.oldLocation;
-            }
+            if (!isSearch) { delete APP.Search.oldLocation; }
 
             // Display the tree and build the content
             APP.resetTree();
@@ -4533,9 +4261,7 @@ define([
 
             createToolbar(path);
 
-            if (!isSearch) {
-                createTitle($content, path);
-            }
+            if (!isSearch) { createTitle($content, path); }
             var $info = createInfoBox(path);
 
             var $dirContent = $('<div>', {id: FOLDER_CONTENT_ID});
@@ -4571,8 +4297,8 @@ define([
                 (function () {
                     // show 'READ-ONLY' when a guest only has view rights
                     if (/\/view\//.test(APP.anonSFHref)) {
-                        // !common.getMetadataMgr().getPrivateData().canEdit
-                        // would accomplish the same thing if this breaks
+            // !common.getMetadataMgr().getPrivateData().canEdit
+            // would accomplish the same thing if this breaks
                         $content.prepend($readOnly.clone());
                         return;
                     }
@@ -4627,7 +4353,7 @@ define([
                     $li.contextmenu();
                 });
             } else {
-                var $contextButtons = $('<span>', {'id': 'cp-app-drive-toolbar-contextbuttons'});
+                var $contextButtons = $('<span>', {'id' : 'cp-app-drive-toolbar-contextbuttons'});
                 $contextButtons.appendTo(APP.toolbar.$bottomR);
             }
             updateContextButton();
@@ -4653,47 +4379,31 @@ define([
                 // ANON_SHARED_FOLDER
                 displaySharedFolder($list);
             } else {
-                if (!inTrash) {
-                    $dirContent.contextmenu(openContextMenu('content'));
-                }
-                if (!isFilter && manager.hasSubfolder(root)) {
-                    $list.append($folderHeader);
-                }
+                if (!inTrash) { $dirContent.contextmenu(openContextMenu('content')); }
+                if (!isFilter && manager.hasSubfolder(root)) { $list.append($folderHeader); }
                 // display sub directories
                 var keys = Object.keys(root);
                 var sortedFolders = isFilter ? [] : sortElements(true, path, keys, null, !getSortFolderDesc());
                 var sortedFiles = sortElements(false, path, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
                 sortedFiles = isFilter ? filterPads(sortedFiles, typeFilter, path) : sortedFiles;
                 sortedFolders.forEach(function (key) {
-                    if (manager.isFile(root[key])) {
-                        return;
-                    }
+                    if (manager.isFile(root[key])) { return; }
                     var $element = createElement(path, key, root, true);
                     $element.appendTo($list);
                 });
-                if (manager.hasFile(root)) {
-                    $list.append($fileHeader);
-                }
+                if (manager.hasFile(root)) { $list.append($fileHeader); }
                 // display files
                 sortedFiles.forEach(function (key) {
-                    if (manager.isFolder(root[key])) {
-                        return;
-                    }
+                    if (manager.isFolder(root[key])) { return; }
                     var p = path.slice();
                     p.push(key);
-                    if (APP.hideDuplicateOwned && manager.isDuplicateOwned(p)) {
-                        return;
-                    }
+                    if (APP.hideDuplicateOwned && manager.isDuplicateOwned(p)) { return; }
                     var $element = createElement(path, key, root, false);
-                    if (!$element) {
-                        return;
-                    }
+                    if (!$element) { return; }
                     $element.appendTo($list);
                 });
 
-                if (!inTrash) {
-                    createGhostIcon($list);
-                }
+                if (!inTrash) { createGhostIcon($list); }
             }
             $content.append($info).append($dirContent);
 
@@ -4719,7 +4429,7 @@ define([
                 } else {
                     $content.scrollTop(s);
                 }
-            } else {
+            } else {
                 $content.scrollTop(s);
             }
 
@@ -4728,11 +4438,8 @@ define([
             appStatus.ready(true);
         };
         var displayDirectory = APP.displayDirectory = function (path, force, cb) {
-            cb = cb || function () {
-            };
-            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) {
-                return;
-            }
+            cb = cb || function () {};
+            if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
             if (history.isHistoryMode) {
                 _displayDirectory(path, force);
                 return void cb();
@@ -4750,16 +4457,13 @@ define([
         };
 
         var createTreeElement = function (name, $icon, path, draggable, droppable, collapsable, active, isSharedFolder) {
-            var $name = $('<span>', {'class': 'cp-app-drive-element'}).text(name);
+            var $name = $('<span>', { 'class': 'cp-app-drive-element' }).text(name);
             $icon.css("color", isSharedFolder ? getFolderColor(path.slice(0, -1)) : getFolderColor(path));
             var $collapse;
             if (collapsable) {
                 $collapse = $expandIcon.clone().attr('tabindex', 0);
             }
-            var $elementRow = $('<span>', {
-                'class': 'cp-app-drive-element-row',
-                'tabindex': 0
-            }).append($collapse).append($icon).append($name).on('click keypress', function (e) {
+            var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row', 'tabindex': 0}).append($collapse).append($icon).append($name).on('click keypress', function (e) {
                 if (e.type === 'keypress' && e.which !== 13) {
                     return;
                 }
@@ -4782,12 +4486,10 @@ define([
                 _addOwnership($elementRow, $(), sfData);
             }
             var $element = $('<li>').append($elementRow);
-            if (draggable) {
-                $elementRow.attr('draggable', true);
-            }
+            if (draggable) { $elementRow.attr('draggable', true); }
             if (collapsable) {
                 $element.addClass('cp-app-drive-element-collapsed');
-                $collapse.on('click keypress', function (e) {
+                $collapse.on('click keypress', function(e) {
                     if (e.type === 'keypress' && e.which !== 13) {
                         return;
                     }
@@ -4811,7 +4513,7 @@ define([
                     }
                 });
                 if (LS.wasFolderOpened(path) ||
-                    (manager.isSubpath(currentPath, path) && path.length < currentPath.length)) {
+                        (manager.isSubpath(currentPath, path) && path.length < currentPath.length)) {
                     $collapse.click();
                 }
             }
@@ -4831,7 +4533,7 @@ define([
             var rootName = ROOT_NAME;
             if (APP.newSharedFolder && priv.isEmbed && isRoot) {
                 var newSFPaths = manager.findFile(Number(APP.newSharedFolder));
-                if (newSFPaths.length) {
+                if (newSFPaths.length) {
                     path = newSFPaths[0];
                     path.push(ROOT);
                     root = manager.find(path);
@@ -4840,9 +4542,7 @@ define([
             }
 
             // don't try to display what doesn't exist
-            if (!root) {
-                return;
-            }
+            if (!root) { return; }
 
             // Display the root element in the tree
             if (isRoot) {
@@ -4860,25 +4560,21 @@ define([
                 $('<ul>', {'class': 'cp-app-drive-tree-docs'})
                     .append($rootElement).appendTo($container);
                 $container = $rootElement;
-            } else if (manager.isFolderEmpty(root)) {
-                return;
-            }
+            } else if (manager.isFolderEmpty(root)) { return; }
 
             // Display root content
             var $list = $('<ul>').appendTo($container);
             var keys = Object.keys(root).sort(function (a, b) {
                 var newA = manager.isSharedFolder(root[a]) ?
-                    manager.getSharedFolderData(root[a]).title : a;
+                            manager.getSharedFolderData(root[a]).title : a;
                 var newB = manager.isSharedFolder(root[b]) ?
-                    manager.getSharedFolderData(root[b]).title : b;
+                            manager.getSharedFolderData(root[b]).title : b;
                 return newA < newB ? -1 :
-                    (newA === newB ? 0 : 1);
+                        (newA === newB ? 0 : 1);
             });
             keys.forEach(function (key) {
                 // Do not display files in the menu
-                if (!manager.isFolder(root[key])) {
-                    return;
-                }
+                if (!manager.isFolder(root[key])) { return; }
                 var newPath = path.slice();
                 newPath.push(key);
                 var isSharedFolder = manager.isSharedFolder(root[key]) && root[key];
@@ -4908,7 +4604,7 @@ define([
                 var f = folders[sfId];
                 var editable = !(f && f.readOnly);
                 var $element = createTreeElement(key, $icon.clone(), newPath, true, editable,
-                    subfolder, isCurrentFolder, isSharedFolder);
+                                                subfolder, isCurrentFolder, isSharedFolder);
                 $element.appendTo($list);
                 $element.find('>.cp-app-drive-element-row').contextmenu(openContextMenu('tree'));
                 if (isSharedFolder) {
@@ -4918,9 +4614,7 @@ define([
                 if (sfId && !editable) {
                     $element.attr('data-ro', true);
                 }
-                if (!subfolder) {
-                    return;
-                }
+                if (!subfolder) { return; }
                 createTree($element, newPath);
             });
         };
@@ -4931,8 +4625,8 @@ define([
             var $trashElement = createTreeElement(TRASH_NAME, $icon, [TRASH], false, true, false, isOpened);
             $trashElement.addClass('cp-app-drive-tree-root');
             $trashElement.find('>.cp-app-drive-element-row')
-                .contextmenu(openContextMenu('trashtree'));
-            var $trashList = $('<ul>', {'class': 'cp-app-drive-tree-category'})
+                         .contextmenu(openContextMenu('trashtree'));
+            var $trashList = $('<ul>', { 'class': 'cp-app-drive-tree-category' })
                 .append($trashElement);
             $container.append($trashList);
         };
@@ -4969,7 +4663,7 @@ define([
             var isOpened = manager.comparePath([cat], currentPath);
             var $element = createTreeElement(options.name, $icon, [cat], options.draggable, options.droppable, false, isOpened);
             $element.addClass('cp-app-drive-tree-root');
-            var $list = $('<ul>', {'class': 'cp-app-drive-tree-category'}).append($element);
+            var $list = $('<ul>', { 'class': 'cp-app-drive-tree-category' }).append($element);
             $container.append($list);
         };
 
@@ -4981,30 +4675,14 @@ define([
 
             var $div = $('<div>', {'class': 'cp-app-drive-tree-categories-container'})
                 .appendTo($tree);
-            if (displayedCategories.indexOf(SEARCH) !== -1) {
-                createCategory($div, SEARCH);
-            }
-            if (displayedCategories.indexOf(TAGS) !== -1) {
-                createCategory($div, TAGS);
-            }
-            if (displayedCategories.indexOf(RECENT) !== -1) {
-                createCategory($div, RECENT);
-            }
-            if (displayedCategories.indexOf(OWNED) !== -1) {
-                createCategory($div, OWNED);
-            }
-            if (displayedCategories.indexOf(ROOT) !== -1) {
-                createTree($div, [ROOT]);
-            }
-            if (displayedCategories.indexOf(TEMPLATE) !== -1) {
-                createCategory($div, TEMPLATE);
-            }
-            if (displayedCategories.indexOf(FILES_DATA) !== -1) {
-                createCategory($div, FILES_DATA);
-            }
-            if (displayedCategories.indexOf(TRASH) !== -1) {
-                createTrash($div, [TRASH]);
-            }
+            if (displayedCategories.indexOf(SEARCH) !== -1) { createCategory($div, SEARCH); }
+            if (displayedCategories.indexOf(TAGS) !== -1) { createCategory($div, TAGS); }
+            if (displayedCategories.indexOf(RECENT) !== -1) { createCategory($div, RECENT); }
+            if (displayedCategories.indexOf(OWNED) !== -1) { createCategory($div, OWNED); }
+            if (displayedCategories.indexOf(ROOT) !== -1) { createTree($div, [ROOT]); }
+            if (displayedCategories.indexOf(TEMPLATE) !== -1) { createCategory($div, TEMPLATE); }
+            if (displayedCategories.indexOf(FILES_DATA) !== -1) { createCategory($div, FILES_DATA); }
+            if (displayedCategories.indexOf(TRASH) !== -1) { createTrash($div, [TRASH]); }
 
             $tree.append(APP.$limit);
             $categories = $tree.find('.cp-app-drive-tree-categories-container');
@@ -5023,16 +4701,12 @@ define([
         };
 
         var stringifyPath = function (path) {
-            if (!Array.isArray(path)) {
-                return;
-            }
+            if (!Array.isArray(path)) { return; }
             var div = h('div');
             var space = 10;
             path.forEach(function (s, i) {
-                if (i === 0) {
-                    s = getPrettyName(s);
-                }
-                div.appendChild(h('span', {style: 'margin: 0 0 0 ' + i * space + 'px',}, s));
+                if (i === 0) { s = getPrettyName(s); }
+                div.appendChild(h('span', { style: 'margin: 0 0 0 ' + i * space + 'px', }, s));
                 div.appendChild(h(('br')));
             });
             return div;
@@ -5040,9 +4714,7 @@ define([
 
         // Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs
         var onWindowClick = function (e) {
-            if (!e.target || !$(e.target).parents('.cp-dropdown-content').length) {
-                return;
-            }
+            if (!e.target || !$(e.target).parents('.cp-dropdown-content').length) { return; }
             if (e.which !== 1) {
                 e.stopPropagation();
                 return false;
@@ -5060,9 +4732,7 @@ define([
             } else {
                 data = JSON.parse(JSON.stringify(manager.getFileData(el)));
             }
-            if (!data || !(data.href || data.roHref)) {
-                return void cb('INVALID_FILE');
-            }
+            if (!data || !(data.href || data.roHref)) { return void cb('INVALID_FILE'); }
 
             var opts = {};
             opts.href = Hash.getRelativeHref(data.href || data.roHref);
@@ -5070,9 +4740,7 @@ define([
 
             if (manager.isSharedFolder(el)) {
                 var ro = folders[el] && folders[el].version >= 2;
-                if (!ro) {
-                    opts.noReadOnly = true;
-                }
+                if (!ro) { opts.noReadOnly = true; }
             }
             Properties.getPropertiesModal(common, opts, cb);
         };
@@ -5086,9 +4754,7 @@ define([
             } else {
                 data = JSON.parse(JSON.stringify(manager.getFileData(el)));
             }
-            if (!data || !(data.href || data.roHref)) {
-                return void cb('INVALID_FILE');
-            }
+            if (!data || !(data.href || data.roHref)) { return void cb('INVALID_FILE'); }
 
             var opts = {};
             opts.href = Hash.getRelativeHref(data.href || data.roHref);
@@ -5110,17 +4776,13 @@ define([
         var deleteOwnedPaths = function (paths, pathsList) {
             pathsList = pathsList || [];
             if (paths) {
-                paths.forEach(function (p) {
-                    pathsList.push(p.path);
-                });
+                paths.forEach(function (p) { pathsList.push(p.path); });
             }
             var msgD = pathsList.length === 1 ? Messages.fm_deleteOwnedPad :
-                Messages.fm_deleteOwnedPads;
-            UI.confirm(msgD, function (res) {
+                                                Messages.fm_deleteOwnedPads;
+            UI.confirm(msgD, function(res) {
                 $(window).focus();
-                if (!res) {
-                    return;
-                }
+                if (!res) { return; }
                 manager.deleteOwned(pathsList, function () {
                     pathsList.forEach(LS.removeFoldersOpened);
                     removeSelected();
@@ -5163,9 +4825,7 @@ define([
             var p = paths[0];
             var el = manager.find(p.path);
             var path = currentPath;
-            if (path[0] !== ROOT) {
-                path = [ROOT];
-            }
+            if (path[0] !== ROOT) { path = [ROOT]; }
             var _metadata = manager.getFileData(el);
             var _simpleData = {
                 title: _metadata.filename || _metadata.title,
@@ -5177,486 +4837,447 @@ define([
             openIn(app, path, APP.team, _simpleData);
         };
 
-        var addContextEvent = function () {
-            $contextMenu.on("click", "a", function (e) {
-                e.stopPropagation();
-                var paths = $contextMenu.data('paths');
-                var pathsList = [];
-                var type = $contextMenu.attr('data-menu-type');
-                var $this = $(this);
+        var addContextEvent = function () { $contextMenu.on("click", "a", function(e) {
+            e.stopPropagation();
+            var paths = $contextMenu.data('paths');
+            var pathsList = [];
+            var type = $contextMenu.attr('data-menu-type');
+            var $this = $(this);
 
-                var prefix = /cp\-app\-drive\-context\-/;
-                var command = Util.slice(this.classList)
-                    .map(c => {
-                        if (!prefix.test(c)) {
-                            return;
+            var prefix = /cp\-app\-drive\-context\-/;
+            var command = Util.slice(this.classList)
+                .map(c => {
+                    if (!prefix.test(c)) { return; }
+                    return c.replace(prefix, '');
+                }).filter(Boolean);
+            console.log(command);
+
+            var el, data;
+            if (paths.length === 0) {
+                log(Messages.fm_forbidden);
+                debug("Context menu on a forbidden or unexisting element. ", paths);
+                return;
+            }
+
+            if ($this.hasClass("cp-app-drive-context-rename")) {
+                if (paths.length !== 1) { return; }
+                displayRenameInput(paths[0].element, paths[0].path);
+            }
+            else if ($this.hasClass("cp-app-drive-context-color")) {
+                var currentColor = getFolderColor(paths[0].path);
+                pickFolderColor(paths[0].element, currentColor, function (color) {
+                    paths.forEach(function (p) {
+                        setFolderColor(p.element, p.path, color);
+                    });
+                    refresh();
+                });
+            }
+            else if($this.hasClass("cp-app-drive-context-delete")) {
+                if (!APP.loggedIn) {
+                    return void deletePaths(paths);
+                }
+                paths.forEach(function (p) { pathsList.push(p.path); });
+                moveElements(pathsList, [TRASH], false, refresh);
+            }
+            else if ($this.hasClass('cp-app-drive-context-deleteowned')) {
+                deleteOwnedPaths(paths);
+            }
+            else if ($this.hasClass('cp-app-drive-context-preview')) {
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                openFile(el, null, false);
+            }
+            else if ($this.hasClass('cp-app-drive-context-open')) {
+                paths.forEach(function (p) {
+                    var el = manager.find(p.path);
+                    if (files.restrictedFolders[el]) {
+                        UI.warn(Messages.fm_restricted);
+                        return;
+                    }
+                    openFile(el, false, true);
+                });
+            }
+            else if ($this.hasClass('cp-app-drive-context-openro')) {
+                paths.forEach(function (p) {
+                    var el = manager.find(p.path);
+                    if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+                        // ANON_SHARED_FOLDER
+                        el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+                    }
+                    if (manager.isPathIn(p.path, [FILES_DATA])) {
+                        el = p.path[1];
+                    } else {
+                        if (!el || manager.isFolder(el)) { return; }
+                    }
+                    openFile(el, true, true);
+                });
+            }
+            else if ($this.hasClass('cp-app-drive-context-makeacopy')) {
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                (function () {
+                    var path = currentPath;
+                    if (path[0] !== ROOT) { path = [ROOT]; }
+                    var _metadata = manager.getFileData(el);
+                    var _simpleData = {
+                        title: _metadata.filename || _metadata.title,
+                        href: _metadata.href || _metadata.roHref,
+                        password: _metadata.password,
+                        channel: _metadata.channel,
+                    };
+                    var parsed = Hash.parsePadUrl(_metadata.href || _metadata.roHref);
+                    openIn(parsed.type, path, APP.team, _simpleData);
+                })();
+            }
+            else if ($this.hasClass('cp-app-drive-context-openincode')) {
+                if (paths.length !== 1) { return; }
+                openInApp(paths, 'code');
+            }
+            else if ($this.hasClass('cp-app-drive-context-openinsheet')) {
+                if (paths.length !== 1) { return; }
+                openInApp(paths, 'sheet');
+            }
+            else if ($this.hasClass('cp-app-drive-context-openindoc')) {
+                if (paths.length !== 1) { return; }
+                openInApp(paths, 'doc');
+            }
+            else if ($this.hasClass('cp-app-drive-context-openinpresentation')) {
+                if (paths.length !== 1) { return; }
+                openInApp(paths, 'presentation');
+            }
+            else if ($this.hasClass('cp-app-drive-context-expandall') ||
+                     $this.hasClass('cp-app-drive-context-collapseall')) {
+                if (paths.length !== 1) { return; }
+                var opened = $this.hasClass('cp-app-drive-context-expandall');
+                var openRecursive = function (path) {
+                    LS.setFolderOpened(path, opened);
+                    var folderContent = manager.find(path);
+                    var subfolders = [];
+                    for (var k in folderContent) {
+                        if (manager.isFolder(folderContent[k])) {
+                            if (manager.isSharedFolder(folderContent[k])) {
+                                subfolders.push([k].concat(manager.user.userObject.ROOT));
+                            }
+                            else {
+                                subfolders.push(k);
+                            }
                         }
-                        return c.replace(prefix, '');
-                    }).filter(Boolean);
-                console.log(command);
+                    }
+                    subfolders.forEach(function (p) {
+                        var subPath = path.concat(p);
+                        openRecursive(subPath);
+                    });
+                };
+                openRecursive(paths[0].path);
+                refresh();
+            }
 
-                var el, data;
-                if (paths.length === 0) {
-                    log(Messages.fm_forbidden);
-                    debug("Context menu on a forbidden or unexisting element. ", paths);
+            else if ($this.hasClass('cp-app-drive-context-download')) {
+                if (paths.length !== 1) { return; }
+                var path = paths[0];
+                el = manager.find(path.path);
+                // folder
+                if (manager.isFolder(el)) {
+                    // folder
+                    var name, folderEl;
+                    if (!manager.isSharedFolder(el)) {
+                        name = path.path[path.path.length - 1];
+                        folderEl = el;
+                        var sfId = manager.isInSharedFolder(path.path);
+                        downloadFolder(folderEl, name, sfId);
+                    }
+                    // shared folder
+                    else {
+                        data = manager.getSharedFolderData(el);
+                        name = data.title;
+                        folderEl = manager.find(path.path.concat("root"));
+                        downloadFolder(folderEl, name, el);
+                    }
+                }
+                // file
+                else if (manager.isFile(el)) {
+                    // imported file
+                    if (path.element.is(".cp-border-color-file")) {
+                        data = manager.getFileData(el);
+                        APP.FM.downloadFile(data, function (err, obj) {
+                            console.log(err, obj);
+                            console.log('DONE');
+                        });
+                    }
+                    // pad
+                    else {
+                        data = manager.getFileData(el);
+                        APP.FM.downloadPad(data, function (err, obj) {
+                            console.log(err, obj);
+                            console.log('DONE');
+                        });
+                    }
+                }
+            }
+            else if ($this.hasClass('cp-app-drive-context-share')) {
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                var parsed;
+                var friends = common.getFriends();
+                var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn;
+
+                if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
+                    // disconnected
+                    if (!APP.editable) {
+                        return void UI.warn(Messages.error);
+                    }
+                    // if folder is inside SF
+                    else if (manager.isInSharedFolder(paths[0].path)) {
+                        return void UI.alert(Messages.convertFolderToSF_SFParent);
+                    }
+                    // if folder already contains SF
+                    else if (manager.hasSubSharedFolder(el)) {
+                        return void UI.alert(Messages.convertFolderToSF_SFChildren);
+                    }
+                    // if root
+                    else if (paths[0].path.length <= 1) {
+                        return void UI.warn(Messages.error);
+                    }
+                    // if folder does not contains SF
+
+                    else {
+                        var convertContent = h('div', [
+                            h('p', Messages.convertFolderToSF_confirm),
+                            h('label', {for: 'cp-upload-password'}, Messages.fm_shareFolderPassword),
+                            UI.passwordInput({
+                                id: 'cp-upload-password',
+                                placeholder: Messages.creation_passwordValue
+                            }),
+                            h('span', {
+                                style: 'display:flex;align-items:center;justify-content:space-between'
+                            }, [
+                                UI.createCheckbox('cp-upload-owned', Messages.sharedFolders_create_owned, true),
+                                UI.createHelper(Pages.localizeDocsLink('https://docs.cryptpad.org/en/user_guide/share_and_access.html#owners'), Messages.creation_owned1)
+                            ]),
+                        ]);
+                        return void UI.confirm(convertContent, function(res) {
+                            if (!res) { return; }
+                            var password = $(convertContent).find('#cp-upload-password').val() || undefined;
+                            var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
+                            manager.convertFolderToSharedFolder(paths[0].path, owned, password, function (err, obj) {
+                                if (err || obj && obj.error) { return void console.error(err || obj.error); }
+                                if (obj && obj.fId) { APP.convertedFolder = obj.fId; }
+                                refresh();
+                            });
+                        });
+                    }
+                } else { // File or shared folder
+                    var sf = !anonDrive && manager.isSharedFolder(el);
+                    if (anonDrive) {
+                        data = el;
+                    } else {
+                        data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
+                    }
+                    parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
+
+                    // Form: get auditor hash
+                    var auditorHash;
+                    if (parsed.hash && parsed.type === "form") {
+                        var formData = Hash.getFormData(null, parsed.hash, data.password);
+                        console.log(formData);
+                        if (formData) {
+                            auditorHash = formData.form_auditorHash;
+                        }
+                    }
+
+                    var roParsed = Hash.parsePadUrl(data.roHref);
+                    var padType = parsed.type || roParsed.type;
+                    var ro = !sf || (folders[el] && folders[el].version >= 2);
+                    var padData = {
+                        teamId: APP.team,
+                        origin: APP.origin,
+                        pathname: "/" + padType + "/",
+                        friends: friends,
+                        password: data.password,
+                        hashes: {
+                            editHash: parsed.hash,
+                            viewHash: ro && roParsed.hash,
+                            fileHash: parsed.hash
+                        },
+                        auditorHash: auditorHash,
+                        fileData: {
+                            hash: parsed.hash,
+                            password: data.password
+                        },
+                        isTemplate: paths[0].path[0] === 'template',
+                        title: data.title || data.name,
+                        sharedFolder: sf,
+                        static: data.static ? data.href : undefined,
+                        common: common
+                    };
+                    if (padType === 'file') {
+                        return void Share.getFileShareModal(common, padData, function (err) {
+                            if (err) { UI.warn(Messages.error); }
+                        });
+                    }
+                    Share.getShareModal(common, padData, function (err) {
+                        if (err) { UI.warn(Messages.error); }
+                    });
+                }
+            }
+            else if ($this.hasClass('cp-app-drive-context-savelocal')) {
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                if (manager.isFile(el)) {
+                    data = manager.getFileData(el);
+                } else if (manager.isSharedFolder(el)) {
+                    data = manager.getSharedFolderData(el);
+                }
+                if (!data) { return; }
+                if (data.static) {
+                    sframeChan.query("Q_DRIVE_USEROBJECT", {
+                        cmd: "addLink",
+                        teamId: -1,
+                        data: {
+                            name: data.name,
+                            href: data.href,
+                            path: ['root']
+                        }
+                    }, function () {
+                        UI.log(Messages.saved);
+                    });
                     return;
                 }
-
-                if ($this.hasClass("cp-app-drive-context-rename")) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    displayRenameInput(paths[0].element, paths[0].path);
-                } else if ($this.hasClass("cp-app-drive-context-color")) {
-                    var currentColor = getFolderColor(paths[0].path);
-                    pickFolderColor(paths[0].element, currentColor, function (color) {
-                        paths.forEach(function (p) {
-                            setFolderColor(p.element, p.path, color);
-                        });
-                        refresh();
-                    });
-                } else if ($this.hasClass("cp-app-drive-context-delete")) {
-                    if (!APP.loggedIn) {
-                        return void deletePaths(paths);
-                    }
-                    paths.forEach(function (p) {
-                        pathsList.push(p.path);
-                    });
-                    moveElements(pathsList, [TRASH], false, refresh);
-                } else if ($this.hasClass('cp-app-drive-context-deleteowned')) {
-                    deleteOwnedPaths(paths);
-                } else if ($this.hasClass('cp-app-drive-context-preview')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    el = manager.find(paths[0].path);
-                    openFile(el, null, false);
-                } else if ($this.hasClass('cp-app-drive-context-open')) {
-                    paths.forEach(function (p) {
-                        var el = manager.find(p.path);
-                        if (files.restrictedFolders[el]) {
-                            UI.warn(Messages.fm_restricted);
-                            return;
-                        }
-                        openFile(el, false, true);
-                    });
-                } else if ($this.hasClass('cp-app-drive-context-openro')) {
-                    paths.forEach(function (p) {
-                        var el = manager.find(p.path);
-                        if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
-                            // ANON_SHARED_FOLDER
-                            el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
-                        }
-                        if (manager.isPathIn(p.path, [FILES_DATA])) {
-                            el = p.path[1];
-                        } else {
-                            if (!el || manager.isFolder(el)) {
-                                return;
-                            }
-                        }
-                        openFile(el, true, true);
-                    });
-                } else if ($this.hasClass('cp-app-drive-context-makeacopy')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    el = manager.find(paths[0].path);
-                    (function () {
-                        var path = currentPath;
-                        if (path[0] !== ROOT) {
-                            path = [ROOT];
-                        }
-                        var _metadata = manager.getFileData(el);
-                        var _simpleData = {
-                            title: _metadata.filename || _metadata.title,
-                            href: _metadata.href || _metadata.roHref,
-                            password: _metadata.password,
-                            channel: _metadata.channel,
-                        };
-                        var parsed = Hash.parsePadUrl(_metadata.href || _metadata.roHref);
-                        openIn(parsed.type, path, APP.team, _simpleData);
-                    })();
-                } else if ($this.hasClass('cp-app-drive-context-openincode')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    openInApp(paths, 'code');
-                } else if ($this.hasClass('cp-app-drive-context-openinsheet')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    openInApp(paths, 'sheet');
-                } else if ($this.hasClass('cp-app-drive-context-openindoc')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    openInApp(paths, 'doc');
-                } else if ($this.hasClass('cp-app-drive-context-openinpresentation')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    openInApp(paths, 'presentation');
-                } else if ($this.hasClass('cp-app-drive-context-expandall') ||
-                    $this.hasClass('cp-app-drive-context-collapseall')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    var opened = $this.hasClass('cp-app-drive-context-expandall');
-                    var openRecursive = function (path) {
-                        LS.setFolderOpened(path, opened);
-                        var folderContent = manager.find(path);
-                        var subfolders = [];
-                        for (var k in folderContent) {
-                            if (manager.isFolder(folderContent[k])) {
-                                if (manager.isSharedFolder(folderContent[k])) {
-                                    subfolders.push([k].concat(manager.user.userObject.ROOT));
-                                } else {
-                                    subfolders.push(k);
-                                }
-                            }
-                        }
-                        subfolders.forEach(function (p) {
-                            var subPath = path.concat(p);
-                            openRecursive(subPath);
-                        });
-                    };
-                    openRecursive(paths[0].path);
-                    refresh();
-                } else if ($this.hasClass('cp-app-drive-context-download')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    var path = paths[0];
-                    el = manager.find(path.path);
-                    // folder
-                    if (manager.isFolder(el)) {
-                        // folder
-                        var name, folderEl;
-                        if (!manager.isSharedFolder(el)) {
-                            name = path.path[path.path.length - 1];
-                            folderEl = el;
-                            var sfId = manager.isInSharedFolder(path.path);
-                            downloadFolder(folderEl, name, sfId);
-                        }
-                        // shared folder
-                        else {
-                            data = manager.getSharedFolderData(el);
-                            name = data.title;
-                            folderEl = manager.find(path.path.concat("root"));
-                            downloadFolder(folderEl, name, el);
-                        }
-                    }
-                    // file
-                    else if (manager.isFile(el)) {
-                        // imported file
-                        if (path.element.is(".cp-border-color-file")) {
-                            data = manager.getFileData(el);
-                            APP.FM.downloadFile(data, function (err, obj) {
-                                console.log(err, obj);
-                                console.log('DONE');
-                            });
-                        }
-                        // pad
-                        else {
-                            data = manager.getFileData(el);
-                            APP.FM.downloadPad(data, function (err, obj) {
-                                console.log(err, obj);
-                                console.log('DONE');
-                            });
-                        }
-                    }
-                } else if ($this.hasClass('cp-app-drive-context-share')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    el = manager.find(paths[0].path);
-                    var parsed;
-                    var friends = common.getFriends();
-                    var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn;
-
-                    if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
-                        // disconnected
-                        if (!APP.editable) {
-                            return void UI.warn(Messages.error);
-                        }
-                        // if folder is inside SF
-                        else if (manager.isInSharedFolder(paths[0].path)) {
-                            return void UI.alert(Messages.convertFolderToSF_SFParent);
-                        }
-                        // if folder already contains SF
-                        else if (manager.hasSubSharedFolder(el)) {
-                            return void UI.alert(Messages.convertFolderToSF_SFChildren);
-                        }
-                        // if root
-                        else if (paths[0].path.length <= 1) {
-                            return void UI.warn(Messages.error);
-                        }
-                        // if folder does not contains SF
-
-                        else {
-                            var convertContent = h('div', [
-                                h('p', Messages.convertFolderToSF_confirm),
-                                h('label', {for: 'cp-upload-password'}, Messages.fm_shareFolderPassword),
-                                UI.passwordInput({
-                                    id: 'cp-upload-password',
-                                    placeholder: Messages.creation_passwordValue
-                                }),
-                                h('span', {
-                                    style: 'display:flex;align-items:center;justify-content:space-between'
-                                }, [
-                                    UI.createCheckbox('cp-upload-owned', Messages.sharedFolders_create_owned, true),
-                                    UI.createHelper(Pages.localizeDocsLink('https://docs.cryptpad.org/en/user_guide/share_and_access.html#owners'), Messages.creation_owned1)
-                                ]),
-                            ]);
-                            return void UI.confirm(convertContent, function (res) {
-                                if (!res) {
-                                    return;
-                                }
-                                var password = $(convertContent).find('#cp-upload-password').val() || undefined;
-                                var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
-                                manager.convertFolderToSharedFolder(paths[0].path, owned, password, function (err, obj) {
-                                    if (err || obj && obj.error) {
-                                        return void console.error(err || obj.error);
-                                    }
-                                    if (obj && obj.fId) {
-                                        APP.convertedFolder = obj.fId;
-                                    }
-                                    refresh();
-                                });
-                            });
-                        }
-                    } else { // File or shared folder
-                        var sf = !anonDrive && manager.isSharedFolder(el);
-                        if (anonDrive) {
-                            data = el;
-                        } else {
-                            data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
-                        }
-                        parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
-
-                        // Form: get auditor hash
-                        var auditorHash;
-                        if (parsed.hash && parsed.type === "form") {
-                            var formData = Hash.getFormData(null, parsed.hash, data.password);
-                            console.log(formData);
-                            if (formData) {
-                                auditorHash = formData.form_auditorHash;
-                            }
-                        }
-
-                        var roParsed = Hash.parsePadUrl(data.roHref);
-                        var padType = parsed.type || roParsed.type;
-                        var ro = !sf || (folders[el] && folders[el].version >= 2);
-                        var padData = {
-                            teamId: APP.team,
-                            origin: APP.origin,
-                            pathname: "/" + padType + "/",
-                            friends: friends,
-                            password: data.password,
-                            hashes: {
-                                editHash: parsed.hash,
-                                viewHash: ro && roParsed.hash,
-                                fileHash: parsed.hash
-                            },
-                            auditorHash: auditorHash,
-                            fileData: {
-                                hash: parsed.hash,
-                                password: data.password
-                            },
-                            isTemplate: paths[0].path[0] === 'template',
-                            title: data.title || data.name,
-                            sharedFolder: sf,
-                            static: data.static ? data.href : undefined,
-                            common: common
-                        };
-                        if (padType === 'file') {
-                            return void Share.getFileShareModal(common, padData, function (err) {
-                                if (err) {
-                                    UI.warn(Messages.error);
-                                }
-                            });
-                        }
-                        Share.getShareModal(common, padData, function (err) {
-                            if (err) {
-                                UI.warn(Messages.error);
-                            }
-                        });
-                    }
-                } else if ($this.hasClass('cp-app-drive-context-savelocal')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    el = manager.find(paths[0].path);
-                    if (manager.isFile(el)) {
-                        data = manager.getFileData(el);
-                    } else if (manager.isSharedFolder(el)) {
-                        data = manager.getSharedFolderData(el);
-                    }
-                    if (!data) {
-                        return;
-                    }
-                    if (data.static) {
-                        sframeChan.query("Q_DRIVE_USEROBJECT", {
-                            cmd: "addLink",
-                            teamId: -1,
-                            data: {
-                                name: data.name,
-                                href: data.href,
-                                path: ['root']
-                            }
-                        }, function () {
-                            UI.log(Messages.saved);
-                        });
-                        return;
-                    }
-                    sframeChan.query('Q_STORE_IN_TEAM', {
-                        href: data.href || data.rohref,
-                        password: data.password,
-                        path: paths[0].path[0] === 'template' ? ['template'] : undefined,
-                        title: data.title || '',
-                        teamId: -1
-                    }, function (err) {
-                        if (err) {
-                            return void console.error(err);
-                        }
-                    });
-                } else if ($this.hasClass('cp-app-drive-context-newfolder')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    var onFolderCreated = function (err, info) {
-                        if (err) {
-                            return void logError(err);
-                        }
-                        APP.newFolder = info.newPath;
-                        APP.displayDirectory(paths[0].path);
-                    };
-                    el = manager.find(paths[0].path);
-                    if (manager.isSharedFolder(el)) {
-                        paths[0].path.push(ROOT);
-                    }
-                    manager.addFolder(paths[0].path, null, onFolderCreated);
-                } else if ($this.hasClass('cp-app-drive-context-newsharedfolder')) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    addSharedFolderModal(function (obj) {
-                        if (!obj) {
-                            return;
-                        }
-                        manager.addSharedFolder(paths[0].path, obj, refresh);
-                    });
-                } else if ($this.hasClass("cp-app-drive-context-uploadfiles")) {
-                    showUploadFilesModal();
-                } else if ($this.hasClass("cp-app-drive-context-uploadfolder")) {
-                    showUploadFolderModal();
-                } else if ($this.hasClass("cp-app-drive-context-newdoc")) {
-                    var ntype = $this.data('type') || 'pad';
-                    if (ntype === 'link') {
-                        return void showLinkModal();
-                    }
-                    var path2 = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
-                    openIn(ntype, path2, APP.team);
-                } else if ($this.hasClass("cp-app-drive-context-properties")) {
-                    if (type === 'trash') {
-                        var pPath = paths[0].path;
-                        if (paths.length !== 1 || pPath.length !== 4) {
-                            return;
-                        }
-                        var element = manager.find(pPath.slice(0, 3)); // element containing the oldpath
-                        var sPath = stringifyPath(element.path);
-                        return void UI.alert(h('span', [
-                            h('strong', Messages.fm_originalPath),
-                            h('br'),
-                            sPath,
-                        ]));
-                    }
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    el = manager.find(paths[0].path);
-                    if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
-                        // ANON_SHARED_FOLDER
-                        el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
-                    }
-                    APP.getProperties(el, function (e) {
-                        if (e) {
-                            UI.warn(Messages.error);
-                            return void logError(e, el);
-                        }
-                    });
-                } else if ($this.hasClass("cp-app-drive-context-access")) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    el = manager.find(paths[0].path);
-                    if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
-                        // ANON_SHARED_FOLDER
-                        el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
-                    }
-                    APP.getAccess(el, function (e) {
-                        if (e) {
-                            UI.warn(Messages.error);
-                            return void logError(e);
-                        }
-                    });
-                } else if ($this.hasClass("cp-app-drive-context-hashtag")) {
-                    var hrefs = paths.map(function (p) {
-                        var el = manager.find(p.path);
-                        var data = manager.getFileData(el);
-                        return data.href || data.roHref;
-                    }).filter(Boolean);
-                    common.updateTags(hrefs);
-                } else if ($this.hasClass("cp-app-drive-context-empty")) {
-                    if (paths.length !== 1 || !paths[0].element
-                        || !manager.comparePath(paths[0].path, [TRASH])) {
-                        log(Messages.fm_forbidden);
-                        return;
-                    }
-                    emptyTrashModal();
-                } else if ($this.hasClass("cp-app-drive-context-remove")) {
-                    return void deletePaths(paths);
-                } else if ($this.hasClass("cp-app-drive-context-removesf")) {
-                    return void deletePaths(paths);
-                } else if ($this.hasClass("cp-app-drive-context-restore")) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    var restorePath = paths[0].path;
-                    var restoreName = paths[0].path[paths[0].path.length - 1];
-                    if (restorePath.length === 4) {
-                        var rEl = manager.find(restorePath);
-                        if (manager.isFile(rEl)) {
-                            restoreName = manager.getTitle(rEl);
-                        } else if (manager.isSharedFolder(rEl)) {
-                            var sfData = manager.getSharedFolderData(rEl);
-                            restoreName = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
-                        } else {
-                            restoreName = restorePath[1];
-                        }
-                    }
-                    UI.confirm(Messages._getKey("fm_restoreDialog", [restoreName]), function (res) {
-                        if (!res) {
-                            return;
-                        }
-                        manager.restore(restorePath, refresh);
-                    });
-                } else if ($this.hasClass("cp-app-drive-context-openparent")) {
-                    if (paths.length !== 1) {
-                        return;
-                    }
-                    var parentPath = paths[0].path.slice();
-                    if (manager.isInTrashRoot(parentPath)) {
-                        parentPath = [TRASH];
-                    } else {
-                        parentPath.pop();
-                    }
-                    APP.displayDirectory(parentPath);
-                    APP.selectedFiles = paths[0].path.slice(-1);
+                sframeChan.query('Q_STORE_IN_TEAM', {
+                    href: data.href || data.rohref,
+                    password: data.password,
+                    path: paths[0].path[0] === 'template' ? ['template'] : undefined,
+                    title: data.title || '',
+                    teamId: -1
+                }, function (err) {
+                    if (err) { return void console.error(err); }
+                });
+            }
+            else if ($this.hasClass('cp-app-drive-context-newfolder')) {
+                if (paths.length !== 1) { return; }
+                var onFolderCreated = function (err, info) {
+                    if (err) { return void logError(err); }
+                    APP.newFolder = info.newPath;
+                    APP.displayDirectory(paths[0].path);
+                };
+                el = manager.find(paths[0].path);
+                if (manager.isSharedFolder(el)) {
+                    paths[0].path.push(ROOT);
                 }
-                APP.hideMenu();
-            });
-        };
+                manager.addFolder(paths[0].path, null, onFolderCreated);
+            }
+            else if ($this.hasClass('cp-app-drive-context-newsharedfolder')) {
+                if (paths.length !== 1) { return; }
+                addSharedFolderModal(function (obj) {
+                    if (!obj) { return; }
+                    manager.addSharedFolder(paths[0].path, obj, refresh);
+                });
+            }
+            else if ($this.hasClass("cp-app-drive-context-uploadfiles")) {
+                showUploadFilesModal();
+            }
+            else if ($this.hasClass("cp-app-drive-context-uploadfolder")) {
+                showUploadFolderModal();
+            }
+            else if ($this.hasClass("cp-app-drive-context-newdoc")) {
+                var ntype = $this.data('type') || 'pad';
+                if (ntype === 'link') {
+                    return void showLinkModal();
+                }
+                var path2 = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
+                openIn(ntype, path2, APP.team);
+            }
+            else if ($this.hasClass("cp-app-drive-context-properties")) {
+                if (type === 'trash') {
+                    var pPath = paths[0].path;
+                    if (paths.length !== 1 || pPath.length !== 4) { return; }
+                    var element = manager.find(pPath.slice(0,3)); // element containing the oldpath
+                    var sPath = stringifyPath(element.path);
+                    return void UI.alert(h('span', [
+                        h('strong', Messages.fm_originalPath),
+                        h('br'),
+                        sPath,
+                    ]));
+                }
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+                    // ANON_SHARED_FOLDER
+                    el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+                }
+                APP.getProperties(el, function (e) {
+                    if (e) {
+                        UI.warn(Messages.error);
+                        return void logError(e, el);
+                    }
+                });
+            }
+            else if ($this.hasClass("cp-app-drive-context-access")) {
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+                    // ANON_SHARED_FOLDER
+                    el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+                }
+                APP.getAccess(el, function (e) {
+                    if (e) {
+                        UI.warn(Messages.error);
+                        return void logError(e);
+                    }
+                });
+            }
+            else if ($this.hasClass("cp-app-drive-context-hashtag")) {
+                var hrefs = paths.map(function (p) {
+                    var el = manager.find(p.path);
+                    var data =  manager.getFileData(el);
+                    return data.href || data.roHref;
+                }).filter(Boolean);
+                common.updateTags(hrefs);
+            }
+            else if ($this.hasClass("cp-app-drive-context-empty")) {
+                if (paths.length !== 1 || !paths[0].element
+                    || !manager.comparePath(paths[0].path, [TRASH])) {
+                    log(Messages.fm_forbidden);
+                    return;
+                }
+                emptyTrashModal();
+            }
+            else if ($this.hasClass("cp-app-drive-context-remove")) {
+                return void deletePaths(paths);
+            }
+            else if ($this.hasClass("cp-app-drive-context-removesf")) {
+                return void deletePaths(paths);
+            }
+            else if ($this.hasClass("cp-app-drive-context-restore")) {
+                if (paths.length !== 1) { return; }
+                var restorePath = paths[0].path;
+                var restoreName = paths[0].path[paths[0].path.length - 1];
+                if (restorePath.length === 4) {
+                    var rEl = manager.find(restorePath);
+                    if (manager.isFile(rEl)) {
+                        restoreName = manager.getTitle(rEl);
+                    } else if (manager.isSharedFolder(rEl)) {
+                        var sfData = manager.getSharedFolderData(rEl);
+                        restoreName = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
+                    } else {
+                        restoreName = restorePath[1];
+                    }
+                }
+                UI.confirm(Messages._getKey("fm_restoreDialog", [restoreName]), function(res) {
+                    if (!res) { return; }
+                    manager.restore(restorePath, refresh);
+                });
+            }
+            else if ($this.hasClass("cp-app-drive-context-openparent")) {
+                if (paths.length !== 1) { return; }
+                var parentPath = paths[0].path.slice();
+                if (manager.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
+                else { parentPath.pop(); }
+                APP.displayDirectory(parentPath);
+                APP.selectedFiles = paths[0].path.slice(-1);
+            }
+            APP.hideMenu();
+        }); };
 
         addContextEvent();
         metadataMgr.onChange(function () {
@@ -5679,18 +5300,12 @@ define([
             e.preventDefault();
         });
         $appContainer.on('mouseup', function (e) {
-            if (e.which !== 1) {
-                return;
-            }
-            if ($(e.target).is(".dropdown-submenu a, .dropdown-submenu a span")) {
-                return;
-            } // if we click on dropdown-submenu, don't close menu
+            if (e.which !== 1) { return ; }
+            if ($(e.target).is(".dropdown-submenu a, .dropdown-submenu a span")) { return; } // if we click on dropdown-submenu, don't close menu
             APP.hideMenu(e);
         });
         $appContainer.on('click', function (e) {
-            if (e.which !== 1) {
-                return;
-            }
+            if (e.which !== 1) { return ; }
             removeInput();
         });
         $appContainer.on('drag drop', function (e) {
@@ -5707,27 +5322,21 @@ define([
                     return; // We can't remove elements directly from filesData
                 }
                 var $selected = findSelectedElements();
-                if (!$selected.length) {
-                    return;
-                }
+                if (!$selected.length) { return; }
                 var paths = [];
                 var isTrash = manager.isPathIn(currentPath, [TRASH]);
                 $selected.each(function (idx, elmt) {
-                    if (!$(elmt).data('path')) {
-                        return;
-                    }
+                    if (!$(elmt).data('path')) { return; }
                     paths.push($(elmt).data('path'));
                 });
-                if (!paths.length) {
-                    return;
-                }
+                if (!paths.length) { return; }
 
                 // If we are in the trash or anon USER or if we are holding the "shift" key,
                 // delete permanently
                 // Or if we are in a shared folder
                 // Or if the selection is only shared folders
                 if (!APP.loggedIn || isTrash || manager.isInSharedFolder(currentPath)
-                    || e.shiftKey) {
+                        || e.shiftKey) {
                     deletePaths(null, paths);
                     return;
                 }
@@ -5742,7 +5351,7 @@ define([
         });
 
         var onRefresh = {
-            refresh: function () {
+            refresh: function() {
                 if (onRefresh.to) {
                     window.clearTimeout(onRefresh.to);
                 }
@@ -5751,9 +5360,7 @@ define([
         };
 
         var onEvDriveChange = sframeChan.on('EV_DRIVE_CHANGE', function (data) {
-            if (history.isHistoryMode) {
-                return;
-            }
+            if (history.isHistoryMode) { return; }
 
             var path = data.path.slice();
             var originalPath = data.path.slice();
@@ -5772,19 +5379,15 @@ define([
                 }
             }
 
-            if (path[0] !== 'drive') {
-                return false;
-            }
+            if (path[0] !== 'drive') { return false; }
             path = path.slice(1);
-            if (originalPath[0] === 'drive') {
-                originalPath = originalPath.slice(1);
-            }
+            if (originalPath[0] === 'drive') { originalPath = originalPath.slice(1); }
 
             var cPath = currentPath.slice();
             if (originalPath.length && originalPath[0] === FILES_DATA) {
                 onRefresh.refresh();
             } else if ((manager.isPathIn(cPath, ['hrefArray', TRASH]) && cPath[0] === path[0]) ||
-                (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
+                    (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
                 // Reload after a few ms to make sure all the change events have been received
                 onRefresh.refresh();
             } else {
@@ -5793,9 +5396,7 @@ define([
             return false;
         });
         var onEvDriveRemove = sframeChan.on('EV_DRIVE_REMOVE', function (data) {
-            if (history.isHistoryMode) {
-                return;
-            }
+            if (history.isHistoryMode) { return; }
 
             var path = data.path.slice();
 
@@ -5813,14 +5414,12 @@ define([
                 }
             }
 
-            if (path[0] !== 'drive') {
-                return false;
-            }
+            if (path[0] !== 'drive') { return false; }
             path = path.slice(1);
 
             var cPath = currentPath.slice();
             if ((manager.isPathIn(cPath, ['hrefArray', TRASH]) && cPath[0] === path[0]) ||
-                (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
+                    (path.length >= cPath.length && manager.isSubpath(path, cPath))) {
                 // Reload after a few to make sure all the change events have been received
                 onRefresh.refresh();
             } else {
@@ -5840,8 +5439,7 @@ define([
             try {
                 onEvDriveChange.stop();
                 onEvDriveRemove.stop();
-            } catch (e) {
-            }
+            } catch (e) {}
         };
 
 
@@ -5866,7 +5464,7 @@ define([
             };
             history.onEnterHistory = function (obj) {
                 if (history.sfId) {
-                    if (!obj || typeof (obj) !== "object" || Object.keys(obj).length === 0) {
+                    if (!obj || typeof(obj) !== "object" || Object.keys(obj).length === 0) {
                         return;
                     }
                     manager.setHistoryMode(true);
@@ -5878,12 +5476,10 @@ define([
                 history.sfId = false;
 
                 var ok = manager.isValidDrive(obj.drive);
-                if (!ok) {
-                    return;
-                }
+                if (!ok) { return; }
                 manager.setHistoryMode(true);
 
-                var restricted = files.restrictedFolders;
+                var restricted  = files.restrictedFolders;
                 copyObjectValue(files, obj.drive);
                 files.restrictedFolders = restricted;
 
@@ -5931,7 +5527,7 @@ define([
             var content = [];
 
             var legacy = data.legacy; // Legacy mode: we don't know if the sf has been destroyed or its password has changed
-            var folderName = '<b>' + (Util.fixHTML(data.lastTitle) || Messages.fm_newFolder) + '</b>';
+            var folderName = '<b>'+ (Util.fixHTML(data.lastTitle) || Messages.fm_newFolder) +'</b>';
             var pwMsg = legacy ? Messages._getKey('drive_sfPassword', [folderName]) : Messages._getKey('dph_sf_pw', [folderName]);
             content.push(UI.setHTML(h('p'), pwMsg));
             var newPassword = UI.passwordInput({
@@ -5949,9 +5545,7 @@ define([
 
             var locked = false;
             $(passwordOk).click(function () {
-                if (locked) {
-                    return;
-                }
+                if (locked) { return; }
                 var pw = $(newPassword).find('.cp-password-input').val();
                 locked = true;
                 $(div).find('.alert').remove();
@@ -5972,15 +5566,13 @@ define([
                 className: 'primary',
                 name: Messages.forgetButton,
                 onClick: function () {
-                    manager.delete([['sharedFoldersTemp', fId]], function () {
-                    });
+                    manager.delete([['sharedFoldersTemp', fId]], function () { });
                 },
                 keys: []
             }, {
                 className: 'cancel',
                 name: Messages.later,
-                onClick: function () {
-                },
+                onClick: function () {},
                 keys: [27]
             }];
             return UI.dialog.customModal(div, {

From 7fc3ff94a9c8b84a47dfdabd85dc6ef78ffd70d5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 17 Nov 2023 15:18:21 +0100
Subject: [PATCH 69/87] lint compliance

---
 www/common/common-ui-elements.js |  4 ++--
 www/common/drive-ui.js           | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f9b17c79a..ba26913db 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1580,8 +1580,8 @@ define([
                             var close = o.action(e);
                             if (close) { hide(); }
                         }
-                    });
-                }
+                    }
+                });
 
             });
         };
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 6861487c8..d56e879bc 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1034,10 +1034,10 @@ define([
             if ([37, 38, 39, 40].indexOf(e.which) === -1) { return; }
             e.preventDefault();
 
-            // var click = function (el) {
-            //     if (!el) { return; }
-            //     APP.onElementClick(ev, $(el));
-            // };
+            var click = function (el) {
+                if (!el) { return; }
+                APP.onElementClick(ev, $(el));
+            };
 
             var $selection = findSelectedElements();
             if ($selection.length === 0) { return void click($elements.first()[0]); }
@@ -1057,17 +1057,17 @@ define([
             // Icon mode
             // Get the vertical and horizontal position of lastIndex
             // Filter all the elements to get those in the same line/column
-            // var pos = $($elements.get(0)).position();
-            // var $line = $elements.filter(function (idx, el) {
-            //     return $(el).position().top === pos.top;
-            // });
-            // var cols = $line.length;
-            // var lines = Math.ceil(length/cols);
+            var pos = $($elements.get(0)).position();
+            var $line = $elements.filter(function (idx, el) {
+                return $(el).position().top === pos.top;
+            });
+            var cols = $line.length;
+            var lines = Math.ceil(length/cols);
 
-            // var lastPos = {
-            //     l : Math.floor(lastIndex/cols),
-            //     c : lastIndex - Math.floor(lastIndex/cols)*cols
-            // };
+            var lastPos = {
+                l : Math.floor(lastIndex/cols),
+                c : lastIndex - Math.floor(lastIndex/cols)*cols
+            };
 
             if (e.which === 37) {
                 if (lastPos.c === 0) { return; }
@@ -3187,8 +3187,8 @@ define([
                                 dropdownActive.find('li').attr('tabindex', '-1');
                                 dropdownActive.attr('tabindex', '-1');
                                 $(document).off('keydown');
-                                menuButton.attr('aria-expanded', 'false');
-                                menuButton.focus();
+                                $button.attr('aria-expanded', 'false');
+                                $button.focus();
                             }
                         }
                     });

From 31c31485805430808a6accedcfc88c38370f0887 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 23 Nov 2023 16:48:39 +0100
Subject: [PATCH 70/87] Apply accessibility changes to all dropdowns

---
 customize.dist/src/less2/include/drive.less   |   2 +-
 .../src/less2/include/dropdown.less           |  62 +---
 .../src/less2/include/notifications.less      |   5 +-
 customize.dist/src/less2/include/toolbar.less |   2 +-
 www/calendar/inner.js                         |  12 +-
 www/common/common-language.js                 |  10 +-
 www/common/common-ui-elements.js              | 320 ++++++++++--------
 www/common/drive-ui.js                        |  95 +-----
 www/common/sframe-app-framework.js            |   1 +
 www/common/sframe-common-codemirror.js        |  12 +-
 www/common/toolbar.js                         | 153 ++-------
 11 files changed, 243 insertions(+), 431 deletions(-)

diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index afb77243e..aab7a50a0 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -546,7 +546,7 @@
         }
         li {
             cursor: default;
-            &:not(.cp-app-drive-element-header) {
+            &:not(.cp-app-drive-element-header):not([role="menuitem"]) {
                 &:hover {
                     &:not(.-cp-app-drive-element-selected, .cp-app-drive-element-selected-tmp) {
                         background-color: @cp_drive-icon-hover;
diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index 5a54b3de0..a52809ad4 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -116,11 +116,6 @@
                         margin-right: 5px !important;
                     }
 
-                    &:hover {
-                        background-color: @cp_dropdown-bg-hover;
-                        color: @cp_dropdown-fg;
-                    }
-
                     &.cp-dropdown-element-active {
                         background-color: @cp_dropdown-bg-active;
                         color: @cp_dropdown-fg;
@@ -135,60 +130,12 @@
                     }
                 }
             }
-            & > a, & > span {
-                color: @cp_dropdown-fg;
+            li[role="menuitem"] {
                 border-radius: @variables_radius;
-                padding: 5px;
-                text-decoration: none;
-                display: flex;
-                cursor: pointer;
-                -webkit-user-select: none;
-                -moz-user-select: none;
-                -ms-user-select: none;
-                user-select: none;
-                float: none;
-                text-align: left;
-                line-height: 1em;
-                align-items: center;
-
-                &:not(.fa) {
-                    font: @dropdown_font;
-                }
-                &.fa, &.cptools {
-                    font-size: 18px;
-                    &::before {
-                        width: 40px;
-                        margin-left: -10px;
-                        text-align: center;
-                    }
-                    * {
-                        font: @dropdown_font;
-                    }
-                }
-
-                .fa, .cptools {
-                    width: 20px;
-                    text-align: center;
-                    margin-right: 5px !important;
-                }
-
-                &:hover {
-                    background-color: @cp_dropdown-bg-hover;
+                &:hover, &:focus {
+                    background-color: @cp_dropdown-bg-hover !important;
                     color: @cp_dropdown-fg;
                 }
-
-                &.cp-dropdown-element-active {
-                    background-color: @cp_dropdown-bg-active;
-                    color: @cp_dropdown-fg;
-                }
-
-                &.cp-app-hidden {
-                    display: none;
-                }
-                &.cp-app-disabled {
-                    cursor: not-allowed !important;
-                    opacity: 0.5;
-                }
             }
             &> span {
                 box-sizing: border-box;
@@ -225,6 +172,9 @@
                     display: none;
                 }
             }
+            [role="separator"] + [role="separator"] {
+                display: none;
+            }
 
             p {
                 min-width: 160px;
diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less
index 0d58f4dc3..ccf92891e 100644
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@@ -65,10 +65,13 @@
         }
     }
     .cp-notifications-gotoapp {
+        padding: 0 !important;
+        justify-content: center !important;
         p {
             padding: 10px 0 !important;
             text-align: center !important;
-            font-weight: bold;
+            font-size: 14px !important;
+            font-weight: bold !important;
             cursor: pointer;
             &:hover {
                 background-color: @cp_dropdown-bg-hover;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 594236194..30a7aabc2 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -867,7 +867,7 @@
                     margin-left: 10px;
                 }
             }
-            li.cp-toolbar-account {
+            div.cp-toolbar-account {
                 &> span {
                     font-weight: bold;
                     span {
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 800045e14..ec22197a1 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -719,8 +719,8 @@ define([
             options: options, // Entries displayed in the menu
             common: common,
             buttonCls: 'btn btn-default fa fa-gear small cp-calendar-actions',
-            ariaLabel: Messages.calendar_settings,
-    };
+            buttonTitle: Messages.calendar_settings,
+        };
         return UIElements.createDropdown(dropdownConfig)[0];
     };
     var makeCalendarEntry = function (id, teamId) {
@@ -1173,9 +1173,7 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v
         };
         var $block = UIElements.createDropdown(dropdownConfig);
         $block.setValue(view || 'week');
-        var $views = $block.find('a');
-        $views.click(function () {
-            var mode = $(this).attr('data-value');
+        $block.onChange.reg((name, mode) => {
             cal.changeView(mode);
             updateDateRange();
             updateRecurring();
@@ -1877,9 +1875,7 @@ APP.recurrenceRule = {
 
         var $block = UIElements.createDropdown(dropdownConfig);
         $block.setValue('minutes');
-        var $types = $block.find('a');
-        $types.click(function () {
-            var mode = $(this).attr('data-value');
+        $block.onChange.reg((name, mode) => {
             var max = mode === "minutes" ? 60 : 24;
             $number.attr('max', max);
             if ($number.val() > max) { $number.val(max); }
diff --git a/www/common/common-language.js b/www/common/common-language.js
index 02e0e68c2..67c4024e2 100644
--- a/www/common/common-language.js
+++ b/www/common/common-language.js
@@ -20,18 +20,17 @@ define([
     };
 
     Msg.initSelector = function ($select, sfcommon) {
-        var selector = $select || $('#cp-language-selector');
+        var $selector = $select || $('#cp-language-selector');
 
-        if (!selector.length) { return; }
+        if (!$selector.length) { return; }
 
         var language = Messages._getLanguage();
 
         // Select the current language in the list
-        selector.setValue(language || 'en');
+        $selector.setValue(language || 'en');
 
         // Listen for language change
-        $(selector).find('a.cp-language-value').on('click', function () {
-            var newLanguage = $(this).attr('data-value');
+        $selector.onChange.reg((prettyName, newLanguage) => {
             Msg.setLanguage(newLanguage, sfcommon && sfcommon.getSframeChannel(), function () {
                 if (newLanguage !== language) {
                     if (sfcommon) {
@@ -42,6 +41,7 @@ define([
                 }
             });
         });
+
     };
 
     Msg.applyTranslation = function () {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ba26913db..8998dab2b 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1491,14 +1491,20 @@ define([
         if (config.buttonContent) {
             $button = $(h('button', {
                 class: config.buttonCls || '',
-                'aria-label': config.ariaLabel || '',
+                'aria-haspopup': 'menu',
+                'aria-expanded': 'false',
+                'title': config.buttonTitle || '',
+                'aria-label': config.buttonTitle || '',
             }, [
                 h('span.cp-dropdown-button-title', config.buttonContent),
             ]));
         } else {
             $button = $('<button>', {
                 'class': config.buttonCls || '',
-                'aria-label': config.ariaLabel || '',
+                'aria-haspopup': 'menu',
+                'aria-expanded': 'false',
+                'title': config.buttonTitle || '',
+                'aria-label': config.buttonTitle || '',
             }).append($('<span>', {'class': 'cp-dropdown-button-title'}).text(config.text || ""));
         }
 
@@ -1522,18 +1528,26 @@ define([
             window.setTimeout(function () { $innerblock.hide(); }, 0);
         };
 
+        // When the menu is collapsed, update aria-expanded
+        var observer = new MutationObserver(function (mutations) {
+            mutations.forEach(function (mutation) {
+                if (mutation.attributeName !== 'style') { return; }
+                if ($innerblock[0].style.display === 'none') {
+                    $button.attr('aria-expanded', 'false');
+                }
+            });
+        });
+        observer.observe($innerblock[0], { attributes: true });
+
+        // Add the dropdown content
         var setOptions = function (options) {
             options.forEach(function (o) {
                 if (!isValidOption(o)) { return; }
-                if (isElement(o)) { return $innerblock.append(o); }
+                if (isElement(o)) { return void $innerblock.append(o); }
                 var $el = $(h(o.tag, (o.attributes || {})));
-
                 if (typeof(o.content) === 'string' || (o.content instanceof Element)) {
                     o.content = [o.content];
                 }
-                if(typeof (o.content) === 'object' && !Array.isArray(o.content)) {
-                    o.content = [o.content];
-                }
                 if (Array.isArray(o.content)) {
                     o.content.forEach(function (item) {
                         if (item instanceof Element) {
@@ -1542,47 +1556,51 @@ define([
                         if (typeof(item) === 'string') {
                             $el[0].appendChild(document.createTextNode(item));
                         }
-                        if (typeof item === 'object') {
-                            //  case where item is an object, eg: an <a> tag
-                            var $subElement = $(h(item.tag, item.attributes || {}));
-                            if (Array.isArray(item.content)) {
-                                item.content.forEach(function (subItem) {
-                                    if (typeof subItem === 'string') {
-                                        $subElement[0].appendChild(document.createTextNode(subItem));
-                                    } else if (subItem instanceof Element) {
-                                        $subElement.append(subItem);
-                                    }
-                                });
-                            } else if (typeof item.content === 'string') {
-                                $subElement.text(item.content);
-                            } else if (item.content instanceof Element) {
-                                $subElement.append(item.content);
-                            }
-                            $el.append($subElement);
-                        }
                     });
-                    // array of elements or text nodes
                 }
 
-                $el.appendTo($innerblock);
-                $el.on('click keydown', function (e) {
+                // Everything is added as an "li" tag
+                // Links and items with action are focusable
+                // Add correct "role" attribute
+                var $li = $(h('li'));
+                if (o.tag === 'a') {
+                    $el.attr('tabindex', '-1');
+                    $li.attr('role', 'menuitem');
+                    $li.attr('tabindex', '0');
+                } else if (o.tag === 'li') {
+                    $li = $el;
+                    $li.attr('role', 'menuitem');
+                    $li.attr('tabindex', '0');
+                } else if (o.tag === 'hr') {
+                    $li.attr('role', 'separator');
+                } else {
+                    $li.attr('role', 'none');
+                }
+                $li.append($el);
+                $li.appendTo($innerblock);
+
+                // Action can be triggered with a click or keyboard event
+                if (o.tag !== 'a' && o.tag !== 'li') { return; }
+
+                $li.on('mouseenter', (e) => {
+                    console.error($li);
+                    e.stopPropagation();
+                    $li.focus();
+                });
+                var onAction = function (e) {
+                    if (config.isSelect) { return; }
                     if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13) || (e.type === 'keydown' && e.keyCode === 32)) {
-                        if (Array.isArray(o.content)) {
-                            o.content.forEach(function (item) {
-                                if (typeof item === 'object') {
-                                    var close = item.action(e);
-                                    if (close) {
-                                        hide();
-                                    }
-                                }
-                            });
-                        } else {
+                        e.stopPropagation();
+                        if (typeof(o.action) === "function") {
                             var close = o.action(e);
                             if (close) { hide(); }
+                        } else {
+                            // Click on <a> with an href
+                            if (e.type === 'keydown') { $el.get(0).click(); }
                         }
                     }
-                });
-
+                };
+                $li.on('click keydown', onAction);
             });
         };
         setOptions(config.options);
@@ -1599,6 +1617,11 @@ define([
             if ($el.length !== 1) { return; }
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
             $el.addClass('cp-dropdown-element-active');
+            $el.closest('li').focus();
+        };
+        var setFocus = function ($el) {
+            if ($el.length !== 1) { return; }
+            $el.focus();
             var scroll = $el.position().top + $innerblock.scrollTop();
             if (scroll < $innerblock.scrollTop()) {
                 $innerblock.scrollTop(scroll);
@@ -1611,6 +1634,7 @@ define([
             var wh = $(window).height();
             var button = $button[0].getBoundingClientRect();
             var topPos = button.bottom;
+            $button.attr('aria-expanded', 'true');
             $innerblock.css('bottom', '');
             if (config.noscroll) {
                 var h = $innerblock.outerHeight();
@@ -1622,15 +1646,19 @@ define([
             }
             $innerblock.show();
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
-            if (config.isSelect && value) {
-                // We use JSON.stringify here to escape quotes
-                if (typeof(value) === "object") { value = JSON.stringify(value); }
-                var $val = $innerblock.find('[data-value='+JSON.stringify(value)+']');
-                setActive($val);
-                try {
-                    $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
-                } catch (e) {}
-            }
+            setTimeout(() => {
+                if (config.isSelect && value) {
+                    // We use JSON.stringify here to escape quotes
+                    if (typeof(value) === "object") { value = JSON.stringify(value); }
+                    var $val = $innerblock.find('[data-value='+JSON.stringify(value)+']');
+                    setActive($val);
+                    try {
+                        $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
+                    } catch (e) {}
+                } else {
+                    setFocus($innerblock.find('[role="menuitem"]').first());
+                }
+            });
             if (config.feedback) { Feedback.send(config.feedback); }
         };
 
@@ -1644,6 +1672,7 @@ define([
             if (!state) {
                 $c.addClass('cp-dropdown-visible');
             }
+
             try {
                 $('iframe').each(function (idx, ifrw) {
                     $(ifrw).contents().find('.cp-dropdown-content').hide();
@@ -1659,71 +1688,14 @@ define([
         });
 
         if (config.isSelect) {
-            var pressed = '';
-            var to;
             $container.onChange = Util.mkEvent();
-            $container.on('click', 'a', function () {
-                value = $(this).data('value');
-                var $val = $(this);
+            $container.on('click', 'li', function () {
+                var $val = $(this).find('a');
+                value = $val.data('value');
                 var textValue = $val.text() || value;
                 $button.find('.cp-dropdown-button-title').text(textValue);
                 $container.onChange.fire(textValue, value);
             });
-            $container.keydown(function (e) {
-                var $value = $innerblock.find('[data-value].cp-dropdown-element-active:visible');
-                if (!$value.length) {
-                    $value = $innerblock.find('[data-value]').first();
-                }
-                if (e.which === 38) { // Up
-                    e.preventDefault();
-                    e.stopPropagation();
-                    if ($value.length) {
-                        $value.mouseleave();
-                        var $prev = $value.prev();
-                        $prev.mouseenter();
-                        setActive($prev);
-                    }
-                }
-                if (e.which === 40) { // Down
-                    e.preventDefault();
-                    e.stopPropagation();
-                    if ($value.length) {
-                        $value.mouseleave();
-                        var $next = $value.next();
-                        $next.mouseenter();
-                        setActive($next);
-                    }
-                }
-                if (e.which === 13) { //Enter
-                    e.preventDefault();
-                    e.stopPropagation();
-                    if ($value.length) {
-                        $value.click();
-                        hide();
-                    }
-                }
-                if (e.which === 27) { // Esc
-                    e.preventDefault();
-                    e.stopPropagation();
-                    $value.mouseleave();
-                    hide();
-                }
-            });
-            $container.keypress(function (e) {
-                window.clearTimeout(to);
-                var c = String.fromCharCode(e.which);
-                pressed += c;
-                // We use JSON.stringify here to escape quotes
-                var $value = $innerblock.find('[data-value^='+JSON.stringify(pressed)+']:first');
-                if ($value.length) {
-                    setActive($value);
-                    $innerblock.scrollTop($value.position().top + $innerblock.scrollTop());
-                }
-                to = window.setTimeout(function () {
-                    pressed = '';
-                }, 1000);
-            });
-
             $container.setValue = function (val, name, sync) {
                 value = val;
                 // We use JSON.stringify here to escape quotes
@@ -1741,6 +1713,85 @@ define([
             };
         }
 
+        var pressed = '';
+        var to;
+        var findItem = function () {
+            var $value = $();
+            $innerblock.find('[role="menuitem"]').each((i, el) => {
+                var $el = $(el);
+                var text = $el.text().toLowerCase();
+                var p = pressed.toLowerCase();
+                if (text.indexOf(p) === 0) {
+                    $value = $el;
+                    return false;
+                }
+            });
+            return $value;
+        };
+        $container.keydown(function (e) {
+            if (!$innerblock.is(':visible')) { return; }
+            var $value = $innerblock.find('li:focus');
+            if (!$value.length) {
+                $value = $innerblock.find('[role="menuitem"]').first();
+            }
+            if (e.which === 38) { // Up
+                e.preventDefault();
+                e.stopPropagation();
+                if ($value.length) {
+                    $value.mouseleave();
+                    var $prev = $value.prevAll('[role="menuitem"]:first');
+                    $prev.mouseenter();
+                    setFocus($prev);
+                }
+            }
+            if (e.which === 40) { // Down
+                e.preventDefault();
+                e.stopPropagation();
+                if ($value.length) {
+                    $value.mouseleave();
+                    var $next = $value.nextAll('[role="menuitem"]:first');
+                    $next.mouseenter();
+                    setFocus($next);
+                }
+            }
+            if (e.which === 13 || e.which === 32) { //Enter or space
+                e.preventDefault();
+                e.stopPropagation();
+                if ($value.length) {
+                    $value.click();
+                    hide();
+                    $button.focus();
+                }
+            }
+            if (e.which === 27) { // Esc
+                e.preventDefault();
+                e.stopPropagation();
+                $value.mouseleave();
+                hide();
+                $button.focus();
+            }
+        });
+        $container.keypress(function (e) {
+            window.clearTimeout(to);
+            var c = String.fromCharCode(e.which);
+            pressed += c;
+            // We use JSON.stringify here to escape quotes
+            var $value;
+            if (config.isSelect) {
+                $value = $innerblock.find('[data-value^='+JSON.stringify(pressed)+']:first').closest('li');
+            } else {
+                $value = findItem();
+            }
+            if ($value.length) {
+                setFocus($value);
+                $innerblock.scrollTop($value.position().top + $innerblock.scrollTop());
+            }
+            to = window.setTimeout(function () {
+                pressed = '';
+            }, 1000);
+        });
+
+
         return $container;
     };
 
@@ -1822,8 +1873,8 @@ define([
 
         var options = [];
         options.push({
-            tag: 'li',
-            attributes: {'class': 'cp-user-menu-logo', 'role': 'none'},
+            tag: 'div',
+            attributes: {'class': 'cp-user-menu-logo'},
             content: h('span', [
                 h('img', {
                     src: '/customize/CryptPad_logo_grey.svg',
@@ -1853,8 +1904,8 @@ define([
                 ]));
             }
             options.push({
-                tag: 'li',
-                attributes: {'class': 'cp-toolbar-account', 'role': 'none'},
+                tag: 'div',
+                attributes: {'class': 'cp-toolbar-account'},
                 content: userAdminContent,
             });
         }
@@ -1862,7 +1913,7 @@ define([
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle'},
                 content: h('span', Messages.profileButton),
                 action: function () {
                     if (padType) {
@@ -1878,8 +1929,6 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-hdd-o',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
                 },
                 content: h('span', Messages.type.drive),
                 action: function () {
@@ -1892,8 +1941,6 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-users',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
                 },
                 content: h('span', Messages.type.teams),
                 action: function () {
@@ -1906,8 +1953,6 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-calendar',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
                 },
                 content: h('span', Messages.calendar),
                 action: function () {
@@ -1920,8 +1965,6 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-address-book',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
                 },
                 content: h('span', Messages.type.contacts),
                 action: function () {
@@ -1932,7 +1975,7 @@ define([
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-settings fa fa-cog'},
                 content: h('span', Messages.settingsButton),
                 action: function () {
                     if (padType) {
@@ -1949,7 +1992,7 @@ define([
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs','tabindex': '-1', 'role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-admin fa fa-cogs'},
                 content: h('span', Messages.adminPage || 'Admin'),
                 action: function () {
                     if (padType) {
@@ -1967,8 +2010,6 @@ define([
                 'rel': 'noopener',
                 'href': 'https://docs.cryptpad.org',
                 'class': 'fa fa-book',
-                'role': 'menuitem',
-                'tabindex': -1
             },
             content: h('span', Messages.docs_link)
         });
@@ -1991,8 +2032,6 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'cp-toolbar-about fa fa-info',
-                'tabindex': '-1',
-                'role': 'menuitem'
             },
             content: h('span', Messages.user_about),
             action: function () {
@@ -2004,8 +2043,6 @@ define([
             tag: 'a',
             attributes: {
                 'class': 'fa fa-home',
-                'tabindex': '-1',
-                'role': 'menuitem'
             },
             content: h('span', Messages.homePage),
             action: function () {
@@ -2047,8 +2084,6 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'fa fa-gift',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
                 },
                 content: h('span', Messages.crowdfunding_button2),
                 action: function () {
@@ -2079,8 +2114,6 @@ define([
                 tag: 'a',
                 attributes: {
                     'class': 'cp-toolbar-menu-logout-everywhere fa fa-plug',
-                    'tabindex': '-1',
-                    'role': 'menuitem'
                 },
                 content: h('span', Messages.logoutEverywhere),
                 action: function () {
@@ -2094,7 +2127,7 @@ define([
             });
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-logout fa fa-sign-out'},
                 content: h('span', Messages.logoutButton),
                 action: function () {
                     Common.logout(function () {
@@ -2105,7 +2138,7 @@ define([
         } else {
             options.push({
                 tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in','tabindex': '-1','role':'menuitem'},
+                attributes: {'class': 'cp-toolbar-menu-login fa fa-sign-in'},
                 content: h('span', Messages.login_login),
                 action: function () {
                     Common.setLoginRedirect('login');
@@ -2114,7 +2147,7 @@ define([
             if (!Config.restrictRegistration) {
                 options.push({
                     tag: 'a',
-                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus','tabindex': '0', 'role':'menuitem'},
+                    attributes: {'class': 'cp-toolbar-menu-register fa fa-user-plus'},
                     content: h('span', Messages.login_register),
                     action: function () {
                         Common.setLoginRedirect('register');
@@ -2142,21 +2175,12 @@ define([
                 return true;
             };
         });
-        var liOptions = options.map(function (option) {
-            if (option.tag === 'li') {
-                return option;
-            }
-            return {
-                tag: 'li',
-                content: [option],
-                attributes: {'role': 'none'}
-            };
-        });
         var dropdownConfigUser = {
             buttonContent: $userButton[0],
-            options: liOptions, // Entries displayed in the menu
+            options: options, // Entries displayed in the menu
             left: true, // Open to the left of the button
             container: config.$initBlock, // optional
+            buttonTitle: config.buttonTitle,
             feedback: "USER_ADMIN",
             common: Common
         };
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index d56e879bc..a6018391e 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3089,28 +3089,18 @@ define([
             // Create dropdown
             var options = getNewPadOptions(isInRoot).map(function (obj) {
                 if (obj.separator) {
-                    return {
-                        tag: 'li',
-                        role: 'none',
-                        content: {
-                            tag: 'hr'
-                        }
-                    };
+                    return { tag: 'hr', };
                 }
 
                 var newObj = {
-                    tag: 'li',
-                    attributes: { role: 'none'},
-                    content: {
-                        tag: 'a',
-                        attributes: { 'class': obj.class, href: '#' },
-                        content: [obj.icon, obj.name]
-                    }
+                    tag: 'a',
+                    attributes: { 'class': obj.class, href: '#' },
+                    content: [obj.icon, obj.name]
                 };
 
                 if (obj.type) {
-                    newObj.content.attributes['data-type'] = obj.type;
-                    newObj.content.attributes['href'] = APP.origin + Hash.hashToHref('', obj.type);
+                    newObj.attributes['data-type'] = obj.type;
+                    newObj.attributes['href'] = APP.origin + Hash.hashToHref('', obj.type);
                 }
 
                 return newObj;
@@ -3132,69 +3122,10 @@ define([
             // actions for +New menu button
             var menuButton = $block.find('button');
             menuButton.addClass('cp-app-drive-toolbar-new');
-            functionalDropdown(menuButton);
             addNewPadHandlers($block, isInRoot);
 
             $container.append($block);
         };
-        var functionalDropdown = function ($button) {
-            $button.attr('aria-haspopup', 'menu');
-            $button.attr('aria-expanded', 'false');
-            $button.click(function () {
-                if ($button.attr('aria-expanded') === 'true') {
-                    $button.attr('aria-expanded', 'false');
-                } else {
-                    $button.attr('aria-expanded', 'true');
-                    $(document).on('click', function (e) {
-                        if (!$(e.target).closest(".cp-dropdown-content").length) {
-                            $button.attr('aria-expanded', 'false');
-                            $(document).off('keydown');
-                        }
-                    });
-                    $button.blur();
-                    const dropdownActive = $(".cp-dropdown-content");
-                    if (dropdownActive.length > 0) {
-                        setTimeout(function () {
-                            let items = dropdownActive.find('li:visible');
-                            const firstVisibleItem = items.filter(function () {
-                                return !($(this).find('hr').length > 0);
-                            }).first();
-                            firstVisibleItem.attr('tabindex', '0').focus();
-                        }, 0);
-                    }
-                    $(document).on('keydown', function (e) {
-                        if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
-                            const items = dropdownActive.find('li:visible');
-                            const focusedItem = items.filter(':focus');
-                            items.attr('tabindex', '-1');
-                            if (e.key === 'Tab') {
-                                e.preventDefault();
-                            } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
-                                if (e.key === 'ArrowUp') {
-                                    var prevItem = focusedItem.prev().length ? focusedItem.prev() : items.last();
-                                    while (prevItem.find('hr').length > 0) {
-                                        prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
-                                    }
-                                    prevItem.attr('tabindex', '0').focus();
-                                } else if (e.key === 'ArrowDown') {
-                                    var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
-                                    while (nextItem.find('hr').length > 0) {
-                                        nextItem = nextItem.next().length ? nextItem.next() : items.first();
-                                    }
-                                    nextItem.attr('tabindex', '0').focus();
-                                }
-                            } else if (e.key === 'Escape') {
-                                dropdownActive.find('li').attr('tabindex', '-1');
-                                dropdownActive.attr('tabindex', '-1');
-                                $(document).off('keydown');
-                                $button.attr('aria-expanded', 'false');
-                                $button.focus();
-                            }
-                        }
-                    });
-                }
-            });
-        };
         var createFilterButton = function (isTemplate, $container) {
             if (!APP.loggedIn) { return; }
 
@@ -3267,13 +3198,6 @@ define([
                     ],
                 });
             }
-            options = options.map(function (obj) {
-                return {
-                    tag: 'li',
-                    attributes: { role: 'none'},
-                    content: obj
-                };
-            });
             var dropdownConfig = {
                 buttonContent: [
                     h('i.fa.fa-filter'),
@@ -3295,9 +3219,6 @@ define([
             }
             var $block = UIElements.createDropdown(dropdownConfig);
 
-            var menuButton = $block.find('button');
-            functionalDropdown(menuButton);
-
             // Add style
             if (APP.store[FILTER_BY]) {
                 $block.find('button').addClass('cp-toolbar-button-active');
@@ -3391,6 +3312,7 @@ define([
                     h('i.fa.fa-minus'),
                     Messages.fm_type,
                 ],
+                action: function (e) { onSortByClick.call($(e.target).find('a')[0]); }
             },{
                 tag: 'a',
                 attributes: {'class': 'cp-app-drive-element-atime'},
@@ -3398,6 +3320,7 @@ define([
                     h('i.fa.fa-minus'),
                     Messages.fm_lastAccess,
                 ],
+                action: function (e) { onSortByClick.call($(e.target).find('a')[0]); }
             },{
                 tag: 'a',
                 attributes: {'class': 'cp-app-drive-element-ctime'},
@@ -3405,6 +3328,7 @@ define([
                     h('i.fa.fa-minus'),
                     Messages.fm_creation,
                 ],
+                action: function (e) { onSortByClick.call($(e.target).find('a')[0]); }
             }];
             var dropdownConfig = {
                 text: '', // Button initial text
@@ -3416,7 +3340,6 @@ define([
             };
             var $sortBlock = UIElements.createDropdown(dropdownConfig);
             $sortBlock.find('button').append(h('span.fa.fa-sort-amount-desc')).append(h('span', Messages.fm_sort));
-            $sortBlock.on('click', 'a', onSortByClick);
             return $fhSort;
         };
         var getFolderListHeader = function (clickable, small) {
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index c0c4e9106..4b3b49056 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -753,6 +753,7 @@ define([
                     Util.fixFileName(suggestion), function (filename)
                 {
                     if (!(typeof(filename) === 'string' && filename)) { return; }
+                    console.error(filename);
                     var ext = $select.getValue();
                     filename = filename + ext;
                     if (async) {
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 9749bc2d3..d74064830 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -369,10 +369,10 @@ define([
             $block.find('button').attr('title', Messages.languageButtonTitle);
 
             var isHovering = false;
-            var $aLanguages = $block.find('a');
+            var $aLanguages = $block.find('li');
             $aLanguages.mouseenter(function () {
                 isHovering = true;
-                setMode($(this).attr('data-value'));
+                setMode($(this).find('a').attr('data-value'));
             });
             $aLanguages.mouseleave(function () {
                 if (isHovering) {
@@ -381,7 +381,7 @@ define([
             });
             $aLanguages.click(function () {
                 isHovering = false;
-                var mode = $(this).attr('data-value');
+                var mode = $(this).find('a').attr('data-value');
                 setMode(mode, onModeChanged);
                 onLocal();
             });
@@ -431,10 +431,10 @@ define([
                 setTheme(lastTheme, $block);
 
                 var isHovering = false;
-                var $aThemes = $block.find('a');
+                var $aThemes = $block.find('li');
                 $aThemes.mouseenter(function () {
                     isHovering = true;
-                    var theme = $(this).attr('data-value');
+                    var theme = $(this).find('a').attr('data-value');
                     setTheme(theme, $block);
                 });
                 $aThemes.mouseleave(function () {
@@ -445,7 +445,7 @@ define([
                 });
                 $aThemes.click(function () {
                     isHovering = false;
-                    var theme = $(this).attr('data-value');
+                    var theme = $(this).find('a').attr('data-value');
                     setTheme(theme, $block);
                     Common.setAttribute(themeKey, theme);
                 });
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 655d9e7e8..92a5f2ca2 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1008,6 +1008,7 @@ MessengerUI, Messages, Pages) {
         var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
         var userMenuCfg = {
             $initBlock: $userAdmin,
+            buttonTitle: Messages.userAccountButton,
         };
         if (!config.hideDisplayName) {
             $.extend(true, userMenuCfg, {
@@ -1020,101 +1021,6 @@ MessengerUI, Messages, Pages) {
             userMenuCfg.displayChangeName = 1;
         }
         Common.createUserAdminMenu(userMenuCfg);
-        $userAdmin.find('> button').attr({
-            title: Messages.userAccountButton,
-            class: Messages.userAccountButton,
-            'aria-haspopup': 'menu',
-            'aria-expanded': 'false',
-            'aria-label': Messages.userAccountButton
-        });
-        function findItems(search, current, items) {
-            const currentIndex = items.index(current);
-            for (let i = 1; i < items.length; i++) {
-                const nextIndex = (currentIndex + i) % items.length;
-                const nextItem = items.eq(nextIndex);
-                const text = nextItem.text().trim().toLowerCase();
-                if (text.startsWith(search)) {
-                    return nextItem;
-                }
-            }
-            return null;
-        }
-
-        let userMenuButton = $userAdmin.find('> button');
-        userMenuButton.click(function () {
-            const isExpanded =  userMenuButton.attr('aria-expanded') === 'true';
-            if (isExpanded) {
-                userMenuButton.attr('aria-expanded', 'false');
-                $(document).off('keydown');
-            } else {
-                userMenuButton.attr('aria-expanded', 'true');
-                userMenuButton.blur();
-                const dropdownActive = $(".cp-dropdown-content");
-                if (dropdownActive.length > 0) {
-                    setTimeout(function() {
-                        let items = dropdownActive.find('li:visible');
-                        const firstVisibleItem = items.filter(function () {
-                            return !($(this).find('hr').length > 0 || $(this).hasClass('cp-user-menu-logo') || $(this).hasClass('cp-toolbar-account'));
-                        }).first();
-                        firstVisibleItem.attr('tabindex', '0').focus();
-                    }, 0);
-                    let searchCharacters = '';
-                    document.addEventListener("visibilitychange", function () {
-                        if (document.hidden) {
-                            userMenuButton.attr('aria-expanded', 'false');
-                            userMenuButton.focus();
-                            $(document).off('keydown');
-                        }
-                    });
-                    $(document).on('click', function (e) {
-                        if ( !$(e.target).closest(".cp-dropdown-content").length) {
-                            userMenuButton.attr('aria-expanded', 'false');
-                            $(document).off('keydown');
-                        }
-                    });
-                    $(document).on('keydown', function (e) {
-                        if (dropdownActive.is(":focus") || dropdownActive.find(':focus').length > 0) {
-                            const items = dropdownActive.find('li:visible');
-                            const focusedItem = items.filter(':focus');
-                            items.attr('tabindex', '-1');
-                            if (e.key === 'Tab') {
-                                e.preventDefault();
-                            } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
-                                if (e.key === 'ArrowUp') {
-                                    var prevItem = focusedItem.prev().length ? focusedItem.prev() : items.last();
-                                    while (prevItem.find('hr').length > 0 || prevItem.hasClass('cp-user-menu-logo') || prevItem.hasClass('cp-toolbar-account')) {
-                                        prevItem = prevItem.prev().length ? prevItem.prev() : items.last();
-                                    }
-                                    prevItem.attr('tabindex', '0').focus();
-                                    searchCharacters = '';
-                                } else if (e.key === 'ArrowDown') {
-                                    var nextItem = focusedItem.next().length ? focusedItem.next() : items.first();
-                                    while (nextItem.find('hr').length > 0 || nextItem.hasClass('cp-user-menu-logo') || nextItem.hasClass('cp-toolbar-account')) {
-                                        nextItem = nextItem.next().length ? nextItem.next() : items.first();
-                                    }
-                                    nextItem.attr('tabindex', '0').focus();
-                                    searchCharacters = '';
-                                }
-                            }
-                            else if (e.key === 'Escape') {
-                                dropdownActive.find('li').attr('tabindex', '-1');
-                                dropdownActive.attr('tabindex', '-1');
-                                $(document).off('keydown');
-                                userMenuButton.attr('aria-expanded', 'false');
-                                userMenuButton.focus();
-                                searchCharacters = '';
-                            } else if (e.key.match(/[a-zA-Z]/)) {
-                                searchCharacters += e.key.toLowerCase();
-                                nextItem = findItems(searchCharacters, focusedItem, items);
-                                if (nextItem) {
-                                    nextItem.attr('tabindex', '0').focus();
-                                }
-                            }
-                        }
-                    });
-                }
-            }
-        });
         return $userAdmin;
     };
 
@@ -1168,50 +1074,59 @@ MessengerUI, Messages, Pages) {
 
     var createNotifications = function (toolbar, config) {
         var $notif = toolbar.$top.find('.'+NOTIFICATIONS_CLS).show();
-        var openNotifsApp = h('li', {}, h('div.cp-notifications-gotoapp', { tabindex: '0' }, h('p', Messages.openNotificationsApp || "Open notifications App")));
-        $(openNotifsApp).on('click keypress', function (event) {
-            if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
-                Common.openURL("/notifications/");
-            }
-        });
-        var div = h('ul.cp-notifications-container', [
-            h('div.cp-notifications-empty', Messages.notifications_empty)
-        ]);
-        var pads_options = [div];
+
+        var options = [];
+
+        if (Common.isLoggedIn()) {
+            options.push({
+                tag: 'a',
+                attributes: { 'class':'cp-notifications-gotoapp' },
+                content: h('p', Messages.openNotificationsApp),
+                action: () => {
+                    Common.openURL("/notifications/");
+                }
+            });
+            options.push({ tag: 'hr' });
+        }
 
         var metadataMgr = config.metadataMgr;
         var privateData = metadataMgr.getPrivateData();
         if (!privateData.notifications) {
-            var allowNotif = h('div.cp-notifications-gotoapp', {tabindex: '0'}, h('p', Messages.allowNotifications));
-            allowNotif = h('li', {}, allowNotif);
-            pads_options.unshift(h("hr"));
-            pads_options.unshift(allowNotif);
-            $(allowNotif).on('click keypress', function (event) {
-                if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
-                    Common.getSframeChannel().event('Q_ASK_NOTIFICATION', null, function (e, allow) {
+            options.push({
+                tag: 'a',
+                attributes: { 'class':'cp-notifications-gotoapp cp-notifications-allow' },
+                content: h('p', Messages.allowNotifications),
+                action: function (ev) {
+                    Common.getSframeChannel().query('Q_ASK_NOTIFICATION', null, function (e, allow) {
+                        console.error(e, allow);
                         if (!allow) { return; }
-                        $(allowNotif).remove();
+                        $(ev.target).closest('li').remove();
                     });
+
                 }
             });
+            options.push({ tag: 'hr' });
 
             var onChange = function () {
                 var privateData = metadataMgr.getPrivateData();
                 if (!privateData.notifications) { return; }
-                $allow.remove();
+                $('.cp-notifications-allow').closest('li').remove();
                 metadataMgr.off('change', onChange);
             };
             metadataMgr.onChange(onChange);
         }
 
+        var div = h('ul.cp-notifications-container', [
+            h('li.cp-notifications-empty', Messages.notifications_empty)
+        ]);
+        options.push({
+            tag: 'li',
+            content: div
+        });
 
-        if (Common.isLoggedIn()) {
-            pads_options.unshift(h("hr"));
-            pads_options.unshift(openNotifsApp);
-        }
         var dropdownConfig = {
             text: '', // Button initial text
-            options: pads_options, // Entries displayed in the menu
+            options: options, // Entries displayed in the menu
             container: $notif,
             left: true,
             common: Common

From 814e795979d4fe57bb259090029ad24edb643600 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 24 Nov 2023 11:51:26 +0200
Subject: [PATCH 71/87] can cycle through dropdown elements

---
 www/common/common-ui-elements.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8998dab2b..bbfc13cef 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1740,6 +1740,9 @@ define([
                 if ($value.length) {
                     $value.mouseleave();
                     var $prev = $value.prevAll('[role="menuitem"]:first');
+                    if (!$prev.length) {
+                        $prev = $innerblock.find('[role="menuitem"]').last();
+                    }
                     $prev.mouseenter();
                     setFocus($prev);
                 }
@@ -1750,6 +1753,9 @@ define([
                 if ($value.length) {
                     $value.mouseleave();
                     var $next = $value.nextAll('[role="menuitem"]:first');
+                    if (!$next.length) {
+                        $next = $innerblock.find('[role="menuitem"]').first();
+                    }
                     $next.mouseenter();
                     setFocus($next);
                 }

From 2711ea6f042ac392ff756f283ab4eb1c94c69843 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 24 Nov 2023 12:49:38 +0200
Subject: [PATCH 72/87] Prevent default `Tab` key behavior on menu items

---
 www/common/common-ui-elements.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index bbfc13cef..de66fb59c 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1776,6 +1776,10 @@ define([
                 hide();
                 $button.focus();
             }
+            if(e.which === 9) { // Tab
+                e.preventDefault();
+                e.stopPropagation();
+            }
         });
         $container.keypress(function (e) {
             window.clearTimeout(to);

From e8471182ce3e044c81fad8c053819ac18e02ab6f Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 27 Nov 2023 17:12:51 +0200
Subject: [PATCH 73/87] can navigate through notifications

---
 www/common/common-ui-elements.js    | 19 +++++++++++++++++--
 www/common/sframe-common-mailbox.js |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index de66fb59c..54bc96971 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1739,7 +1739,14 @@ define([
                 e.stopPropagation();
                 if ($value.length) {
                     $value.mouseleave();
-                    var $prev = $value.prevAll('[role="menuitem"]:first');
+                    if ($value.has('li').length) {
+                        var $prev = $value.find('li:last');
+                        if (!$prev.length) {
+                            $prev = $innerblock.find('[role="menuitem"]').last();
+                        }
+                    } else {
+                        var $prev = $value.prevAll('[role="menuitem"]:first');
+                    }
                     if (!$prev.length) {
                         $prev = $innerblock.find('[role="menuitem"]').last();
                     }
@@ -1752,7 +1759,15 @@ define([
                 e.stopPropagation();
                 if ($value.length) {
                     $value.mouseleave();
-                    var $next = $value.nextAll('[role="menuitem"]:first');
+                    if ($value.has('li').length) {
+                        var $next = $value.find('li:first');
+                        console.log($next);
+                        if (!$next.length) {
+                            $next = $value.nextAll('[role="menuitem"]:first');
+                        }
+                    } else {
+                        var $next = $value.nextAll('[role="menuitem"]:first');
+                    }
                     if (!$next.length) {
                         $next = $innerblock.find('[role="menuitem"]').first();
                     }
diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js
index 80e119e4e..ab9f698f2 100644
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -87,6 +87,8 @@ define([
             var order = -Math.floor((Util.find(data, ['content', 'msg', 'ctime']) || 0) / 1000);
             const tabIndexValue = data.content.isDismissible ? undefined : '0';
             notif = h('li.cp-notification', {
+                role: 'menuitem',
+                'tabindex': 0,
                 style: 'order:'+order+';',
                 'data-hash': data.content.hash
             }, [

From cfefa95409e1bb6efce5e735378a50d3cc305d7b Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 27 Nov 2023 17:28:43 +0200
Subject: [PATCH 74/87] deleted unnecessary code

---
 www/common/common-ui-elements.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 54bc96971..b28c805cd 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1741,9 +1741,6 @@ define([
                     $value.mouseleave();
                     if ($value.has('li').length) {
                         var $prev = $value.find('li:last');
-                        if (!$prev.length) {
-                            $prev = $innerblock.find('[role="menuitem"]').last();
-                        }
                     } else {
                         var $prev = $value.prevAll('[role="menuitem"]:first');
                     }
@@ -1761,10 +1758,6 @@ define([
                     $value.mouseleave();
                     if ($value.has('li').length) {
                         var $next = $value.find('li:first');
-                        console.log($next);
-                        if (!$next.length) {
-                            $next = $value.nextAll('[role="menuitem"]:first');
-                        }
                     } else {
                         var $next = $value.nextAll('[role="menuitem"]:first');
                     }

From f82ee3c79c23a17af2f77ad028f855326d0d77e9 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 28 Nov 2023 14:51:47 +0200
Subject: [PATCH 75/87] can open notifications using the keyboard

---
 www/common/common-ui-elements.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b28c805cd..caa88ed9e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1596,7 +1596,10 @@ define([
                             if (close) { hide(); }
                         } else {
                             // Click on <a> with an href
-                            if (e.type === 'keydown') { $el.get(0).click(); }
+                            if (e.type === 'keydown'){
+                                $el.get(0).click();
+                                $el.find('.cp-clickable').first().click();
+                            }
                         }
                     }
                 };

From eb350a7463e3bbdafe9755deb5c0c64ed5d70b68 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 28 Nov 2023 15:19:14 +0200
Subject: [PATCH 76/87] can delete notifications using the keyboard

---
 www/common/common-ui-elements.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index caa88ed9e..bf73f3633 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1597,11 +1597,21 @@ define([
                         } else {
                             // Click on <a> with an href
                             if (e.type === 'keydown'){
-                                $el.get(0).click();
-                                $el.find('.cp-clickable').first().click();
+                                if ($el.find('.cp-clickable')) {
+                                    $el.find('.cp-clickable').first().click();
+                                }
+                                else{
+                                    $el.get(0).click();
+                                }
                             }
                         }
                     }
+                    if(e.type === 'keydown' && e.keyCode === 46){
+                        e.stopPropagation();
+                        if ($el.find('.cp-clickable')) {
+                            $el.find('.cp-clickable').last().click();
+                        }
+                    }
                 };
                 $li.on('click keydown', onAction);
             });

From 5e027fe1325b3938bb442d9645e203106c1b4fc5 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 4 Dec 2023 16:22:09 +0200
Subject: [PATCH 77/87] fixed design issue occured on notification dropdown

---
 customize.dist/src/less2/include/notifications.less | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less
index ccf92891e..5f79ef095 100644
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@@ -11,8 +11,12 @@
         width: 300px;
         display: flex;
         flex-flow: column;
+        padding-left: 0;
         & hr {
-            margin: 0px !important;
+            margin: 0 !important;
+        }
+        li{
+            padding: 0 5px;
         }
         .cp-notification {
             min-height: @notif-height;

From f51ccd5f8d37d7ea3c70bd1b77330ea1d20053ee Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 5 Dec 2023 13:16:26 +0200
Subject: [PATCH 78/87] matched dropdowns using the same amount of padding

---
 customize.dist/src/less2/include/dropdown.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index a52809ad4..845dedaf5 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -130,6 +130,9 @@
                     }
                 }
             }
+            li{
+                padding: 0 5px;
+            }
             li[role="menuitem"] {
                 border-radius: @variables_radius;
                 &:hover, &:focus {

From fa1e03c44ebfdc10661b215ed539df39afa2b934 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 5 Dec 2023 15:39:58 +0100
Subject: [PATCH 79/87] Fix keydown issues with dropdowns

---
 customize.dist/src/less2/include/toolbar.less |   9 ++
 www/common/common-ui-elements.js              | 101 ++++++++++--------
 www/common/sframe-common-mailbox.js           |  10 +-
 www/common/toolbar.js                         |  11 +-
 4 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 30a7aabc2..8900ace54 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -750,6 +750,15 @@
                 }
             }
         }
+        .cp-toolbar-notifications {
+            .cp-notifications-container {
+                padding: 0 5px;;
+                li {
+                    margin: 0 -5px;
+                    padding: 0;
+                }
+            }
+        }
         .cp-toolbar-link {
             display: inline-flex;
             align-items: center;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index bf73f3633..b001460a1 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1583,7 +1583,6 @@ define([
                 if (o.tag !== 'a' && o.tag !== 'li') { return; }
 
                 $li.on('mouseenter', (e) => {
-                    console.error($li);
                     e.stopPropagation();
                     $li.focus();
                 });
@@ -1596,20 +1595,7 @@ define([
                             if (close) { hide(); }
                         } else {
                             // Click on <a> with an href
-                            if (e.type === 'keydown'){
-                                if ($el.find('.cp-clickable')) {
-                                    $el.find('.cp-clickable').first().click();
-                                }
-                                else{
-                                    $el.get(0).click();
-                                }
-                            }
-                        }
-                    }
-                    if(e.type === 'keydown' && e.keyCode === 46){
-                        e.stopPropagation();
-                        if ($el.find('.cp-clickable')) {
-                            $el.find('.cp-clickable').last().click();
+                            if (e.type === 'keydown'){ $el.get(0).click(); }
                         }
                     }
                 };
@@ -1741,45 +1727,62 @@ define([
             });
             return $value;
         };
+        var getPrev = ($el) => {
+            var $all = $innerblock.find('[role="menuitem"]');
+            if (!$all.length) { return $(); }
+            var idx = $all.index($el[0]);
+            if (idx === -1) { return $(); }
+            var prev = ($all.length + idx - 1) % $all.length;
+            return $($all.get(prev));
+        };
+        var getNext = ($el) => {
+            var $all = $innerblock.find('[role="menuitem"]');
+            if (!$all.length) { return $(); }
+            var idx = $all.index($el[0]);
+            if (idx === -1) { return $(); }
+            var next = (idx + 1) % $all.length;
+            return $($all.get(next));
+        };
+        var getFirst = () => {
+            return $innerblock.find('[role="menuitem"]').first();
+        };
         $container.keydown(function (e) {
-            if (!$innerblock.is(':visible')) { return; }
+            var visible = $innerblock.is(':visible');
             var $value = $innerblock.find('li:focus');
-            if (!$value.length) {
-                $value = $innerblock.find('[role="menuitem"]').first();
+            if (!visible && [38,40].includes(e.which) && !config.isSelect) {
+                $container.click();
+                visible = true;
             }
+            if (!visible) { return; }
             if (e.which === 38) { // Up
                 e.preventDefault();
                 e.stopPropagation();
-                if ($value.length) {
-                    $value.mouseleave();
-                    if ($value.has('li').length) {
-                        var $prev = $value.find('li:last');
-                    } else {
-                        var $prev = $value.prevAll('[role="menuitem"]:first');
-                    }
-                    if (!$prev.length) {
-                        $prev = $innerblock.find('[role="menuitem"]').last();
-                    }
-                    $prev.mouseenter();
-                    setFocus($prev);
+                var $prev;
+                if (!$value.length) {
+                    $prev = $innerblock.find('[role="menuitem"]').last();
+                } else {
+                    $prev = getPrev($value);
                 }
+                $value.mouseleave();
+                $prev.mouseenter();
+                setTimeout(() => {
+                    setFocus($prev);
+                });
             }
             if (e.which === 40) { // Down
                 e.preventDefault();
                 e.stopPropagation();
-                if ($value.length) {
-                    $value.mouseleave();
-                    if ($value.has('li').length) {
-                        var $next = $value.find('li:first');
-                    } else {
-                        var $next = $value.nextAll('[role="menuitem"]:first');
-                    }
-                    if (!$next.length) {
-                        $next = $innerblock.find('[role="menuitem"]').first();
-                    }
-                    $next.mouseenter();
-                    setFocus($next);
+                var $next;
+                if (!$value.length) {
+                    $next = $innerblock.find('[role="menuitem"]').first();
+                } else {
+                    $next = getNext($value);
                 }
+                $value.mouseleave();
+                $next.mouseenter();
+                setTimeout(() => {
+                    setFocus($next);
+                });
             }
             if (e.which === 13 || e.which === 32) { //Enter or space
                 e.preventDefault();
@@ -1788,6 +1791,10 @@ define([
                     $value.click();
                     hide();
                     $button.focus();
+                } else {
+                    setTimeout(() => {
+                        getFirst().focus();
+                    });
                 }
             }
             if (e.which === 27) { // Esc
@@ -1797,9 +1804,13 @@ define([
                 hide();
                 $button.focus();
             }
-            if(e.which === 9) { // Tab
-                e.preventDefault();
-                e.stopPropagation();
+            if (e.which === 9) {
+                hide();
+                if (e.shiftKey) {
+                    $button.focus();
+                } else {
+                    $innerblock.find('[role="menuitem"]').last().focus();
+                }
             }
         });
         $container.keypress(function (e) {
diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js
index ab9f698f2..97d7c63c7 100644
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -85,10 +85,10 @@ define([
                 });
             }
             var order = -Math.floor((Util.find(data, ['content', 'msg', 'ctime']) || 0) / 1000);
-            const tabIndexValue = data.content.isDismissible ? undefined : '0';
+            const tabIndexValue = undefined;//data.content.isDismissible ? undefined : '0';
             notif = h('li.cp-notification', {
                 role: 'menuitem',
-                'tabindex': 0,
+                tabindex: '0',
                 style: 'order:'+order+';',
                 'data-hash': data.content.hash
             }, [
@@ -113,6 +113,11 @@ define([
                 }
             }
 
+            $(notif).mouseenter((e) => {
+                e.stopPropagation();
+                $(notif).focus();
+            });
+
             if (data.content.isClickable) {
                 $(notif).find('.cp-notification-content').addClass("cp-clickable").on('click keypress', function (event) {
                     if (event.type === 'click' || (event.type === 'keypress' && event.which === 13)) {
@@ -124,7 +129,6 @@ define([
                 var dismissIcon = h('span.fa.fa-times');
                 var dismiss = h('div.cp-notification-dismiss', {
                     title: Messages.notifications_dismiss,
-                    tabindex: '0'
                 }, dismissIcon);
                 $(dismiss).addClass("cp-clickable")
                     .on('click keypress', function (event) {
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 92a5f2ca2..d71ac9217 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1120,7 +1120,7 @@ MessengerUI, Messages, Pages) {
             h('li.cp-notifications-empty', Messages.notifications_empty)
         ]);
         options.push({
-            tag: 'li',
+            tag: 'div',
             content: div
         });
 
@@ -1148,6 +1148,7 @@ MessengerUI, Messages, Pages) {
         $button.attr('aria-label', Messages.notificationsPage);
         var $n = $button.find('.cp-dropdown-button-title').hide();
         var $empty = $(div).find('.cp-notifications-empty');
+        observeChildren($(div));
 
         var refresh = function () {
             updateUserList(toolbar, config);
@@ -1176,6 +1177,14 @@ MessengerUI, Messages, Pages) {
                 if (el) {
                     $(div).prepend(el);
                 }
+                $(el).on('keydown', function (e) {
+                    if (![13,32,46].includes(e.which)) { return; }
+                    e.stopPropagation();
+                    if (e.which === 46) {
+                        return $(el).find('.cp-notification-dismiss').click();
+                    }
+                    $(el).find('.cp-notification-content').click();
+                });
                 refresh();
             },
             onViewed: function () {

From 93c185fd10f7e9398df38ef38d1b8a97d07e66ee Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 5 Dec 2023 15:49:37 +0100
Subject: [PATCH 80/87] Fix style issues after the merge

---
 customize.dist/src/less2/include/dropdown.less      | 4 +---
 customize.dist/src/less2/include/notifications.less | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index 0d1e4f36e..d5ed0955a 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -85,6 +85,7 @@
             }
 
             li:not([class]) {
+                padding: 0;
                 & > a, & > span {
                     color: @cp_dropdown-fg;
                     border-radius: @variables_radius;
@@ -136,9 +137,6 @@
                     }
                 }
             }
-            li{
-                padding: 0 5px;
-            }
             li[role="menuitem"] {
                 border-radius: @variables_radius;
                 &:hover, &:focus {
diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less
index d8fe78ef8..d1cf1fe76 100644
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@@ -21,9 +21,6 @@
         & hr {
             margin: 0 !important;
         }
-        li{
-            padding: 0 5px;
-        }
         .cp-notification {
             min-height: @notif-height;
             display: flex;

From 9f5fc1e9980936c5c71fde992292c86241dc89a7 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Wed, 6 Dec 2023 11:30:11 +0200
Subject: [PATCH 81/87] skip elements whose content is hidden

---
 www/common/common-ui-elements.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8a6cf2e74..21779c4fc 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1734,15 +1734,15 @@ define([
             return $value;
         };
         var getPrev = ($el) => {
-            var $all = $innerblock.find('[role="menuitem"]');
+            var $all = $innerblock.find('[role="menuitem"]:has(:visible)');
             if (!$all.length) { return $(); }
             var idx = $all.index($el[0]);
             if (idx === -1) { return $(); }
-            var prev = ($all.length + idx - 1) % $all.length;
+            var prev = (idx - 1 + $all.length) % $all.length;
             return $($all.get(prev));
         };
         var getNext = ($el) => {
-            var $all = $innerblock.find('[role="menuitem"]');
+            var $all = $innerblock.find('[role="menuitem"]:has(:visible)');
             if (!$all.length) { return $(); }
             var idx = $all.index($el[0]);
             if (idx === -1) { return $(); }
@@ -1750,7 +1750,7 @@ define([
             return $($all.get(next));
         };
         var getFirst = () => {
-            return $innerblock.find('[role="menuitem"]').first();
+            return $innerblock.find('[role="menuitem"]:has(:visible)').first();
         };
         $container.keydown(function (e) {
             var visible = $innerblock.is(':visible');

From d1d2eb1100a49864771af4142ad83eee6648083d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 7 Dec 2023 11:19:53 +0200
Subject: [PATCH 82/87] `Filter` dropdown is accessible using the keyboard

---
 www/common/drive-ui.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 11761bdbc..94d582cfb 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3151,7 +3151,6 @@ define([
             }
             getNewPadTypes().forEach(function (type) {
                 var attributes = {
-                    'role': 'menuitem',
                     'class': 'cp-app-drive-filter-doc',
                     'data-type': type,
                     'href': '#'
@@ -3178,7 +3177,6 @@ define([
                 options.push({
                     tag: 'a',
                     attributes: {
-                        'role': 'menuitem',
                         'class': 'cp-app-drive-filter-doc',
                         'data-type': 'link',
                         'href': '#'
@@ -3191,7 +3189,6 @@ define([
                 options.push({
                     tag: 'a',
                     attributes: {
-                        'role': 'menuitem',
                         'class': 'cp-app-drive-filter-doc',
                         'data-type': 'file',
                         'href': '#'

From ca03e811485f577e80ea0f938e9fe7f414e511aa Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 11 Dec 2023 12:24:59 +0200
Subject: [PATCH 83/87] text color in user dropdown changes according to the
 color theme

---
 customize.dist/src/less2/include/toolbar.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index adabd3b39..5ae927789 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -894,7 +894,7 @@
                 margin: 0;
                 white-space: normal;
                 text-align: left;
-                color: #EEEEEE;
+                color: @cryptpad_text_col;;
                 font-size: 14px;
             }
 

From d4ed31ff7be827b1c2b14e298c5af31685af59b5 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Mon, 11 Dec 2023 12:25:16 +0200
Subject: [PATCH 84/87] lint compliance

---
 customize.dist/src/less2/include/toolbar.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 5ae927789..dd412963e 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -894,7 +894,7 @@
                 margin: 0;
                 white-space: normal;
                 text-align: left;
-                color: @cryptpad_text_col;;
+                color: @cryptpad_text_col;
                 font-size: 14px;
             }
 

From b7fd666bad6fd721b4d49d97b4a0487e397b13a1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 13 Dec 2023 13:10:42 +0100
Subject: [PATCH 85/87] Replace CSS parent selector :has (not supported by all
 browsers)

---
 www/common/common-ui-elements.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 21779c4fc..6c92a2d76 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1724,6 +1724,8 @@ define([
             var $value = $();
             $innerblock.find('[role="menuitem"]').each((i, el) => {
                 var $el = $(el);
+                var $item = $el.find('> *');
+                if ($item.length && !$item.is(':visible')) { return false; }
                 var text = $el.text().toLowerCase();
                 var p = pressed.toLowerCase();
                 if (text.indexOf(p) === 0) {
@@ -1733,8 +1735,14 @@ define([
             });
             return $value;
         };
+        var getAll = () => {
+            return $innerblock.find('[role="menuitem"]').filter((i, el) => {
+                var $item = $(el).find('> *');
+                return !$item.length || $item.is(':visible');
+            });
+        };
         var getPrev = ($el) => {
-            var $all = $innerblock.find('[role="menuitem"]:has(:visible)');
+            var $all = getAll();
             if (!$all.length) { return $(); }
             var idx = $all.index($el[0]);
             if (idx === -1) { return $(); }
@@ -1742,16 +1750,13 @@ define([
             return $($all.get(prev));
         };
         var getNext = ($el) => {
-            var $all = $innerblock.find('[role="menuitem"]:has(:visible)');
+            var $all = getAll();
             if (!$all.length) { return $(); }
             var idx = $all.index($el[0]);
             if (idx === -1) { return $(); }
             var next = (idx + 1) % $all.length;
             return $($all.get(next));
         };
-        var getFirst = () => {
-            return $innerblock.find('[role="menuitem"]:has(:visible)').first();
-        };
         $container.keydown(function (e) {
             var visible = $innerblock.is(':visible');
             var $value = $innerblock.find('li:focus');
@@ -1765,7 +1770,7 @@ define([
                 e.stopPropagation();
                 var $prev;
                 if (!$value.length) {
-                    $prev = $innerblock.find('[role="menuitem"]').last();
+                    $prev = getAll().last();
                 } else {
                     $prev = getPrev($value);
                 }
@@ -1780,7 +1785,7 @@ define([
                 e.stopPropagation();
                 var $next;
                 if (!$value.length) {
-                    $next = $innerblock.find('[role="menuitem"]').first();
+                    $next = getAll().first();
                 } else {
                     $next = getNext($value);
                 }
@@ -1798,9 +1803,7 @@ define([
                     hide();
                     $button.focus();
                 } else {
-                    setTimeout(() => {
-                        getFirst().focus();
-                    });
+                    setFocus(getAll().first());
                 }
             }
             if (e.which === 27) { // Esc

From d5a321af165b7cb3eac009603e2eab2e24995467 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 13 Dec 2023 14:25:48 +0100
Subject: [PATCH 86/87] Fix keydown event conflict between dropdown and drive

---
 www/common/common-ui-elements.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 7b2798d46..65f28c0c6 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1758,6 +1758,8 @@ define([
             return $($all.get(next));
         };
         $container.keydown(function (e) {
+            e.stopPropagation(); // don't propagate event to window if the dropdown is focused
+
             var visible = $innerblock.is(':visible');
             var $value = $innerblock.find('li:focus');
             if (!visible && [38,40].includes(e.which) && !config.isSelect) {
@@ -1767,7 +1769,6 @@ define([
             if (!visible) { return; }
             if (e.which === 38) { // Up
                 e.preventDefault();
-                e.stopPropagation();
                 var $prev;
                 if (!$value.length) {
                     $prev = getAll().last();
@@ -1782,7 +1783,6 @@ define([
             }
             if (e.which === 40) { // Down
                 e.preventDefault();
-                e.stopPropagation();
                 var $next;
                 if (!$value.length) {
                     $next = getAll().first();
@@ -1797,7 +1797,6 @@ define([
             }
             if (e.which === 13 || e.which === 32) { //Enter or space
                 e.preventDefault();
-                e.stopPropagation();
                 if ($value.length) {
                     $value.click();
                     hide();
@@ -1808,12 +1807,11 @@ define([
             }
             if (e.which === 27) { // Esc
                 e.preventDefault();
-                e.stopPropagation();
                 $value.mouseleave();
                 hide();
                 $button.focus();
             }
-            if (e.which === 9) {
+            if (e.which === 9) { // Tab
                 hide();
                 if (e.shiftKey) {
                     $button.focus();
@@ -1823,6 +1821,7 @@ define([
             }
         });
         $container.keypress(function (e) {
+            e.stopPropagation(); // Don't propagate to window
             window.clearTimeout(to);
             var c = String.fromCharCode(e.which);
             pressed += c;

From 01f13b6b787405fe8062a16d9a40d08cc1aa9830 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 13 Dec 2023 15:08:30 +0100
Subject: [PATCH 87/87] Remove outline on drive content container when focused

---
 customize.dist/src/less2/include/drive.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index c70b37ee9..93ee7a273 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -507,6 +507,9 @@
         }
     }
     #cp-app-drive-content {
+        &:focus {
+            outline: none;
+        }
         box-sizing: border-box;
         background: @cp_sidebar-right-bg;
         color: @cp_sidebar-right-fg;