@@ -149,7 +149,7 @@ export default {
return {
area: false,
itemName: undefined,
- multiSelectMode: false
+ mobileMultiSelect: false
}
},
methods: {
@@ -214,26 +214,25 @@ export default {
}
}
- if (!this.multiSelectMode && this.$isMobile()) {
- // Open in mobile version on first click
- if (this.$isMobile() && this.isFolder) {
- // Go to folder
- if (this.$isThisLocation('public')) {
- this.$store.dispatch('browseShared', [{folder: this.item, back: false, init: false}])
- } else {
- this.$store.dispatch('getFolder', [{folder: this.item, back: false, init: false}])
- }
- }
+ if (!this.mobileMultiSelect && this.$isMobile()) {
+
+ if (this.isFolder) {
+
+ if (this.$isThisLocation('public')) {
+ this.$store.dispatch('browseShared', [{ folder: this.item, back: false, init: false }])
+ } else {
+ this.$store.dispatch('getFolder', [{ folder: this.item, back: false, init: false }])
+ }
+ } else {
- if (this.$isMobile()) {
if (this.isImage || this.isVideo || this.isAudio || this.isPdf) {
- this.$store.commit('GET_FILEINFO_DETAIL', this.item)
+ this.$store.commit('LOAD_FILEINFO_DETAIL', this.item)
events.$emit('file-preview:show')
}
}
}
- if (this.multiSelectMode && this.$isMobile()) {
+ if (this.mobileMultiSelect && this.$isMobile()) {
if (this.fileInfoDetail.some(item => item.id === this.item.id)) {
this.$store.commit('REMOVE_ITEM_FILEINFO_DETAIL', this.item)
} else {
@@ -284,12 +283,12 @@ export default {
})
events.$on('mobileSelecting:start', () => {
- this.multiSelectMode = true
+ this.mobileMultiSelect = true
this.$store.commit('CLEAR_FILEINFO_DETAIL')
})
events.$on('mobileSelecting:stop', () => {
- this.multiSelectMode = false
+ this.mobileMultiSelect = false
this.$store.commit('CLEAR_FILEINFO_DETAIL')
})
// Change item name
diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue
index c4156e4c..a3e94af0 100644
--- a/resources/js/components/FilesView/FileItemList.vue
+++ b/resources/js/components/FilesView/FileItemList.vue
@@ -1,5 +1,5 @@
-
+
-
+
@@ -211,19 +211,17 @@ export default {
if (!this.mobileMultiSelect && this.$isMobile()) {
- // Open in mobile version on first click
- if (this.$isMobile() && this.isFolder) {
- // Go to folder
+ if (this.isFolder) {
+
if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [{ folder: this.item, back: false, init: false }])
} else {
this.$store.dispatch('getFolder', [{ folder: this.item, back: false, init: false }])
}
- }
+ } else {
- if (this.$isMobile()) {
if (this.isImage || this.isVideo || this.isAudio || this.isPdf) {
- this.$store.commit('GET_FILEINFO_DETAIL', this.item)
+ this.$store.commit('LOAD_FILEINFO_DETAIL', this.item)
events.$emit('file-preview:show')
}
}
diff --git a/resources/js/components/Others/Forms/SelectInput.vue b/resources/js/components/Others/Forms/SelectInput.vue
index effe12f9..eb979d91 100644
--- a/resources/js/components/Others/Forms/SelectInput.vue
+++ b/resources/js/components/Others/Forms/SelectInput.vue
@@ -237,6 +237,14 @@
@media (prefers-color-scheme: dark) {
+ .select-search {
+ background: $dark_mode_foreground;
+
+ .search-input {
+ background: $dark_mode_background;
+ }
+ }
+
.input-area {
background: $dark_mode_foreground;
border-color: $dark_mode_foreground;
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index f3b1f07a..4d8e3cfe 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -252,10 +252,11 @@ const mutations = {
state.fileInfoDetail.push(item)
},
GET_FILEINFO_DETAIL(state, item) {
- let checkData = state.data.find(el => el.id === item.id)
- if(state.fileInfoDetail.includes(checkData)) return
+ let selectedItem = state.data.find(el => el.id === item.id)
- state.fileInfoDetail.push(checkData ? checkData : state.currentFolder)
+ if(state.fileInfoDetail.includes(selectedItem)) return
+
+ state.fileInfoDetail.push(selectedItem ? selectedItem : state.currentFolder)
},
SELECT_ALL_FILES(state){
state.fileInfoDetail = state.data
diff --git a/tests/Feature/Admin/LanguageEditorTest.php b/tests/Feature/Admin/LanguageEditorTest.php
index 4730986a..2fb7ca75 100644
--- a/tests/Feature/Admin/LanguageEditorTest.php
+++ b/tests/Feature/Admin/LanguageEditorTest.php
@@ -12,7 +12,7 @@ use Tests\TestCase;
class LanguageEditorTest extends TestCase
{
- use DatabaseMigrations;
+ //use DatabaseMigrations;
protected $setup;
@@ -262,4 +262,16 @@ class LanguageEditorTest extends TestCase
'Hi, my name is John Doe'
);
}
+
+
+ /**
+ * @test
+ */
+ public function it_get_translated_string_from_t_helper_without_database_connection()
+ {
+ $this->assertEquals(
+ __t('actions.close'),
+ 'Close'
+ );
+ }
}