remove full page loader

Author: streamtw

public/js/script.js

@@ -167,7 +167,7 @@ $(document).on('click', '#content a', function (e) {
     toggleActions();
   } else {
     if (element.is_file) {
-      useFile(getOneSelectedElement().url);
+      use(getOneSelectedElement().url);
     } else {
       goTo(getOneSelectedElement().url);
     }
@@ -289,8 +289,7 @@ function loadFolders() {
 }
 
 function loadItems() {
-  $('#loading').removeClass('d-none');
-  $('#lfm-loader').show();
+  loading(true);
   performLfmRequest('jsonitems', {show_list: show_list, sort_type: sort_type}, 'html')
     .done(function (data) {
       selected = [];
@@ -325,20 +324,20 @@ function loadItems() {
       }
       $('#nav-buttons > ul').removeClass('d-none');
       $('#working_dir').val(response.working_dir);
-      $('#current_dir').text(response.working_dir);
       console.log('Current working_dir : ' + $('#working_dir').val());
       var atRootFolder = getPreviousDir() == '';
       $('#to-previous').toggleClass('d-none invisible-lg', atRootFolder);
       $('#show_tree').toggleClass('d-none', !atRootFolder).toggleClass('d-block', atRootFolder);
       setOpenFolders();
-      $('#loading').addClass('d-none');
+      loading(false);
       toggleActions();
-    })
-    .always(function(){
-      $('#lfm-loader').hide();
     });
 }
 
+function loading(show_loading) {
+  $('#loading').toggleClass('d-none', !show_loading);
+}
+
 function createFolder(folder_name) {
   performLfmRequest('newfolder', {name: folder_name})
     .done(refreshFoldersAndItems);
@@ -361,8 +360,7 @@ function trash(items) {
   notify(lang['message-delete'], function () {
     performLfmRequest('delete', {
       items: items.map(function (item) { return item.name; })
-    })
-      .done(refreshFoldersAndItems)
+    }).done(refreshFoldersAndItems)
   });
 }
 

src/views/index.blade.php

@@ -33,8 +33,8 @@
     <a class="navbar-brand d-block d-lg-none" id="show_tree">
       <i class="fas fa-bars fa-fw"></i>
     </a>
-    <a class="navbar-brand">{{ trans('laravel-filemanager::lfm.title-panel') }}</a>
-    <a id="loading" class="nav-brand"><i class="fas fa-spinner fa-spin"></i></a>
+    <a class="navbar-brand">Home</a>
+    <a id="loading" class="navbar-brand"><i class="fas fa-spinner fa-spin"></i></a>
     <a class="navbar-toggler collapsed border-0 px-1 py-2 m-0 ml-auto" data-toggle="collapse" data-target="#nav-buttons">
       <i class="fas fa-cog fa-fw"></i>
     </a>
@@ -77,8 +77,6 @@
     <div id="tree"></div>
 
     <div id="main">
-      {{-- <div class="visible-xs" id="current_dir" style="padding: 5px 15px;background-color: #f8f8f8;color: #5e5e5e;"></div> --}}
-
       <div id="alerts"></div>
 
       <div id="empty" class="d-none">
@@ -177,10 +175,6 @@
     </a>
   </div>
 
-  {{-- <div id="lfm-loader">
-    <img src="{{asset('vendor/laravel-filemanager/img/loader.svg')}}">
-  </div> --}}
-
   <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"></script>