remove all url composing functionality from script.blade.php

Author: streamtw

src/controllers/ItemsController.php

@@ -30,6 +30,7 @@ private function getFilesWithInfo($path)
 
         foreach (File::files($path) as $key => $file) {
             $file_name = parent::getName($file);
+            $file_url = parent::getFileUrl($file_name);
             $file_created = filemtime($file);
             $file_size = $this->humanFilesize(File::size($file));
 
@@ -60,6 +61,7 @@ private function getFilesWithInfo($path)
 
             $arr_files[$key] = [
                 'name'      => $file_name,
+                'url'       => $file_url,
                 'size'      => $file_size,
                 'created'   => $file_created,
                 'type'      => $file_type,

src/views/item.blade.php

@@ -2,9 +2,9 @@
 <?php $thumb_src = $file['thumb'];?>
 
 <div class="thumbnail clickable" onclick="useFile('{{ $file_name }}')">
-  <div class="square">
+  <div class="square" id="{{ $file_name }}" data-url="{{ $file['url'] }}">
     @if($thumb_src)
-    <img id="{{ $file_name }}" src="{{ $thumb_src }}">
+    <img src="{{ $thumb_src }}">
     @else
     <div class="icon-container">
       <i class="fa {{ $file['icon'] }} fa-5x"></i>
@@ -26,7 +26,7 @@
       <li><a href="javascript:rename('{{ $file_name }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
       <li><a href="javascript:download('{{ $file_name }}')"><i class="fa fa-download fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
       <li class="divider"></li>
-      @if($type == 'Images')
+      @if($thumb_src)
       <li><a href="javascript:fileView('{{ $file_name }}')"><i class="fa fa-image fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
       <li><a href="javascript:resizeImage('{{ $file_name }}')"><i class="fa fa-arrows fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
       <li><a href="javascript:cropImage('{{ $file_name }}')"><i class="fa fa-crop fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>

src/views/list-view.blade.php

@@ -8,12 +8,12 @@
     <th>{{ Lang::get('laravel-filemanager::lfm.title-action') }}</th>
   </thead>
   <tbody>
-    @foreach($directories as $key => $dir_name)
+    @foreach($directories as $key => $directory)
     <tr>
       <td>
         <i class="fa fa-folder-o"></i>
-        <a class="folder-item clickable" data-id="{{ $dir_name['long'] }}">
-          {{ $dir_name['short'] }}
+        <a class="folder-item clickable" data-id="{{ $directory->path }}">
+          {{ $directory->name }}
         </a>
       </td>
       <td></td>
@@ -26,13 +26,9 @@
     @foreach($files as $file)
     <tr>
       <td>
-        @if($type == 'Images')
-        <i class="fa fa-image"></i>
-        @else
         <i class="fa {{ $file['icon'] }}"></i>
-        @endif
         <?php $file_name = $file['name'];?>
-        <a href="javascript:useFile('{{ $file_name }}')">
+        <a href="javascript:useFile('{{ $file_name }}')" id="{{ $file_name }}" data-url="{{ $file['url'] }}">
           {{ $file_name }}
         </a>
         &nbsp;&nbsp;
@@ -53,7 +49,7 @@
         <a href="javascript:trash('{{ $file_name }}')">
           <i class="fa fa-trash fa-fw"></i>
         </a>
-        @if($type == 'Images')
+        @if($file['thumb'])
         <a href="javascript:cropImage('{{ $file_name }}')">
           <i class="fa fa-crop fa-fw"></i>
         </a>