Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 1dac356

Browse files
ctf0ctf0
committed
v1.3.4
1 parent b48efa2 commit 1dac356

File tree

7 files changed

+118
-112
lines changed

7 files changed

+118
-112
lines changed

‎logs/v1.3.3.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎logs/v1.3.4.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- fix pressing enter not working correctly because “selectedFile” is not cleared after last dir
2+
- more optimization for keyboard events so now it fires only when needed.
3+
- you can now use “left/right/home/end” when image lightBox is active

‎src/resources/assets/js/components/media-bulma.vue

Lines changed: 102 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,44 @@ export default {
8585
}
8686
},
8787
methods: {
88+
navigation(e, curSelectedIndex) {
89+
e.preventDefault()
90+
91+
let cur = ''
92+
let newSelected = ''
93+
94+
// go to prev image
95+
if ((keycode(e) == 'left' || keycode(e) == 'up') && curSelectedIndex !== 0) {
96+
newSelected = curSelectedIndex - 1
97+
cur = $('div[data-index="' + newSelected + '"]')
98+
this.scrollToFile(cur)
99+
}
100+
101+
// go to next image
102+
if ((keycode(e) == 'right' || keycode(e) == 'down') && curSelectedIndex < this.allItemsCount - 1) {
103+
newSelected = curSelectedIndex + 1
104+
cur = $('div[data-index="' + newSelected + '"]')
105+
this.scrollToFile(cur)
106+
}
107+
108+
// go to last item
109+
if (keycode(e) == 'end') {
110+
newSelected = this.allItemsCount - 1
111+
cur = $('div[data-index="' + newSelected + '"]')
112+
this.scrollToFile(cur)
113+
}
114+
115+
// go to first item
116+
if (keycode(e) == 'home') {
117+
this.scrollToFile()
118+
}
119+
120+
if (!this.selectedFileIs('image')) {
121+
this.noScroll()
122+
}
123+
},
124+
125+
// init
88126
initManager() {
89127
let manager = this
90128
@@ -129,78 +167,42 @@ export default {
129167
130168
let curSelected = $('#files li .selected')
131169
let curSelectedIndex = parseInt(curSelected.data('index'))
170+
let newSelected = ''
132171
133172
// when modal isnt visible
134173
if (!$('.modal').hasClass('is-active')) {
135174
// when search is not focused
136175
if (!$('.input').is(':focus')) {
137-
// lightbox is not active
138-
if (!this.lightBoxIsActive()) {
139-
// when no bulk selecting
140-
if (!this.isBulkSelecting()) {
141-
142-
let cur = ''
143-
let newSelected = ''
144-
let index = ''
145-
146-
if ((keycode(e) == 'left' || keycode(e) == 'up') && curSelectedIndex !== 0) {
147-
e.preventDefault()
148-
149-
newSelected = curSelectedIndex - 1
150-
cur = $('div[data-index="' + newSelected + '"]')
151-
this.scrollToFile(cur)
152-
}
153-
154-
if ((keycode(e) == 'right' || keycode(e) == 'down') && curSelectedIndex < this.allItemsCount - 1) {
155-
e.preventDefault()
156-
157-
newSelected = curSelectedIndex + 1
158-
cur = $('div[data-index="' + newSelected + '"]')
159-
this.scrollToFile(cur)
160-
}
176+
// when no bulk selecting
177+
if (!this.isBulkSelecting()) {
161178
162-
// open folder
163-
if (keycode(e) == 'enter') {
164-
this.openFolder(this.selectedFile)
165-
}
166-
167-
// go up a dir
168-
if (keycode(e) == 'backspace') {
169-
index = parseInt(this.folders.length) - 1
179+
// open folder
180+
if (keycode(e) == 'enter' && this.selectedFile) {
181+
this.openFolder(this.selectedFile)
182+
}
170183
171-
if (index < 0) {
172-
return false
173-
}
184+
// go up a dir
185+
if (keycode(e) == 'backspace' && this.folders.length) {
186+
newSelected = parseInt(this.folders.length) - 1
174187
175-
this.goToFolder(index)
188+
if (newSelected < 0) {
189+
return false
176190
}
177191
178-
// go to first / last item
179-
if (this.allItemsCount) {
180-
if (keycode(e) == 'home') {
181-
e.preventDefault()
182-
183-
this.scrollToFile()
184-
}
185-
186-
if (keycode(e) == 'end') {
187-
e.preventDefault()
188-
189-
index = this.allItemsCount - 1
190-
cur = $('div[data-index="' + index + '"]')
191-
this.scrollToFile(cur)
192-
}
193-
}
192+
this.goToFolder(newSelected)
193+
}
194194
195-
// file upload
196-
if (keycode(e) == 'u') {
197-
$('#upload').trigger('click')
198-
}
195+
// when there are files
196+
if (this.allItemsCount) {
197+
this.navigation(e, curSelectedIndex)
199198
200-
// play-pause for media
201-
if (keycode(e) == 'space' && e.target == document.body) {
199+
if (
200+
keycode(e) == 'space' && e.target == document.body &&
201+
(this.selectedFileIs('video') || this.selectedFileIs('audio') || this.selectedFileIs('image'))
202+
) {
202203
e.preventDefault()
203204
205+
// play-pause media
204206
if (this.selectedFileIs('video') || this.selectedFileIs('audio')) {
205207
return $('.player')[0].paused
206208
? $('.player')[0].play()
@@ -213,44 +215,49 @@ export default {
213215
this.toggleModal('#img_modal')
214216
}
215217
}
216-
}
217-
/* end of no bulk selection */
218-
219-
// when there are files
220-
if (this.allItemsCount) {
221-
// bulk select
222-
if (keycode(e) == 'b') {
223-
$('#blk_slct').trigger('click')
224-
}
225-
226-
// add all to bulk list
227-
if (this.isBulkSelecting() && keycode(e) == 'a') {
228-
$('#blk_slct_all').trigger('click')
229-
}
230-
231-
// delete file
232-
if (keycode(e) == 'delete' || keycode(e) == 'd') {
233-
$('#delete').trigger('click')
234-
}
235218
236219
// refresh
237220
if (keycode(e) == 'r') {
238221
$('#refresh').trigger('click')
239222
}
223+
}
224+
// end of when there are files
240225
241-
// move file
242-
if (this.checkForFolders() && keycode(e) == 'm') {
243-
$('#move').trigger('click')
244-
}
226+
// file upload
227+
if (keycode(e) == 'u') {
228+
$('#upload').trigger('click')
229+
}
230+
}
231+
/* end of no bulk selection */
232+
233+
// with or without bulk selection
234+
if (this.allItemsCount) {
235+
// bulk select
236+
if (keycode(e) == 'b') {
237+
$('#blk_slct').trigger('click')
238+
}
239+
240+
// add all to bulk list
241+
if (this.isBulkSelecting() && keycode(e) == 'a') {
242+
$('#blk_slct_all').trigger('click')
245243
}
246-
/* end of there are files */
247244
248-
// toggle file details sidebar
249-
if (keycode(e) == 't') {
250-
$('.toggle').trigger('click')
245+
// delete file
246+
if (keycode(e) == 'delete' || keycode(e) == 'd') {
247+
$('#delete').trigger('click')
251248
}
249+
250+
// move file
251+
if (this.checkForFolders() && keycode(e) == 'm') {
252+
$('#move').trigger('click')
253+
}
254+
}
255+
/* end of with or without bulk selection */
256+
257+
// toggle file details sidebar
258+
if (keycode(e) == 't') {
259+
$('.toggle').trigger('click')
252260
}
253-
/* end of no lightbox is active */
254261
}
255262
/* end of search is not focused */
256263
}
@@ -263,11 +270,17 @@ export default {
263270
$('.modal.is-active').find('button[type="submit"]').trigger('click')
264271
}
265272
266-
if (this.lightBoxIsActive() && keycode(e) == 'space') {
267-
e.preventDefault()
268-
this.toggleModal()
273+
if (this.lightBoxIsActive()) {
274+
// hide lb
275+
if (keycode(e) == 'space') {
276+
e.preventDefault()
277+
this.toggleModal()
278+
}
279+
280+
this.navigation(e, curSelectedIndex)
269281
}
270282
283+
// hide lb
271284
if (keycode(e) == 'esc') {
272285
this.toggleModal()
273286
}

‎src/resources/assets/js/components/mixins/methods/utils.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ export default {
5353
return 'N/A'
5454
}
5555

56-
let k = 1000,
57-
dm = 2,
58-
sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
59-
i = Math.floor(Math.log(bytes) / Math.log(k))
56+
let k = 1000
57+
let dm = 2
58+
let sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
59+
let i = Math.floor(Math.log(bytes) / Math.log(k))
6060

6161
return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]
6262
},

‎src/resources/assets/js/components/mixins/watch.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export default {
22
watch: {
33
allFiles(val) {
44
if (val.length < 1) {
5+
this.resetInput('selectedFile')
56
return this.noFiles('show')
67
}
78

‎src/resources/assets/sass/shared/manager.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ $blue_2: #276cda;
1717
// toolbar
1818
#toolbar {
1919
flex-wrap: wrap;
20+
margin: 0;
2021
padding: 1rem;
2122
border: 1px solid $gray_2;
2223
border-bottom: 0;
23-
margin: 0;
2424
border-radius: 4px 4px 0 0;
2525
background: $white_gray;
2626
}
@@ -62,11 +62,11 @@ $blue_2: #276cda;
6262

6363
// breadcrump
6464
.breadcrumb-container {
65+
margin: 0 !important;
6566
padding: 0.5rem 1rem;
6667
border: 1px solid $gray_2;
6768
border-top: 0;
6869
background: $gray_3;
69-
margin: 0 !important;
7070

7171
.breadcrumb {
7272
margin-bottom: 0 !important;
@@ -369,7 +369,3 @@ $blue_2: #276cda;
369369
.m-l-50 {
370370
margin-left: 50px !important;
371371
}
372-
373-
.m-0 {
374-
margin: 0 !important;
375-
}

‎src/resources/views/media-bulma.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class="button"
220220
{{-- ====================================================================== --}}
221221

222222
{{-- upload --}}
223-
<div class="field m-0">
223+
<div class="field is-marginless">
224224
<div id="dz">
225225
<form class="dz" id="new-upload" action="{{ route('media.upload') }}">
226226
<div class="dz-message title is-4">
@@ -352,7 +352,7 @@ class="button"
352352
<img :src="selectedFile.path">
353353
</p>
354354
</div>
355-
<button class="modal-close is-large" aria-label="close" @click="toggleModal()"></button>
355+
<button class="modal-close is-large" @click="toggleModal()"></button>
356356
</div>
357357
<img :src="selectedFile.path"
358358
v-tippy="{position: 'right', arrow: true}"
@@ -424,7 +424,7 @@ class="button"
424424
<span class="icon"><i class="fa fa-folder"></i></span>
425425
<span>{{ trans('MediaManager::messages.add_new_folder') }}</span>
426426
</p>
427-
<button type="button" class="delete" aria-label="close" @click="toggleModal()"></button>
427+
<button type="button" class="delete" @click="toggleModal()"></button>
428428
</header>
429429
<section class="modal-card-body">
430430
<input class="input" type="text"
@@ -452,7 +452,7 @@ class="button"
452452
<span class="icon"><i class="fa fa-i-cursor"></i></span>
453453
<span>{{ trans('MediaManager::messages.rename_file_folder') }}</span>
454454
</p>
455-
<button type="button" class="delete" aria-label="close" @click="toggleModal()"></button>
455+
<button type="button" class="delete" @click="toggleModal()"></button>
456456
</header>
457457
<section class="modal-card-body">
458458
<h4 class="title">{{ trans('MediaManager::messages.new_file_folder') }}</h4>
@@ -482,7 +482,7 @@ class="button"
482482
<span class="icon"><i class="fa fa-share"></i></span>
483483
<span>{{ trans('MediaManager::messages.move_file_folder') }}</span>
484484
</p>
485-
<button type="button" class="delete" aria-label="close" @click="toggleModal()"></button>
485+
<button type="button" class="delete" @click="toggleModal()"></button>
486486
</header>
487487
<section class="modal-card-body">
488488
<h4 class="title">{{ trans('MediaManager::messages.destination_folder') }}</h4>
@@ -523,7 +523,7 @@ class="button"
523523
<span class="icon"><i class="fa fa-warning"></i></span>
524524
<span>{{ trans('MediaManager::messages.are_you_sure') }}</span>
525525
</p>
526-
<button type="button" class="delete" aria-label="close" @click="toggleModal()"></button>
526+
<button type="button" class="delete" @click="toggleModal()"></button>
527527
</header>
528528
<section class="modal-card-body">
529529
<h4 class="title">{{ trans('MediaManager::messages.are_you_sure_delete') }}</h4>

0 commit comments

Comments
 (0)