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

Remove more handlers when closing the drive

pull/1/head
yflory 2019-09-17 11:57:30 +02:00
parent a7c274e6ae
commit 9cf99a8b65
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
www/common/drive-ui.js
View File

@ -254,6 +254,7 @@ define([
var setEditable = function (state) {
APP.editable = state;
if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
if (!state) {
APP.$content.addClass('cp-app-drive-readonly');
$('[draggable="true"]').attr('draggable', false);
@ -3175,6 +3176,8 @@ 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; }
APP.hideMenu();
if (!APP.editable) { debug("Read-only mode"); }
@ -3372,6 +3375,7 @@ define([
appStatus.ready(true);
};
var displayDirectory = APP.displayDirectory = function (path, force) {
if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
if (history.isHistoryMode) {
return void _displayDirectory(path, force);
}
@ -4118,16 +4122,6 @@ define([
APP.hideMenu();
});
$(window).on('mouseup', onWindowMouseUp);
$(window).on('keydown', onWindowKeydown);
$(window).on('click', onWindowClick);
var removeWindowListeners = function () {
$(window).off('mouseup', onWindowMouseUp);
$(window).off('keydown', onWindowKeydown);
$(window).off('click', onWindowClick);
};
// Chrome considers the double-click means "select all" in the window
$content.on('mousedown', function (e) {
$content.focus();
@ -4211,7 +4205,7 @@ define([
}
};
sframeChan.on('EV_DRIVE_CHANGE', function (data) {
var onEvDriveChange = sframeChan.on('EV_DRIVE_CHANGE', function (data) {
if (history.isHistoryMode) { return; }
var path = data.path.slice();
@ -4247,7 +4241,7 @@ define([
}
return false;
});
sframeChan.on('EV_DRIVE_REMOVE', function (data) {
var onEvDriveRemove = sframeChan.on('EV_DRIVE_REMOVE', function (data) {
if (history.isHistoryMode) { return; }
var path = data.path.slice();
@ -4280,6 +4274,21 @@ define([
return false;
});
$(window).on('mouseup', onWindowMouseUp);
$(window).on('keydown', onWindowKeydown);
$(window).on('click', onWindowClick);
var removeWindowListeners = function () {
$(window).off('mouseup', onWindowMouseUp);
$(window).off('keydown', onWindowKeydown);
$(window).off('click', onWindowClick);
try {
onEvDriveChange.stop();
onEvDriveRemove.stop();
} catch (e) {}
};
if (APP.histConfig) {
APP.histConfig.onOpen = function () {
// If we're in a shared folder history, store its id in memory
@ -4353,6 +4362,7 @@ define([
return {
refresh: refresh,
close: function () {
APP.closed = true;
removeWindowListeners();
}
};

4
www/team/inner.js
View File

@ -437,13 +437,13 @@ define([
var onDisconnect = function (noAlert) {
setEditable(false);
if (driveAPP.refresh) { driveAPP.refresh(); }
if (APP.team && driveAPP.refresh) { driveAPP.refresh(); }
toolbar.failed();
if (!noAlert) { UI.alert(Messages.common_connectionLost, undefined, true); }
};
var onReconnect = function (info) {
setEditable(true);
if (driveAPP.refresh) { driveAPP.refresh(); }
if (APP.team && driveAPP.refresh) { driveAPP.refresh(); }
toolbar.reconnecting(info.myId);
UI.findOKButton().click();
};