scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-11 06:35:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Only activate overlay when dragging files [SCI-6997] (#4272)

Browse source
This commit is contained in:
artoscinote 2022-07-20 13:39:04 +02:00 • committed by GitHub
parent 088c4c1c94
commit d0cc3155f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/steps/components/checklist.scss
View file

@ -50,7 +50,7 @@
} }
.sci-checkbox-container { .sci-checkbox-container {
margin: 10px 0; margin: 16px 0;
&.disabled { &.disabled {
pointer-events: none; pointer-events: none;

12
app/javascript/vue/protocol/step.vue
View file

@ -2,7 +2,7 @@
<div ref="stepContainer" class="step-container" <div ref="stepContainer" class="step-container"
:id="`stepContainer${step.id}`" :id="`stepContainer${step.id}`"
@drop.prevent="dropFile" @drop.prevent="dropFile"
@dragenter.prevent="!showFileModal ? dragingFile = true : null" @dragenter.prevent="dragEnter($event)"
@dragover.prevent @dragover.prevent
:class="{ 'draging-file': dragingFile, 'showing-comments': showCommentsSidebar, 'editing-name': editingName }" :class="{ 'draging-file': dragingFile, 'showing-comments': showCommentsSidebar, 'editing-name': editingName }"
> >
@ -250,6 +250,16 @@
} }
}, },
methods: { methods: {
dragEnter(e) {
if (this.showFileModal) return;
// Detect if dragged element is a file
// https://stackoverflow.com/a/8494918
let dt = e.dataTransfer;
if (dt.types && (dt.types.indexOf ? dt.types.indexOf('Files') != -1 : dt.types.contains('Files'))) {
this.dragingFile = true;
}
},
loadAttachments() { loadAttachments() {
$.get(this.urls.attachments_url, (result) => { $.get(this.urls.attachments_url, (result) => {
this.attachments = result.data this.attachments = result.data