v1.5-alpha.9

resources/js/components/FilesView/DesktopToolbar.vue

@@ -37,7 +37,7 @@
                             :action="$t('actions.create_folder')"
                     />
                 </div>
-                
+
                 <div class="toolbar-button-wrapper"
                      v-if="$checkPermission(['master', 'editor'])">
                     <ToolbarButton
@@ -286,6 +286,14 @@
         .button {
             margin-left: 5px;
 
+            &.active {
+                /deep/ svg {
+                    line, circle {
+                        stroke: $theme;
+                    }
+                }
+            }
+
             &.is-inactive {
                 opacity: 0.25;
                 pointer-events: none;

resources/js/components/FilesView/EmptyMessage.vue

@@ -35,7 +35,7 @@
             p {
                 margin-top: 10px;
                 max-width: 130px;
-                @include font-size(14);
+                @include font-size(13);
                 font-weight: 500;
                 color: $text-muted;
             }

resources/js/components/FilesView/FileBrowser.vue

@@ -225,7 +225,6 @@
     }
 
     .file-content {
-        height: 100%;
         display: flex;
         flex-wrap: nowrap;
 

resources/js/i18n/lang/en.json

@@ -191,7 +191,7 @@
         "confirm": "Confirm"
     },
     "shared": {
-        "empty_shared": "You Haven't Shared Anything Yet",
+        "empty_shared": "You haven't shared anything yet.",
         "editor": "Can edit and upload files",
         "visitor": "Can only view and download",
         "can_download": "Can download file"

resources/js/store/modules/fileBrowser.js

@@ -250,9 +250,9 @@ const mutations = {
         state.fileInfoDetail = item
     },
     GET_FILEINFO_DETAIL(state, item) {
-        state.fileInfoDetail = state.data.find(
-            el => el.unique_id == item.unique_id
-        )
+        let checkData = state.data.find(el => el.unique_id == item.unique_id)
+
+        state.fileInfoDetail = checkData ? checkData : state.currentFolder
     },
     CHANGE_SEARCHING_STATE(state, searchState) {
         state.isSearching = searchState

resources/js/store/modules/fileFunctions.js

@@ -160,14 +160,19 @@ const actions = {
             .then(() => {
 
                 // If is folder, update app data
-                if (data.type === 'folder' && data.unique_id === getters.currentFolder.unique_id) {
+                if (data.type === 'folder') {
 
-                    if ( getters.currentFolder.location === 'public' ) {
-                        dispatch('browseShared', [{folder: last(getters.browseHistory), back: true, init: false}])
-                    } else {
-                        dispatch('getFolder', [{folder: last(getters.browseHistory), back: true, init: false}])
-                        dispatch('getAppData')
+                    if (data.unique_id === getters.currentFolder.unique_id) {
+
+                        if ( getters.currentFolder.location === 'public' ) {
+                            dispatch('browseShared', [{folder: last(getters.browseHistory), back: true, init: false}])
+                        } else {
+                            dispatch('getFolder', [{folder: last(getters.browseHistory), back: true, init: false}])
+                        }
                     }
+
+                    if ( getters.currentFolder.location !== 'public' )
+                        dispatch('getAppData')
                 }
             })
             .catch(() => isSomethingWrong())

resources/js/views/FilePages/Files.vue

@@ -166,6 +166,20 @@
         overflow-x: auto;
     }
 
+    @media only screen and (max-width: 1024px) {
+
+        .empty-note {
+
+            &.navigator {
+                padding: 5px 20px 10px;
+            }
+
+            &.favourites {
+                padding: 5px 18px 10px;
+            }
+        }
+    }
+
     // Transition
     .folder-item-move {
         transition: transform 300s ease;