mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-24 01:50:38 +00:00
Merge remote-tracking branch 'origin/infinite_scroll' into api
# Conflicts: # config/vuefilemanager.php # package-lock.json # package.json # public/mix-manifest.json # resources/js/store/modules/fileBrowser.js # resources/js/store/modules/sharing.js # resources/js/store/modules/teams.js # resources/js/store/modules/userAuth.js # src/App/Socialite/Controllers/SocialiteCallbackController.php # src/Domain/Browsing/Controllers/BrowseTrashContentController.php # src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php # src/Domain/Files/Controllers/UploadFileController.php # src/Domain/Items/Controllers/RenameFileOrFolderController.php # src/Support/helpers.php
This commit is contained in:
@@ -242,7 +242,7 @@ export default {
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.$store.dispatch('getSharedWithMeFolder', this.$route.params.id)
|
||||
this.$store.dispatch('getSharedWithMeFolder',{page:null, id:this.$route.params.id})
|
||||
|
||||
events.$on('context-menu:show', (event, item) => (this.item = item))
|
||||
events.$on('mobile-context-menu:show', (item) => (this.item = item))
|
||||
@@ -257,7 +257,7 @@ export default {
|
||||
if (this.$route.params.id) {
|
||||
this.$router.push({ name: 'SharedWithMe' })
|
||||
} else {
|
||||
this.$store.dispatch('getSharedWithMeFolder', undefined)
|
||||
this.$store.dispatch('getSharedWithMeFolder',{page:null, id:undefined})
|
||||
}
|
||||
|
||||
events.$emit('toaster', {
|
||||
|
||||
Reference in New Issue
Block a user