infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix a race condition issue introduced with reconnecting patch

pull/1/head
yflory 2017-02-01 18:48:30 +01:00
parent 8881334ca8
commit 6a5769405b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
www/drive/main.js
View File

@ -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) {