From b201121e62a09518ab21ab7fd2733af8de85c75c Mon Sep 17 00:00:00 2001
From: GretaD <gretadoci@gmail.com>
Date: Fri, 28 Feb 2020 15:27:31 +0100
Subject: [PATCH] Fix default action for deleted shares
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
apps/files/css/files.scss | 9 ++++++--
apps/files/js/filelist.js | 21 +++++++++++++++++-
apps/files_sharing/js/app.js | 1 +
apps/files_sharing/js/dist/files_sharing.js | Bin 15577 -> 15607 bytes
.../js/dist/files_sharing.js.map | Bin 51182 -> 51269 bytes
5 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 9d9daabc279..b826f305d14 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -320,7 +320,8 @@ table td.fileaction {
width: 32px;
text-align: center;
}
-table td.filename a.name {
+table td.filename a.name,
+table td.filename p.name {
display: flex;
position:relative; /* Firefox needs to explicitly have this default set … */
-moz-box-sizing: border-box;
@@ -356,6 +357,9 @@ table td.filename .thumbnail {
position: absolute;
z-index: 4;
}
+table td.filename p.name .thumbnail {
+ cursor: default;
+}
// Show slight border around previews for images, txt, etc.
table tr[data-has-preview='true'] .thumbnail {
@@ -477,7 +481,8 @@ table td.selection {
-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
}
-#fileList tr td.filename a.name label {
+#fileList tr td.filename a.name label,
+#fileList tr td.filename p.name label {
position: absolute;
width: 80%;
height: 50px;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2ca4185ec86..9973c92c8ec 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -130,6 +130,14 @@
*/
dirInfo: null,
+ /**
+ * Whether to prevent or to execute the default file actions when the
+ * file name is clicked.
+ *
+ * @type boolean
+ */
+ _defaultFileActionsDisabled: false,
+
/**
* File actions handler, defaults to OCA.Files.FileActions
* @type OCA.Files.FileActions
@@ -292,6 +300,10 @@
this._detailsView.$el.addClass('disappear');
}
+ if (options && options.defaultFileActionsDisabled) {
+ this._defaultFileActionsDisabled = options.defaultFileActionsDisabled
+ }
+
this._initFileActions(options.fileActions);
if (this._detailsView) {
@@ -876,7 +888,9 @@
if (!this._detailsView || $(event.target).is('.nametext, .name, .thumbnail') || $(event.target).closest('.nametext').length) {
var filename = $tr.attr('data-file');
var renaming = $tr.data('renaming');
- if (!renaming) {
+ if (this._defaultFileActionsDisabled) {
+ event.preventDefault();
+ } else if (!renaming) {
this.fileActions.currentFile = $tr.find('td');
var mime = this.fileActions.getCurrentMimeType();
var type = this.fileActions.getCurrentType();
@@ -1524,6 +1538,11 @@
"class": "name",
"href": linkUrl
});
+ if (this._defaultFileActionsDisabled) {
+ linkElem = $('<p></p>').attr({
+ "class": "name"
+ })
+ }
linkElem.append('<div class="thumbnail-wrapper"><div class="thumbnail" style="background-image:url(' + icon + ');"></div></div>');
diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
index 781bbfb65e3..ab503c6bfee 100644
--- a/apps/files_sharing/js/app.js
+++ b/apps/files_sharing/js/app.js
@@ -111,6 +111,7 @@ OCA.Sharing.App = {
$el,
{
id: 'shares.deleted',
+ defaultFileActionsDisabled: true,
showDeleted: true,
sharedWithUser: true,
fileActions: this._restoreShareAction(),
diff --git a/apps/files_sharing/js/dist/files_sharing.js b/apps/files_sharing/js/dist/files_sharing.js
index a3fae08e7286807cc7544bfa69fec68eaf09f69a..756939fb31e0bf5a1f0568b095324a86be6322fe 100644
GIT binary patch
delta 42
xcmcav`Mq+(X>Qq+)U?FXoD#RpoK(l;lFa<PVwcR~#H5_m6e~r8&8N8e4FQ#&5eEPO
delta 12
Tcmexfd9!lEY3|K0x%mtMFm47f
diff --git a/apps/files_sharing/js/dist/files_sharing.js.map b/apps/files_sharing/js/dist/files_sharing.js.map
index 70142ed64604071f04c64f2a8853691d1e5f099b..1fafd160dd1b721858811dbff4f5053b44bbb0bb 100644
GIT binary patch
delta 3839
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
a<F-$~%eI`O&-+aawl7{f{nr=%k^e8>!AwK|
delta 3784
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
Vgs2NQ+V<(M*!I+E`m_Hi{tpcSI!OQk
--
GitLab