From 6a5769405b6e431c25e7dd7ef3d0d801cb14931e Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 1 Feb 2017 18:48:30 +0100 Subject: [PATCH] Fix a race condition issue introduced with reconnecting patch --- www/drive/main.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/www/drive/main.js b/www/drive/main.js index 0ab2ab9bd..49f1a32fe 100644 --- a/www/drive/main.js +++ b/www/drive/main.js @@ -18,14 +18,8 @@ define([ var $iframe = $('#pad-iframe').contents(); var ifrw = $('#pad-iframe')[0].contentWindow; - var $tree = $iframe.find("#tree"); - var $content = $iframe.find("#content"); - var $driveToolbar = $iframe.find("#driveToolbar"); - var $contextMenu = $iframe.find("#treeContextMenu"); - var $contentContextMenu = $iframe.find("#contentContextMenu"); - var $defaultContextMenu = $iframe.find("#defaultContextMenu"); - var $trashTreeContextMenu = $iframe.find("#trashTreeContextMenu"); - var $trashContextMenu = $iframe.find("#trashContextMenu"); + + Cryptpad.addLoadingScreen(); var onConnectError = function (info) { @@ -137,11 +131,11 @@ define([ var setEditable = function (state) { APP.editable = state; if (!state) { - $content.addClass('readonly'); + $iframe.find('#content').addClass('readonly'); $iframe.find('[draggable="true"]').attr('draggable', false); } else { - $content.removeClass('readonly'); + $iframe.find('#content').removeClass('readonly'); $iframe.find('[draggable="false"]').attr('draggable', true); } }; @@ -185,6 +179,15 @@ define([ var error = filesOp.error; + var $tree = $iframe.find("#tree"); + var $content = $iframe.find("#content"); + var $driveToolbar = $iframe.find("#driveToolbar"); + var $contextMenu = $iframe.find("#treeContextMenu"); + var $contentContextMenu = $iframe.find("#contentContextMenu"); + var $defaultContextMenu = $iframe.find("#defaultContextMenu"); + var $trashTreeContextMenu = $iframe.find("#trashTreeContextMenu"); + var $trashContextMenu = $iframe.find("#trashContextMenu"); + // TOOLBAR var getLastName = function (cb) {