Skip to content

Commit e7473c9

Browse files
committed
Merge branch 'redzwanlatif-hell'
2 parents 0d21e23 + 9e77874 commit e7473c9

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

public/js/script.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,17 @@ $(document).on('click', '[data-display]', function() {
145145
loadItems();
146146
});
147147

148+
$(document).on('click', '#keyword-button', function() {
149+
show_list = $(this).data('display');
150+
loadItems();
151+
});
152+
153+
$(document).on('click', '#keyword-reset-button', function() {
154+
$('#keyword').val("");
155+
show_list = $(this).data('display');
156+
loadItems();
157+
});
158+
148159
$(document).on('click', '[data-action]', function() {
149160
window[$(this).data('action')]($(this).data('multiple') ? getSelectedItems() : getOneSelectedElement());
150161
});
@@ -425,6 +436,7 @@ function createPagination(paginationSetting) {
425436

426437
function loadItems(page) {
427438
loading(true);
439+
var keyword = $('#keyword').val();
428440
performLfmRequest('jsonitems', {show_list: show_list, sort_type: sort_type, page: page || 1}, 'html')
429441
.done(function (data) {
430442
selected = [];
@@ -796,7 +808,8 @@ function usingWysiwygEditor() {
796808
function defaultParameters() {
797809
return {
798810
working_dir: $('#working_dir').val(),
799-
type: $('#type').val()
811+
type: $('#type').val(),
812+
keyword: $('#keyword').val(),
800813
};
801814
}
802815

resources/views/index.blade.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@
8686
</ol>
8787
</nav>
8888

89+
<div style="margin-bottom: 16px;">
90+
<input type="text" name="keyword" id="keyword" placeholder="keyword">
91+
<button type="button" id="keyword-button" >Search</button>
92+
<button type="button" id="keyword-reset-button" >Reset</button>
93+
</div>
94+
8995
<div id="empty" class="d-none">
9096
<i class="far fa-folder-open"></i>
9197
{{ trans('laravel-filemanager::lfm.message-empty') }}

src/Controllers/ItemsController.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ public function getItems()
2222
$perPage = $this->helper->getPaginationPerPage();
2323
$items = array_merge($this->lfm->folders(), $this->lfm->files());
2424

25+
$keyword = request()->get('keyword', "");
26+
if (!empty($keyword)) {
27+
$items = array_filter($items, function ($item) use ($keyword) {
28+
return str_contains($item->name, $keyword);
29+
});
30+
}
31+
2532
return [
2633
'items' => array_map(function ($item) {
2734
return $item->fill()->attributes;

0 commit comments

Comments
 (0)