nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 02:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ads

Browse Source 
# Conflicts:
#	package.json
#	public/9346.js
#	public/chunks/admin.js
#	public/chunks/app-environment.js
#	public/chunks/app-server.js
#	public/chunks/billing.js
#	public/chunks/forgotten-password.js
#	public/chunks/homepage.js
#	public/chunks/plan-create/metered.js
#	public/chunks/plan-settings.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/recent-uploads.js
#	public/chunks/request.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/authenticate.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/css/tailwind.css
#	public/js/main.js
#	public/js/main.js.LICENSE.txt
#	public/mix-manifest.json
This commit is contained in:
Čarodej
2022-08-08 08:50:24 +02:00
parent b8a50bb326 5505006d1b
commit b38a8f5450
244 changed files with 6918 additions and 23202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/views/Platform.vue
+12 -5
View File
@@ -36,7 +36,7 @@
<div
@contextmenu.prevent.capture="contextMenu($event, undefined)"
class="lg:flex lg:flex-col lg:w-full lg:px-3.5"
class="lg:flex lg:flex-col lg:w-full lg:px-3.5 min-w-0"
>
<DesktopToolbar />
@@ -53,7 +53,7 @@
<!--File list & info sidebar-->
<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" />
<router-view id="file-view" class="relative w-full min-w-0" :key="$route.fullPath" />
<InfoSidebar v-if="isVisibleSidebar" />
</div>
@@ -62,6 +62,7 @@
</template>
<script>
import { getFilesFromDataTransferItems } from 'datatransfer-files-promise'
import FileSortingMobile from '../components/Menus/FileSortingMobile'
import SidebarNavigation from '../components/Sidebar/SidebarNavigation'
import FileFilterMobile from '../components/Menus/FileFilterMobile'
@@ -116,7 +117,7 @@ export default {
DragUI,
},
computed: {
...mapGetters(['isVisibleSidebar', 'isLimitedUser', 'config', 'currentFolder']),
...mapGetters(['isVisibleSidebar', 'config', 'currentFolder']),
},
data() {
return {
@@ -124,8 +125,14 @@ export default {
}
},
methods: {
uploadDroppedItems(event) {
this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
async uploadDroppedItems(event) {
// Check if user dropped folder with files
let files = await getFilesFromDataTransferItems(event.dataTransfer.items)
if (files.length !== 0) {
// Upload folder with files
this.$uploadDraggedFolderOrFile(files, this.currentFolder?.data.id)
}
},
contextMenu(event, item) {
events.$emit('context-menu:show', event, item)