Skip to content

Commit d350498

Browse files
streamtwstreamtw
committed
fix ajax function with type, fix filename with new format
1 parent 5c0775d commit d350498

File tree

5 files changed

+37
-43
lines changed

5 files changed

+37
-43
lines changed

‎src/views/files-list.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<tr>
1515
<td>
1616
<i class="fa fa-folder-o"></i>
17-
<a id="large_folder_{{ $key }}" data-id="{{ $dir_name }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)">
18-
{{ $dir_name }}
17+
<a class="folder-item pointer" data-id="{{ $dir_name['long'] }}">
18+
{{ $dir_name['short'] }}
1919
</a>
2020
</td>
2121
<td></td>

‎src/views/files.blade.php‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55

66
@foreach($directories as $key => $dir_name)
77
<div class="col-sm-6 col-md-2">
8-
<div class="thumbnail text-center" data-id="{{ $dir_name }}">
9-
<a id="folder_{{ $key }}" data-id="{{ $dir_name }}" onclick="clickFolder('folder_{{ $key }}',0)" class="folder-icon pointer">
8+
<div class="thumbnail text-center" data-id="{{ $dir_name['long'] }}">
9+
<a data-id="{{ $dir_name['long'] }}" class="folder-icon pointer folder-item">
1010
<img src="/vendor/laravel-filemanager/img/folder.jpg">
1111
</a>
1212
</div>
1313
<div class="caption text-center">
1414
<div class="btn-group">
15-
<button type="button" onclick="clickFolder('folder_{{ $key }}',0)" class="btn btn-default btn-xs">
16-
{{ str_limit($dir_name, $limit = 10, $end = '...') }}
15+
<button type="button" data-id="{{ $dir_name['long'] }}" class="btn btn-default btn-xs folder-item">
16+
{{ str_limit($dir_name['short'], $limit = 10, $end = '...') }}
1717
</button>
1818
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
1919
<span class="caret"></span>
2020
<span class="sr-only">Toggle Dropdown</span>
2121
</button>
2222
<ul class="dropdown-menu" role="menu">
23-
<li><a href="javascript:rename('{{ $dir_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
24-
<li><a href="javascript:trash('{{ $dir_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
23+
<li><a href="javascript:rename('{{ $dir_name['short'] }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
24+
<li><a href="javascript:trash('{{ $dir_name['short'] }}')"><i class="fa fa-trash fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
2525
</ul>
2626
</div>
2727

@@ -49,15 +49,10 @@
4949
<span class="sr-only">Toggle Dropdown</span>
5050
</button>
5151
<ul class="dropdown-menu" role="menu">
52-
<li><a href="javascript:rename('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
53-
<li><a href="javascript:fileView('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
54-
<li><a href="javascript:download('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
52+
<li><a href="javascript:rename('{{ $file_name }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
53+
<li><a href="javascript:download('{{ $file_name }}')"><i class="fa fa-download fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
5554
<li class="divider"></li>
56-
{{--<li><a href="javascript:notImp()">Rotate</a></li>--}}
57-
<li><a href="javascript:resizeImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
58-
<li><a href="javascript:cropImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
59-
<li class="divider"></li>
60-
<li><a href="javascript:trash('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
55+
<li><a href="javascript:trash('{{ $file_name }}')"><i class="fa fa-trash fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
6156
</ul>
6257
</div>
6358
</div>

‎src/views/images-list.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<tr>
1515
<td>
1616
<i class="fa fa-folder-o"></i>
17-
<a id="large_folder_{{ $key }}" data-id="{{ $dir_name }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)">
18-
{{ $dir_name }}
17+
<a class="folder-item pointer" data-id="{{ $dir_name['long'] }}">
18+
{{ $dir_name['short'] }}
1919
</a>
2020
</td>
2121
<td></td>

‎src/views/images.blade.php‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,24 @@
44
@if((sizeof($files) > 0) || (sizeof($directories) > 0))
55

66
@foreach($directories as $key => $dir_name)
7-
<?php $long_name = $dir_name['long'];?>
87
<div class="col-sm-6 col-md-2">
98
<div class="thumbnail text-center" data-id="{{ $dir_name['long'] }}">
10-
<a data-id="{{ $dir_name['long'] }}" onclick="clickFolder('{{ $long_name }}')" class="folder-icon pointer">
11-
{{--<i class="fa fa-folder-o fa-5x"></i>--}}
9+
<a data-id="{{ $dir_name['long'] }}" class="folder-icon pointer folder-item">
1210
<img src="/vendor/laravel-filemanager/img/folder.jpg">
1311
</a>
1412
</div>
1513
<div class="caption text-center">
1614
<div class="btn-group">
17-
<button type="button" onclick="clickFolder('{{ $long_name }}')" class="btn btn-default btn-xs">
15+
<button type="button" data-id="{{ $dir_name['long'] }}" class="btn btn-default btn-xs folder-item">
1816
{{ str_limit($dir_name['short'], $limit = 10, $end = '...') }}
1917
</button>
2018
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
2119
<span class="caret"></span>
2220
<span class="sr-only">Toggle Dropdown</span>
2321
</button>
2422
<ul class="dropdown-menu" role="menu">
25-
<li><a href="javascript:rename('{{ $dir_name['short'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
26-
<li><a href="javascript:trash('{{ $dir_name['short'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
23+
<li><a href="javascript:rename('{{ $dir_name['short'] }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
24+
<li><a href="javascript:trash('{{ $dir_name['short'] }}')"><i class="fa fa-trash fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
2725
</ul>
2826
</div>
2927

