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

Allow right click on the CryptPad logo/link in the top left corner

pull/1/head
yflory 2017-03-13 18:49:30 +01:00
parent 1cc6eab871
commit ceaf757680
2 changed files with 14 additions and 9 deletions
www

7
www/common/toolbar.js
View File

@ -407,8 +407,11 @@ define([
window.location = "/";
};
$aTagBig.click(onClick);
$aTagSmall.click(onClick);
var onContext = function (e) { e.stopPropagation(); };
$aTagBig.click(onClick).contextmenu(onContext);
$aTagSmall.click(onClick).contextmenu(onContext);
$linkContainer.append($aTagSmall).append($aTagBig);
};

16
www/drive/main.js
View File

@ -181,6 +181,7 @@ define([
var $tree = $iframe.find("#tree");
var $content = $iframe.find("#content");
var $appContainer = $iframe.find(".app-container");
var $driveToolbar = $iframe.find("#driveToolbar");
var $contextMenu = $iframe.find("#treeContextMenu");
var $contentContextMenu = $iframe.find("#contentContextMenu");
@ -1737,7 +1738,8 @@ define([
// Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs
$(ifrw).click(function (e) {
if (e.which !== 3) {
if (!e.target || !$(e.target).parents('.cryptpad-dropdown').length) { return; }
if (e.which !== 1) {
e.stopPropagation();
return false;
}
@ -1900,21 +1902,21 @@ define([
module.hideMenu();
});
$(ifrw).on('click', function (e) {
$appContainer.on('click', function (e) {
if (e.which !== 1) { return ; }
removeSelected(e);
removeInput();
module.hideMenu(e);
hideNewButton();
});
$(ifrw).on('drag drop', function (e) {
$appContainer.on('drag drop', function (e) {
removeInput();
module.hideMenu(e);
});
$(ifrw).on('mouseup drop', function (e) {
$appContainer.on('mouseup drop', function (e) {
$iframe.find('.droppable').removeClass('droppable');
});
$(ifrw).on('keydown', function (e) {
$appContainer.on('keydown', function (e) {
// "Del"
if (e.which === 46) {
if (filesOp.isPathInFilesData(currentPath)) { return; } // We can't remove elements directly from filesData
@ -1948,7 +1950,7 @@ define([
moveElements(paths, [TRASH], false, refresh);
}
});
$(ifrw).contextmenu(function () {
$appContainer.contextmenu(function () {
module.hideMenu();
return false;
});
@ -2005,7 +2007,7 @@ define([
updatePathSize();
}, 100);
});
$(ifrw).mouseup(function (e) {
$appContainer.mouseup(function (e) {
window.clearInterval(APP.resizeTree);
APP.resizeTree = undefined;
});