diff --git a/resources/js/components/FilesView/MobileActions.vue b/resources/js/components/FilesView/MobileActions.vue
index c1ad09d1..3a02311f 100644
--- a/resources/js/components/FilesView/MobileActions.vue
+++ b/resources/js/components/FilesView/MobileActions.vue
@@ -3,15 +3,15 @@
-
- {{$t('preview_sorting.preview_sorting_button')}}
-
-
- {{ $t('context_menu.select') }}
-
{{ $t('context_menu.empty_trash') }}
+
+ {{ $t('context_menu.select') }}
+
+
+ {{$t('preview_sorting.preview_sorting_button')}}
+
@@ -25,20 +25,19 @@
{{ $t('context_menu.select') }}
-
-
+
{{$t('preview_sorting.preview_sorting_button')}}
-
- {{$t('preview_sorting.preview_sorting_button')}}
-
{{ $t('context_menu.select') }}
+
+ {{$t('preview_sorting.preview_sorting_button')}}
+
@@ -80,20 +79,22 @@
mobileMultiSelect () {
if(this.mobileMultiSelect ) {
- events.$emit('mobileSelecting-start')
+ events.$emit('mobileSelecting:start')
}
if(!this.mobileMultiSelect) {
- events.$emit('mobileSelecting-stop')
+ events.$emit('mobileSelecting:stop')
}
},
mobileSortingAndPreview (oldValue , newValue) {
if(this.mobileSortingAndPreview) {
- events.$emit('mobileSortingAndPreview-open')
+ events.$emit('mobileSortingAndPreview' , true)
+ events.$emit('mobileSortingAndPreviewVignette' , true)
this.mobileMultiSelect = false
}
if(!this.mobileSortingAndPreview) {
- events.$emit('mobileSortingAndPreview-close')
+ events.$emit('mobileSortingAndPreview', false)
+ events.$emit('mobileSortingAndPreviewVignette' , false)
}
}
},
@@ -112,12 +113,12 @@
},
},
mounted () {
- events.$on('mobileSelecting-stop', () => {
+ events.$on('mobileSelecting:stop', () => {
this.mobileMultiSelect = false
})
- events.$on('mobileSortingAndPreview-close', () => {
- this.mobileSortingAndPreview = false
+ events.$on('mobileSortingAndPreview', (state) => {
+ this.mobileSortingAndPreview = state
})
@@ -128,10 +129,17 @@
diff --git a/resources/js/components/FilesView/MobileMultiSelectButton.vue b/resources/js/components/FilesView/MobileMultiSelectButton.vue
index 12fcf003..1bd07abf 100644
--- a/resources/js/components/FilesView/MobileMultiSelectButton.vue
+++ b/resources/js/components/FilesView/MobileMultiSelectButton.vue
@@ -27,11 +27,11 @@
}
},
mounted() {
- events.$on('mobileSelecting-start' , () => {
+ events.$on('mobileSelecting:start' , () => {
this.mobileSelectingActive = true
})
- events.$on('mobileSelecting-stop' , () => {
+ events.$on('mobileSelecting:stop' , () => {
this.mobileSelectingActive = false
})
}
diff --git a/resources/js/components/FilesView/MobileMultiSelectMenu.vue b/resources/js/components/FilesView/MobileMultiSelectMenu.vue
index e3270004..55e2ddec 100644
--- a/resources/js/components/FilesView/MobileMultiSelectMenu.vue
+++ b/resources/js/components/FilesView/MobileMultiSelectMenu.vue
@@ -30,7 +30,7 @@ export default {
},
methods: {
closeSelecting() {
- events.$emit('mobileSelecting-stop')
+ events.$emit('mobileSelecting:stop')
},
downloadItem() {
this.fileInfoDetail.forEach((item , i) => {
@@ -52,12 +52,12 @@ export default {
}
},
created() {
- events.$on('mobileSelecting-start', () => {
+ events.$on('mobileSelecting:start', () => {
this.mobileMultiSelect = true
})
- events.$on('mobileSelecting-stop', () => {
+ events.$on('mobileSelecting:stop', () => {
this.mobileMultiSelect = false
})
diff --git a/resources/js/components/FilesView/MobileSortingAndPreview.vue b/resources/js/components/FilesView/MobileSortingAndPreview.vue
index 0cee585e..c36c8544 100644
--- a/resources/js/components/FilesView/MobileSortingAndPreview.vue
+++ b/resources/js/components/FilesView/MobileSortingAndPreview.vue
@@ -1,6 +1,5 @@
-
-
+
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index afc3bd92..096da3c3 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -301,9 +301,6 @@ const Helpers = {
title: i18n.t('popup_mimetypes_blacklist.title'),
message: i18n.t('popup_mimetypes_blacklist.message', {mimetype: fileType[1]}),
})
- }else {
- // TODO: tento else tu nemusi byt, defaultne je uz prednastaveny true cize ak sa nevykona podmienka vyssie tak vzdy bude true
- validated = true
}
}
return validated
@@ -315,11 +312,11 @@ const Helpers = {
let actions = {
'base' : ['getFolder', [{ folder: folder, back: true, init: false, sorting:true}]],
'public' : ['browseShared', [{ folder: folder, back: true, init: false, sorting:true}]],
+ 'trash' : ['getFolder', [{ folder: folder, back: true, init: false, sorting:true}]],
+ 'participant_uploads' : ['getParticipantUploads'],
+ 'trash-root' : ['getTrash'],
'latest' : ['getLatest'],
'shared' : ['getShared'],
- 'trash-root' : ['getTrash'],
- // 'trash' : ['getTrash'], TODO: skontrolovat a spojazdnit
- 'participant_uploads' : ['getParticipantUploads'],
}
this.$store.dispatch(...actions[folder.location])
@@ -330,14 +327,14 @@ const Helpers = {
// Get data of Navigator tree
this.$store.dispatch('getFolderTree')
}
+ Vue.prototype.$checkOS = function() {
+ // Handle styled scrollbar for Windows
+ if (navigator.userAgent.indexOf('Windows') != -1) {
+ let body = document.body
+ body.classList.add('windows')
+ }
+ }
}
}
-export default Helpers
-
-// Handle styled scrollbar for Windows
-// TODO: toto treba dat jednoznacne na svoje spravne miesto
-if (navigator.userAgent.indexOf('Windows') != -1) {
- let body = document.body
- body.classList.add('windows')
-}
\ No newline at end of file
+export default Helpers
\ No newline at end of file
diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json
index bf1cb950..97a36b1e 100644
--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -6,7 +6,9 @@
"preview": "更改预览",
"share": "Share item",
"upload": "上传文件",
- "close": "Close"
+ "close": "Close",
+ "sorting_view": "Sorting and View",
+ "info_panel": "Info panel"
},
"activation": {
"stripe": {
diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json
index 00f3b4ba..17562b58 100644
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -8,7 +8,9 @@
"upload": "Upload file",
"download": "Download item",
"print": "Print item",
- "close": "Close"
+ "close": "Close",
+ "sorting_view": "Sorting and View",
+ "info_panel": "Info panel"
},
"activation": {
"stripe": {
diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json
index dc1b6f8e..553c0502 100644
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -8,7 +8,9 @@
"upload": "Nahrať súbory",
"download": "Stiahnuť položku",
"print": "Vytlačiť položku",
- "close": "Zatvoriť"
+ "close": "Zatvoriť",
+ "sorting_view" : "Zoradenie a zobrazenie ",
+ "info_panel" : "Informačný panel"
},
"activation": {
"stripe": {
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index eeefc4e6..1801e12e 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -36,11 +36,11 @@ const actions = {
commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
let url = payload.folder.location === 'trash'
- ? '/folders/' + payload.folder.unique_id + '?trash=true'
- : '/folders/' + payload.folder.unique_id
+ ? '/folders/' + payload.folder.unique_id + getters.sorting.URI + '&trash=true'
+ : '/folders/' + payload.folder.unique_id + getters.sorting.URI
axios
- .get(getters.api + url + getters.sorting.URI)
+ .get(getters.api + url)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
commit('STORE_CURRENT_FOLDER', payload.folder)