@@ -52,15 +50,15 @@
5250
<span class="sr-only">Toggle Dropdown</span>
5351
</button>
5452
<ul class="dropdown-menu" role="menu">
55-
<li><a href="javascript:rename('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
56-
<li><a href="javascript:fileView('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
57-
<li><a href="javascript:download('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
53+
<li><a href="javascript:rename('{{ $file_name }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
54+
<li><a href="javascript:fileView('{{ $file_name }}')"><i class="fa fa-image fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
55+
<li><a href="javascript:download('{{ $file_name }}')"><i class="fa fa-download fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
5856
<li class="divider"></li>
5957
{{--<li><a href="javascript:notImp()">Rotate</a></li>--}}
60-
<li><a href="javascript:resizeImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
61-
<li><a href="javascript:cropImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
58+
<li><a href="javascript:resizeImage('{{ $file_name }}')"><i class="fa fa-arrows fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
59+
<li><a href="javascript:cropImage('{{ $file_name }}')"><i class="fa fa-crop fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
6260
<li class="divider"></li>
63-
<li><a href="javascript:trash('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
61+
<li><a href="javascript:trash('{{ $file_name }}')"><i class="fa fa-trash fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
6462
</ul>
6563
</div>
6664
</div>

‎src/views/index.blade.php‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
</div>
114114
<input type='hidden' name='working_dir' id='working_dir' value='{{$working_dir}}'>
115115
<input type='hidden' name='show_list' id='show_list' value='0'>
116-
<input type='hidden' name='type' value='{{$file_type}}'>
116+
<input type='hidden' name='type' id='type' value='{{$file_type}}'>
117117
<input type='hidden' name='_token' value='{{csrf_token()}}'>
118118
</form>
119119
</div>
@@ -262,7 +262,8 @@ function loadFolders() {
262262
url: '/laravel-filemanager/folders',
263263
data: {
264264
working_dir: $('#working_dir').val(),
265-
show_list: $('#show_list').val()
265+
show_list: $('#show_list').val(),
266+
type: $('#type').val()
266267
},
267268
cache: false
268269
}).done(function (data) {
@@ -271,22 +272,17 @@ function loadFolders() {
271272
}
272273
273274
function loadItems() {
274-
var type = 'Images';
275275
var working_dir = $('#working_dir').val();
276276
console.log('Current working_dir : ' + working_dir);
277277
278-
@if ('Files' === $file_type)
279-
type = 'Files';
280-
@endif
281-
282278
$.ajax({
283279
type: 'GET',
284280
dataType: 'html',
285281
url: '/laravel-filemanager/jsonitems',
286282
data: {
287283
working_dir: working_dir,
288284
show_list: $('#show_list').val(),
289-
type: type
285+
type: $('#type').val()
290286
},
291287
cache: false
292288
}).done(function (data) {
@@ -304,7 +300,8 @@ function createFolder(folder_name) {
304300
url: '/laravel-filemanager/newfolder',
305301
data: {
306302
name: folder_name,
307-
working_dir: $('#working_dir').val()
303+
working_dir: $('#working_dir').val(),
304+
type: $('#type').val()
308305
},
309306
cache: false
310307
}).done(function (data) {
@@ -331,7 +328,8 @@ function rename(item_name) {
331328
data: {
332329
file: item_name,
333330
working_dir: $('#working_dir').val(),
334-
new_name: result
331+
new_name: result,
332+
type: $('#type').val()
335333
},
336334
cache: false
337335
}).done(function (data) {
@@ -356,7 +354,8 @@ function trash(item_name) {
356354
url: '/laravel-filemanager/delete',
357355
data: {
358356
working_dir: $('#working_dir').val(),
359-
items: item_name
357+
items: item_name,
358+
type: $('#type').val()
360359
},
361360
cache: false
362361
}).done(function (data) {
@@ -380,7 +379,8 @@ function cropImage(image_name) {
380379
url: '/laravel-filemanager/crop',
381380
data: {
382381
img: image_name,
383-
working_dir: $('#working_dir').val()
382+
working_dir: $('#working_dir').val(),
383+
type: $('#type').val()
384384
},
385385
cache: false
386386
}).done(function (data) {
@@ -396,7 +396,8 @@ function resizeImage(image_name) {
396396
url: '/laravel-filemanager/resize',
397397
data: {
398398
img: image_name,
399-
working_dir: $('#working_dir').val()
399+
working_dir: $('#working_dir').val(),
400+
type: $('#type').val()
400401
},
401402
cache: false
402403
}).done(function (data) {

0 commit comments

Comments
 (0)