diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1c7049c3..db809801 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -29,8 +29,8 @@ "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=405847df44edd86e301a", "/chunks/files.js": "/chunks/files.js?id=12e6fd841d32ca1af12f", "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=8ccd35de575e8a91d02f", - "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=72203945eb28fc533dff", - "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=a38b5486aad2de37d702", + "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=0d89706c1c4810dc4cf7", + "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=bcd1b40ac75424062efb", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=aba8c662fbc234892216", "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=ecceaa6cdf5768826b36", "/chunks/invoices.js": "/chunks/invoices.js?id=248503ac5967fe8370f9", @@ -75,73 +75,47 @@ "/chunks/user-storage.js": "/chunks/user-storage.js?id=a99910f95c3e39caa78b", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e8ea1e67f9ac0a835ed0", "/chunks/users.js": "/chunks/users.js?id=cdba7af8fb0cd8e64c40", - "/js/main.7b1d5f3297b87dc1487d.hot-update.js": "/js/main.7b1d5f3297b87dc1487d.hot-update.js", - "/js/main.770426ead3454ca11c24.hot-update.js": "/js/main.770426ead3454ca11c24.hot-update.js", - "/js/main.f1dfe4e14990c901dc0d.hot-update.js": "/js/main.f1dfe4e14990c901dc0d.hot-update.js", - "/js/main.e07a78657b6afb9664c4.hot-update.js": "/js/main.e07a78657b6afb9664c4.hot-update.js", - "/js/main.7ec28b0babf7c0117a03.hot-update.js": "/js/main.7ec28b0babf7c0117a03.hot-update.js", - "/js/main.ff4f23729b07e007552e.hot-update.js": "/js/main.ff4f23729b07e007552e.hot-update.js", - "/js/main.320ea5c40b254b1a221d.hot-update.js": "/js/main.320ea5c40b254b1a221d.hot-update.js", - "/js/main.8b0c714e0199fe4de309.hot-update.js": "/js/main.8b0c714e0199fe4de309.hot-update.js", - "/js/main.f16e936cac6b888f60f4.hot-update.js": "/js/main.f16e936cac6b888f60f4.hot-update.js", - "/js/main.7311b327647ae4817f93.hot-update.js": "/js/main.7311b327647ae4817f93.hot-update.js", - "/js/main.e89a93411c78a64b9203.hot-update.js": "/js/main.e89a93411c78a64b9203.hot-update.js", - "/js/main.6696d21bd77a8f6a8555.hot-update.js": "/js/main.6696d21bd77a8f6a8555.hot-update.js", - "/js/main.384fe7a3656aacbf868f.hot-update.js": "/js/main.384fe7a3656aacbf868f.hot-update.js", - "/js/main.446ef0560ec164d558ab.hot-update.js": "/js/main.446ef0560ec164d558ab.hot-update.js", - "/js/main.ba2173a2df957eaa9726.hot-update.js": "/js/main.ba2173a2df957eaa9726.hot-update.js", - "/js/main.3ddfed04f74f778bf1f3.hot-update.js": "/js/main.3ddfed04f74f778bf1f3.hot-update.js", - "/js/main.baed53710795543380e5.hot-update.js": "/js/main.baed53710795543380e5.hot-update.js", - "/js/main.6475f8627ab4967821f1.hot-update.js": "/js/main.6475f8627ab4967821f1.hot-update.js", - "/js/main.e1d20c5ee15e8a281edd.hot-update.js": "/js/main.e1d20c5ee15e8a281edd.hot-update.js", - "/js/main.e3e77125ca1fa0b42995.hot-update.js": "/js/main.e3e77125ca1fa0b42995.hot-update.js", - "/js/main.82ca6152237b4c1961f7.hot-update.js": "/js/main.82ca6152237b4c1961f7.hot-update.js", - "/js/main.179c6a1e106c6bcf3608.hot-update.js": "/js/main.179c6a1e106c6bcf3608.hot-update.js", - "/js/main.c7c7758ebaf37f33635e.hot-update.js": "/js/main.c7c7758ebaf37f33635e.hot-update.js", - "/js/main.8887957da7ca4eb40298.hot-update.js": "/js/main.8887957da7ca4eb40298.hot-update.js", - "/js/main.e5c62289ca0d2f541b4a.hot-update.js": "/js/main.e5c62289ca0d2f541b4a.hot-update.js", - "/js/main.16964ff0710c00b66242.hot-update.js": "/js/main.16964ff0710c00b66242.hot-update.js", - "/js/main.dcf17e117eb037684091.hot-update.js": "/js/main.dcf17e117eb037684091.hot-update.js", - "/js/main.354b7a6f7ae0d3aa1142.hot-update.js": "/js/main.354b7a6f7ae0d3aa1142.hot-update.js", - "/js/main.c0e89fd3dc4b144c0b57.hot-update.js": "/js/main.c0e89fd3dc4b144c0b57.hot-update.js", - "/js/main.cce9de6e34bd195a2470.hot-update.js": "/js/main.cce9de6e34bd195a2470.hot-update.js", - "/js/main.180b7c64d41dc17bcbdc.hot-update.js": "/js/main.180b7c64d41dc17bcbdc.hot-update.js", - "/js/main.fa0507cbb488d1323174.hot-update.js": "/js/main.fa0507cbb488d1323174.hot-update.js", - "/js/main.2683ebdbd7a3372257f8.hot-update.js": "/js/main.2683ebdbd7a3372257f8.hot-update.js", - "/js/main.03403135144d950bce7f.hot-update.js": "/js/main.03403135144d950bce7f.hot-update.js", - "/js/main.a9989d18dab41c5d1d6e.hot-update.js": "/js/main.a9989d18dab41c5d1d6e.hot-update.js", - "/js/main.54110e245dcb0ba48b97.hot-update.js": "/js/main.54110e245dcb0ba48b97.hot-update.js", - "/js/main.8d95172eb5c63972df0f.hot-update.js": "/js/main.8d95172eb5c63972df0f.hot-update.js", - "/js/main.808cab2d93990d9589b3.hot-update.js": "/js/main.808cab2d93990d9589b3.hot-update.js", - "/js/main.3bb3415f7ef6f74f7024.hot-update.js": "/js/main.3bb3415f7ef6f74f7024.hot-update.js", - "/js/main.1aa5357fceaafbea6861.hot-update.js": "/js/main.1aa5357fceaafbea6861.hot-update.js", - "/js/main.b2768a7e953f9f27158a.hot-update.js": "/js/main.b2768a7e953f9f27158a.hot-update.js", - "/js/main.281734f935cd1d4edbd3.hot-update.js": "/js/main.281734f935cd1d4edbd3.hot-update.js", - "/js/main.3f772785fc422e9dca89.hot-update.js": "/js/main.3f772785fc422e9dca89.hot-update.js", - "/js/main.33f1f06a04e805b8158d.hot-update.js": "/js/main.33f1f06a04e805b8158d.hot-update.js", - "/js/main.de8ff86fd5ffffd0f98f.hot-update.js": "/js/main.de8ff86fd5ffffd0f98f.hot-update.js", - "/js/main.7a0559efa8374cefb180.hot-update.js": "/js/main.7a0559efa8374cefb180.hot-update.js", - "/js/main.9710d1e2246ae5bd9764.hot-update.js": "/js/main.9710d1e2246ae5bd9764.hot-update.js", - "/js/main.82c10aa6187dfc6c759d.hot-update.js": "/js/main.82c10aa6187dfc6c759d.hot-update.js", - "/js/main.6785fe267fd9e655c779.hot-update.js": "/js/main.6785fe267fd9e655c779.hot-update.js", - "/js/main.ac897cdb3ed815c9b32f.hot-update.js": "/js/main.ac897cdb3ed815c9b32f.hot-update.js", - "/js/main.bfd33a236b3ada863585.hot-update.js": "/js/main.bfd33a236b3ada863585.hot-update.js", - "/js/main.5e494a2564eb284c61e7.hot-update.js": "/js/main.5e494a2564eb284c61e7.hot-update.js", - "/js/main.423d19b046bdfcd61cdd.hot-update.js": "/js/main.423d19b046bdfcd61cdd.hot-update.js", - "/js/main.21687aee4ca3f3d031d2.hot-update.js": "/js/main.21687aee4ca3f3d031d2.hot-update.js", - "/js/main.7ac03d713a927b074d0a.hot-update.js": "/js/main.7ac03d713a927b074d0a.hot-update.js", - "/js/main.2b41ecbfda552f8654e1.hot-update.js": "/js/main.2b41ecbfda552f8654e1.hot-update.js", - "/js/main.370a1d9e80afc6a8c4df.hot-update.js": "/js/main.370a1d9e80afc6a8c4df.hot-update.js", - "/js/main.e7eeb63ebfb99748eafb.hot-update.js": "/js/main.e7eeb63ebfb99748eafb.hot-update.js", - "/js/main.7c56c532344c1e948870.hot-update.js": "/js/main.7c56c532344c1e948870.hot-update.js", - "/js/main.23bc0e0bc10bb7766277.hot-update.js": "/js/main.23bc0e0bc10bb7766277.hot-update.js", - "/js/main.6cd6982ff29745d16f1e.hot-update.js": "/js/main.6cd6982ff29745d16f1e.hot-update.js", - "/js/main.cad79ae055979dada201.hot-update.js": "/js/main.cad79ae055979dada201.hot-update.js", - "/js/main.6ce992d987b11b2352d3.hot-update.js": "/js/main.6ce992d987b11b2352d3.hot-update.js", - "/js/main.c93a1d9f81a08c06871c.hot-update.js": "/js/main.c93a1d9f81a08c06871c.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.d2b8e91ee4e6586eed78.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d2b8e91ee4e6586eed78.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.5b5e8120c941c464e39f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5b5e8120c941c464e39f.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.bc87867e2e764b666b44.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.bc87867e2e764b666b44.hot-update.js", - "/chunks/files~chunks/shared-page.a39af8a471c4d71c2c0a.hot-update.js": "/chunks/files~chunks/shared-page.a39af8a471c4d71c2c0a.hot-update.js", - "/chunks/files.1052f910662e9e1fb1ca.hot-update.js": "/chunks/files.1052f910662e9e1fb1ca.hot-update.js" + "/chunks/files~chunks/shared-page.3ea0ca7f8dc09201c69f.hot-update.js": "/chunks/files~chunks/shared-page.3ea0ca7f8dc09201c69f.hot-update.js", + "/chunks/files~chunks/shared-page.6190c7b1e74deb924a72.hot-update.js": "/chunks/files~chunks/shared-page.6190c7b1e74deb924a72.hot-update.js", + "/js/main.7beb181e991b8f273d43.hot-update.js": "/js/main.7beb181e991b8f273d43.hot-update.js", + "/js/main.ae51ac28084228e77567.hot-update.js": "/js/main.ae51ac28084228e77567.hot-update.js", + "/js/main.f738f58d6800de51cea1.hot-update.js": "/js/main.f738f58d6800de51cea1.hot-update.js", + "/js/main.1f99d6d40066c5a94140.hot-update.js": "/js/main.1f99d6d40066c5a94140.hot-update.js", + "/js/main.29bd2a3ea56f248c1072.hot-update.js": "/js/main.29bd2a3ea56f248c1072.hot-update.js", + "/chunks/files~chunks/shared-page.97e066ce65be22d0f2f0.hot-update.js": "/chunks/files~chunks/shared-page.97e066ce65be22d0f2f0.hot-update.js", + "/chunks/files~chunks/shared-page.c3d67ff66ed725bcf483.hot-update.js": "/chunks/files~chunks/shared-page.c3d67ff66ed725bcf483.hot-update.js", + "/chunks/files~chunks/shared-page.57cf125f52c8b0446585.hot-update.js": "/chunks/files~chunks/shared-page.57cf125f52c8b0446585.hot-update.js", + "/chunks/files~chunks/shared-page.769fa1a2bcbefa5253b3.hot-update.js": "/chunks/files~chunks/shared-page.769fa1a2bcbefa5253b3.hot-update.js", + "/js/main.5cc4b881f0e6a030eb50.hot-update.js": "/js/main.5cc4b881f0e6a030eb50.hot-update.js", + "/js/main.76f2fce765e011c63700.hot-update.js": "/js/main.76f2fce765e011c63700.hot-update.js", + "/js/main.2a2ba4fe83813e7c2329.hot-update.js": "/js/main.2a2ba4fe83813e7c2329.hot-update.js", + "/js/main.d8bfd24bc3df63dc8857.hot-update.js": "/js/main.d8bfd24bc3df63dc8857.hot-update.js", + "/js/main.c22768bc2f3bb3ec2f41.hot-update.js": "/js/main.c22768bc2f3bb3ec2f41.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.480de0834aab5f65f147.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.480de0834aab5f65f147.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.7e8359aa293529992bb3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7e8359aa293529992bb3.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.b87439ebd031365be626.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b87439ebd031365be626.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.640b6e4227f099b79f72.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.640b6e4227f099b79f72.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.fea04741525042b7b040.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fea04741525042b7b040.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.fce1de2f852ab9576a6f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fce1de2f852ab9576a6f.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.5ec5d0831c13c939b429.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5ec5d0831c13c939b429.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.26868e8730fb1f560c11.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.26868e8730fb1f560c11.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.91165b341a4deb4810b6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.91165b341a4deb4810b6.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.ee371a01da60bda9c3b2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ee371a01da60bda9c3b2.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.9820f1ec75683c80470d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9820f1ec75683c80470d.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.e4682968b9fdd12aa145.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e4682968b9fdd12aa145.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.b102416a62881e000f44.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b102416a62881e000f44.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.7ae375b57ca8ff715783.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7ae375b57ca8ff715783.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.8b7c8cd8aa5f93787de2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8b7c8cd8aa5f93787de2.hot-update.js", + "/js/main.96ff5e8fd7c2c51d6ab6.hot-update.js": "/js/main.96ff5e8fd7c2c51d6ab6.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.ba276dd3d3dc7803b9ae.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ba276dd3d3dc7803b9ae.hot-update.js", + "/js/main.1031624400c3b6afd843.hot-update.js": "/js/main.1031624400c3b6afd843.hot-update.js", + "/js/main.e8f159c76d2f793fa84a.hot-update.js": "/js/main.e8f159c76d2f793fa84a.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.7c5936053338a189fd73.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7c5936053338a189fd73.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.54b95b833be5d00535b5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.54b95b833be5d00535b5.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.79dcca5b0df2c9ae8162.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.79dcca5b0df2c9ae8162.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.afcefba0227a3c15074a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.afcefba0227a3c15074a.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.a548c23d2260c5328df4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a548c23d2260c5328df4.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.9afebae5388172863bc1.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9afebae5388172863bc1.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.4c08da115deb9718b2e7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4c08da115deb9718b2e7.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.0c0b49d417445d2d0b5e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0c0b49d417445d2d0b5e.hot-update.js" } diff --git a/resources/js/components/FilesView/DragUI.vue b/resources/js/components/FilesView/DragUI.vue index f556a885..64e366e4 100644 --- a/resources/js/components/FilesView/DragUI.vue +++ b/resources/js/components/FilesView/DragUI.vue @@ -25,6 +25,10 @@ import {events} from '@/bus' if(this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.draggedItem) ) { return this.fileInfoDetail.length + ' ' + this.$tc('file_detail.items', this.fileInfoDetail.length) } + + if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem ) { + return '.'+this.draggedItem.mimetype + } }, }, data () { diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue index 7dc6c95f..4d4121d1 100644 --- a/resources/js/components/FilesView/FileBrowser.vue +++ b/resources/js/components/FilesView/FileBrowser.vue @@ -187,24 +187,25 @@ dragFinish(data, event) { if (event.dataTransfer.items.length == 0) { - // Prevent to drop on file or image if (data.type !== 'folder' || this.draggingId === data) return //Prevent move selected folder to folder if in beteewn selected folders - if(this.fileInfoDetail.find(item => item === data)) return + if(this.fileInfoDetail.find(item => item === data && this.fileInfoDetail.length > 1)) return // Move folder to new parent + //Move item if is not included in selected items + if(!this.fileInfoDetail.includes(this.draggingId)){ + this.$store.dispatch('moveItem', {to_item:data ,noSelectedItem:this.draggingId}) + } + //Move selected items to folder if(this.fileInfoDetail.length > 0 && this.fileInfoDetail.includes(this.draggingId)){ this.$store.dispatch('moveItem', {to_item:data ,noSelectedItem: null}) } - - //Move item if is not included in selected items - if(this.fileInfoDetail.length === 0 || !this.fileInfoDetail.includes(this.draggingId)){ - this.$store.dispatch('moveItem', {to_item:data ,noSelectedItem:this.draggingId}) - } + + } else { @@ -285,6 +286,7 @@ .mobile-multi-select { bottom: 50px !important; + top: 0px; } .button-upload { diff --git a/resources/js/components/FilesView/MobileMenu.vue b/resources/js/components/FilesView/MobileMenu.vue index 62e62169..9792ae6b 100644 --- a/resources/js/components/FilesView/MobileMenu.vue +++ b/resources/js/components/FilesView/MobileMenu.vue @@ -401,6 +401,7 @@ export default { //If emit to show menu coming from MediaFullPreview dont reset data this.isVisible = false; this.showFromMediaPreview = false; + events.$emit('hide:mobile-navigation') }, }, created() { diff --git a/resources/js/components/Others/TreeMenuNavigator.vue b/resources/js/components/Others/TreeMenuNavigator.vue index e3662963..5ec522ed 100644 --- a/resources/js/components/Others/TreeMenuNavigator.vue +++ b/resources/js/components/Others/TreeMenuNavigator.vue @@ -88,13 +88,13 @@ //Move no selected item if(!this.fileInfoDetail.includes(this.draggedItem[0])) { this.$store.dispatch('moveItem', {to_item: this.nodes ,noSelectedItem:this.draggedItem[0]}) - this.draggedItem = [] } //Move all selected items if(this.fileInfoDetail.includes(this.draggedItem[0])) { this.$store.dispatch('moveItem', {to_item: this.nodes ,noSelectedItem:null}) - this.draggedItem = [] } + + this.draggedItem = [] this.area = false events.$emit('drop') @@ -155,7 +155,7 @@ } .is-dragenter { - border: 2px dashed $theme; + border: 2px dashed $theme !important; border-radius: 8px; } @@ -167,6 +167,7 @@ position: relative; white-space: nowrap; width: 100%; + border: 2px dashed transparent ; .icon { line-height: 0;