Skip to content

Commit cd952bb

Browse files
committed
remove bootbox
1 parent 95a5908 commit cd952bb

File tree

2 files changed

+59
-36
lines changed

2 files changed

+59
-36
lines changed

public/js/script.js

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $(document).ready(function () {
6565
});
6666

6767
actions.reverse().forEach(function (action) {
68-
$('#nav-buttons > ul').append(
68+
$('#nav-buttons > ul').prepend(
6969
$('<li>').addClass('nav-item').append(
7070
$('<a>').addClass('nav-link d-none').attr('data-action', action.name)
7171
.append($('<i>').addClass('fa fa-fw fa-' + action.icon))
@@ -135,10 +135,7 @@ $('#main').click(function (e) {
135135
});
136136

137137
$(document).on('click', '#add-folder', function () {
138-
bootbox.prompt(lang['message-name'], function (result) {
139-
if (result == null) return;
140-
createFolder(result);
141-
});
138+
dialog(lang['message-name'], '', createFolder);
142139
});
143140

144141
$(document).on('click', '#upload', function () {
@@ -297,8 +294,8 @@ function displayErrorResponse(jqXHR) {
297294
notify('<div style="max-height:50vh;overflow: scroll;">' + jqXHR.responseText + '</div>');
298295
}
299296

300-
function displaySuccessMessage(data){
301-
if(data == 'OK'){
297+
function displaySuccessMessage(data) {
298+
if (data == 'OK') {
302299
var success = $('<div>').addClass('alert alert-success')
303300
.append($('<i>').addClass('fa fa-check'))
304301
.append(' File Uploaded Successfully.');
@@ -326,7 +323,6 @@ function loadFolders() {
326323
performLfmRequest('folders', {}, 'html')
327324
.done(function (data) {
328325
$('#tree').html(data);
329-
$('#tree2').html(data);
330326
loadItems();
331327
});
332328
}
@@ -392,25 +388,18 @@ function createFolder(folder_name) {
392388
// ==================================
393389

394390
function rename(item) {
395-
bootbox.prompt({
396-
title: lang['message-rename'],
397-
value: item.name,
398-
callback: function (result) {
399-
if (result == null) return;
400-
performLfmRequest('rename', {
401-
file: item.name,
402-
new_name: result
403-
}).done(refreshFoldersAndItems);
404-
}
391+
dialog(lang['message-rename'], item.name, function (new_name) {
392+
performLfmRequest('rename', {
393+
file: item.name,
394+
new_name: new_name
395+
}).done(refreshFoldersAndItems);
405396
});
406397
}
407398

408399
function trash(item) {
409-
bootbox.confirm(lang['message-delete'], function (result) {
410-
if (result == true) {
411-
performLfmRequest('delete', {items: item.name})
412-
.done(refreshFoldersAndItems);
413-
}
400+
notify(lang['message-delete'], function () {
401+
performLfmRequest('delete', {items: item.name})
402+
.done(refreshFoldersAndItems)
414403
});
415404
}
416405

@@ -431,15 +420,11 @@ function download(item) {
431420
}
432421

433422
function preview(item) {
434-
bootbox.dialog({
435-
title: lang['title-view'],
436-
message: $('<img>')
437-
.addClass('img img-responsive center-block')
438-
.attr('src', item.path + '?timestamp=' + item.time),
439-
size: 'large',
440-
onEscape: true,
441-
backdrop: true
442-
});
423+
notify(
424+
$('<img>')
425+
.addClass('w-100')
426+
.attr('src', item.path + '?timestamp=' + item.time)
427+
);
443428
}
444429

445430
function move(item) {
@@ -542,6 +527,16 @@ function notImp() {
542527
notify('Not yet implemented!');
543528
}
544529

545-
function notify(message) {
546-
bootbox.alert(message);
530+
function notify(body, callback) {
531+
$('#notify').find('.btn-primary').toggle(callback !== undefined);
532+
$('#notify').find('.btn-primary').click(callback);
533+
$('#notify').modal('show').find('.modal-body').html(body);
534+
}
535+
536+
function dialog(title, value, callback) {
537+
$('#dialog').find('input').val(value);
538+
$('#dialog').find('.btn-primary').click(function () {
539+
callback($('#dialog').find('input').val());
540+
});
541+
$('#dialog').modal('show').find('.modal-title').text(title);
547542
}

src/views/index.blade.php

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,36 @@
118118
</form>
119119
</div>
120120
<div class="modal-footer">
121-
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('laravel-filemanager::lfm.btn-close') }}</button>
121+
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ trans('laravel-filemanager::lfm.btn-close') }}</button>
122+
</div>
123+
</div>
124+
</div>
125+
</div>
126+
127+
<div class="modal fade" id="notify" tabindex="-1" role="dialog" aria-hidden="true">
128+
<div class="modal-dialog modal-lg">
129+
<div class="modal-content">
130+
<div class="modal-body"></div>
131+
<div class="modal-footer">
132+
<button type="button" class="btn btn-secondary w-100" data-dismiss="modal">Close</button>
133+
<button type="button" class="btn btn-primary w-100" data-dismiss="modal">OK</button>
134+
</div>
135+
</div>
136+
</div>
137+
</div>
138+
139+
<div class="modal fade" id="dialog" tabindex="-1" role="dialog" aria-hidden="true">
140+
<div class="modal-dialog modal-lg">
141+
<div class="modal-content">
142+
<div class="modal-header">
143+
<h4 class="modal-title"></h4>
144+
</div>
145+
<div class="modal-body">
146+
<input type="text" class="form-control">
147+
</div>
148+
<div class="modal-footer">
149+
<button type="button" class="btn btn-secondary w-100" data-dismiss="modal">Close</button>
150+
<button type="button" class="btn btn-primary w-100" data-dismiss="modal">OK</button>
122151
</div>
123152
</div>
124153
</div>
@@ -131,7 +160,6 @@
131160
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
132161
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"></script>
133162
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js"></script>
134-
<script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script>
135163
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
136164
<script src="{{ asset('vendor/laravel-filemanager/js/cropper.min.js') }}"></script>
137165
<script src="{{ asset('vendor/laravel-filemanager/js/jquery.form.min.js') }}"></script>

0 commit comments

Comments
 (0)