- Fixed issue when upload doesn't start after you drag the file into empty view

- pointer cursor over file item
This commit is contained in:
Čarodej
2022-05-09 15:06:21 +02:00
parent e9824bb807
commit a43c799d59
8 changed files with 23 additions and 15 deletions

View File

@@ -3,6 +3,7 @@
- Ability to manually synchronize plans in fixed subscription type
- Improved sanitization for .env values to prevent crash your app
- Improved reCaptcha validation error logs
- Fixed issue when upload doesn't start after you drag the file into empty view
## Version 2.1.2
#### Release date: 8. May 2022

View File

@@ -6,7 +6,7 @@
'grid-view-sidebar': itemViewType === 'grid' && isVisibleSidebar,
}"
class="px-4 lg:h-full lg:w-full lg:overflow-y-auto lg:px-0"
@drop.stop.prevent="uploadDroppedItems($event)"
@drop.prevent="dragStop($event)"
@keydown.delete="deleteItems"
@dragover="dragEnter"
@dragleave="dragLeave"
@@ -62,9 +62,7 @@ export default {
this.$store.dispatch('deleteItem')
}
},
uploadDroppedItems(event) {
this.$uploadDraggedFiles(event, this.currentFolder.data.id)
dragStop() {
this.isDragging = false
},
dragEnter() {

View File

@@ -4,7 +4,7 @@
'bg-light-background dark:bg-dark-foreground': isClicked && canHover,
'dark:hover:bg-dark-foreground lg:hover:bg-light-background': canHover,
}"
class="relative z-0 flex h-48 select-none flex-wrap items-center justify-center rounded-lg border-2 border-dashed border-transparent px-1 pt-2 text-center sm:h-56 lg:h-60"
class="relative z-0 flex h-48 select-none flex-wrap items-center justify-center rounded-lg border-2 border-dashed border-transparent px-1 pt-2 text-center sm:h-56 lg:h-60 cursor-pointer"
:draggable="canDrag"
spellcheck="false"
>
@@ -77,7 +77,7 @@
<!--Item Title-->
<span
class="inline-block w-full overflow-hidden text-ellipsis whitespace-nowrap text-sm font-bold leading-3 tracking-tight md:px-6"
:class="{ 'hover:underline': canEditName }"
:class="{ 'hover:underline cursor-text': canEditName }"
ref="name"
@input="renameItem"
@keydown.delete.stop

View File

@@ -4,7 +4,7 @@
'bg-light-background dark:bg-dark-foreground': isClicked && highlight,
'hover:bg-light-background dark:hover:bg-dark-foreground': highlight,
}"
class="flex select-none items-center rounded-xl border-2 border-dashed border-transparent px-2.5 py-2"
class="flex select-none items-center rounded-xl border-2 border-dashed border-transparent px-2.5 py-2 cursor-pointer"
:draggable="canDrag"
spellcheck="false"
>
@@ -55,7 +55,7 @@
<!--Item Title-->
<span
class="mb-0.5 block overflow-hidden text-ellipsis whitespace-nowrap text-sm font-bold"
:class="{ 'hover:underline': canEditName }"
:class="{ 'hover:underline cursor-text': canEditName }"
style="max-width: 240px"
ref="name"
@input="renameItem"

View File

@@ -177,7 +177,7 @@ const FunctionHelpers = {
Vue.prototype.$uploadDraggedFiles = async function (event, parent_id) {
// Show alert message when upload is disabled
if (!store.getters.user.data.meta.restrictions.canUpload) {
if (store.getters.user && !store.getters.user.data.meta.restrictions.canUpload) {
Vue.prototype.$temporarilyDisabledUpload()
return

View File

@@ -46,7 +46,7 @@
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->
<div class="flex space-x-3 lg:overflow-hidden grow">
<div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
<router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
<InfoSidebar v-if="isVisibleSidebar" />
@@ -110,7 +110,7 @@ export default {
DragUI,
},
computed: {
...mapGetters(['isVisibleSidebar', 'isLimitedUser', 'config']),
...mapGetters(['isVisibleSidebar', 'isLimitedUser', 'config', 'currentFolder']),
},
data() {
return {
@@ -118,6 +118,9 @@ export default {
}
},
methods: {
uploadDroppedItems(event) {
this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
},
contextMenu(event, item) {
events.$emit('context-menu:show', event, item)
},

View File

@@ -35,7 +35,7 @@
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->
<div class="flex space-x-3 lg:overflow-hidden grow">
<div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
<router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
<InfoSidebar v-if="isVisibleSidebar" />
@@ -87,7 +87,7 @@ export default {
Alert,
},
computed: {
...mapGetters(['isVisibleSidebar', 'sharedDetail', 'config']),
...mapGetters(['isVisibleSidebar', 'sharedDetail', 'config', 'currentFolder']),
},
data() {
return {
@@ -95,6 +95,9 @@ export default {
}
},
methods: {
uploadDroppedItems(event) {
this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
},
contextMenu(event, item) {
events.$emit('context-menu:show', event, item)
},

View File

@@ -30,7 +30,7 @@
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->
<div class="flex space-x-3 lg:overflow-hidden grow">
<div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
<router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
<InfoSidebarUploadRequest v-if="canShowUI && isVisibleSidebar" />
@@ -76,7 +76,7 @@ export default {
DragUI,
},
computed: {
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue']),
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue', 'currentFolder']),
canShowUI() {
return (this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling') || this.fileQueue.length > 0
}
@@ -87,6 +87,9 @@ export default {
}
},
methods: {
uploadDroppedItems(event) {
this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
},
contextMenu(event, item) {
events.$emit('context-menu:show', event, item)
},