Skip to content

Commit e171996

Browse files
committed
hide multiple selection toggle when integrating with WYSIWYG editors
1 parent a217da0 commit e171996

File tree

3 files changed

+36
-21
lines changed

3 files changed

+36
-21
lines changed

public/css/lfm.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ a {
3838
border-left: 1px solid #dee2e6;
3939
}
4040

41+
#multi_selection_toggle > i.fa-check-double {
42+
font-size: 20px;
43+
}
44+
45+
#multi_selection_toggle > i.fa-times {
46+
font-size: 24px;
47+
}
48+
4149
#main {
4250
width: 100%;
4351
}

public/js/script.js

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $.fn.fab = function (options) {
1313
.append($('<i>').addClass('fas fa-plus'))
1414
.click(function () {
1515
menu.toggleClass('fab-expand');
16-
})
16+
});
1717

1818
menu.append(toggler);
1919

@@ -49,6 +49,8 @@ function toggleSelected (e) {
4949
function clearSelected () {
5050
selected = [];
5151

52+
multi_selection_enabled = false;
53+
5254
updateSelectedStyle();
5355
}
5456

@@ -111,6 +113,10 @@ $(document).ready(function () {
111113
$(window).on('dragenter', function(){
112114
$('#uploadModal').modal('show');
113115
});
116+
117+
if (usingWysiwygEditor()) {
118+
$('#multi_selection_toggle').hide();
119+
}
114120
});
115121

116122
// ======================
@@ -121,7 +127,7 @@ $('#multi_selection_toggle').click(function () {
121127
multi_selection_enabled = !multi_selection_enabled;
122128

123129
$('#multi_selection_toggle i')
124-
.toggleClass('fa-ban', multi_selection_enabled)
130+
.toggleClass('fa-times', multi_selection_enabled)
125131
.toggleClass('fa-check-double', !multi_selection_enabled);
126132

127133
if (!multi_selection_enabled) {
@@ -214,16 +220,17 @@ function toggleActions() {
214220
.filter(function (item) { return !item.is_file; })
215221
.length === 0;
216222

217-
$('[data-action=use]').toggleClass('d-none', !(many_selected && only_file))
218-
$('[data-action=rename]').toggleClass('d-none', !one_selected)
219-
$('[data-action=preview]').toggleClass('d-none', !(many_selected && only_file))
220-
$('[data-action=move]').toggleClass('d-none', !many_selected)
221-
$('[data-action=download]').toggleClass('d-none', !(many_selected && only_file))
222-
$('[data-action=resize]').toggleClass('d-none', !(one_selected && only_image))
223-
$('[data-action=crop]').toggleClass('d-none', !(one_selected && only_image))
224-
$('[data-action=trash]').toggleClass('d-none', !many_selected)
225-
$('#actions').toggleClass('d-none', selected.length === 0)
226-
$('#fab').toggleClass('d-none', selected.length !== 0)
223+
$('[data-action=use]').toggleClass('d-none', !(many_selected && only_file));
224+
$('[data-action=rename]').toggleClass('d-none', !one_selected);
225+
$('[data-action=preview]').toggleClass('d-none', !(many_selected && only_file));
226+
$('[data-action=move]').toggleClass('d-none', !many_selected);
227+
$('[data-action=download]').toggleClass('d-none', !(many_selected && only_file));
228+
$('[data-action=resize]').toggleClass('d-none', !(one_selected && only_image));
229+
$('[data-action=crop]').toggleClass('d-none', !(one_selected && only_image));
230+
$('[data-action=trash]').toggleClass('d-none', !many_selected);
231+
$('#multi_selection_toggle').toggleClass('d-none', usingWysiwygEditor() || !many_selected);
232+
$('#actions').toggleClass('d-none', selected.length === 0);
233+
$('#fab').toggleClass('d-none', selected.length !== 0);
227234
}
228235

229236
$(document).on('click', '#tree a', function (e) {

src/views/index.blade.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
</a>
3636
<a class="navbar-brand d-block d-lg-none">{{ trans('laravel-filemanager::lfm.nav-home') }}</a>
3737
<a id="loading" class="navbar-brand"><i class="fas fa-spinner fa-spin"></i></a>
38-
<a class="navbar-toggler collapsed border-0 px-1 py-2 m-0 ml-auto" data-toggle="collapse" data-target="#nav-buttons">
38+
<div class="ml-auto px-2">
39+
<a class="navbar-link d-none" id="multi_selection_toggle">
40+
<i class="fa fa-check-double fa-fw"></i>
41+
<span class="d-none d-lg-inline">{{ trans('laravel-filemanager::lfm.menu-multiple') }}</span>
42+
</a>
43+
</div>
44+
<a class="navbar-toggler collapsed border-0 px-1 py-2 m-0" data-toggle="collapse" data-target="#nav-buttons">
3945
<i class="fas fa-cog fa-fw"></i>
4046
</a>
41-
<div class="collapse navbar-collapse" id="nav-buttons">
42-
<ul class="navbar-nav ml-auto">
43-
<li class="nav-item">
44-
<a class="nav-link" id="multi_selection_toggle">
45-
<i class="fa fa-check-double fa-fw"></i>
46-
<span>{{ trans('laravel-filemanager::lfm.menu-multiple') }}</span>
47-
</a>
48-
</li>
47+
<div class="collapse navbar-collapse flex-grow-0" id="nav-buttons">
48+
<ul class="navbar-nav">
4949
<li class="nav-item">
5050
<a class="nav-link" data-display="grid">
5151
<i class="fas fa-th-large fa-fw"></i>

0 commit comments

Comments
 (0)