Skip to content

Commit 95ede62

Browse files
dmitriituxdmitriitux
committed
Версия 1.1.2
1 parent f13af53 commit 95ede62

File tree

6 files changed

+74
-29
lines changed

6 files changed

+74
-29
lines changed

‎administrator/components/com_quantummanager/fields/quantumviewfiles.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ protected function getLayoutData()
5757
'directory' => $this->directory,
5858
'onlyfiles' => $this->onlyfiles,
5959
'metafile' => $this->metafile,
60+
'hash' => md5(QuantummanagerHelper::preparePath($this->directory)),
6061
'cssClass' => $this->cssClass,
6162
]
6263
);

‎administrator/components/com_quantummanager/layouts/fields/quantumviewfiles.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
$id = rand(111111, 999999);
1515
?>
1616

17-
<div class="quantummanager-module quantumviewfiles-module" data-type="Quantumviewfiles" data-options="directory:<?php echo $displayData['directory'] ?>;onlyfiles:<?php echo $displayData['onlyfiles'] ?>;metafile:<?php echo $displayData['metafile'] ?>">
17+
<div class="quantummanager-module quantumviewfiles-module" data-type="Quantumviewfiles" data-options="hash:<?php echo $displayData['hash'] ?>;directory:<?php echo $displayData['directory'] ?>;onlyfiles:<?php echo $displayData['onlyfiles'] ?>;metafile:<?php echo $displayData['metafile'] ?>">
1818
<div class="quantumviewfiles-module-heading">
1919
<div class="breadcumbs"></div>
2020
<div class="filter-search">

‎changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.1.2
2+
- убрана ошибка при запоминании каталога и его открытия
3+
- метатеги закрываются, если файл больше не выделен
4+
- после загрузки файла, если включены метатеги, то сразу показывается теги загруженного файла
5+
16
1.1
27
- убрана папка com_quantummanager из images (это папка кеша менеджера)
38
- в cropperjs модуле PX переведены в нижний регистр

‎media/com_quantummanager/css/quantumviewfiles.css‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,21 @@
99

1010
.quantumviewfiles-module {
1111
position: relative;
12-
/*height: 80%;*/
1312
display: flex;
1413
flex-wrap: wrap;
14+
-webkit-flex-wrap: wrap;
1515
flex-direction: column;
16+
-webkit-flex-direction: column;
1617
flex: 1 1 auto;
18+
-webkit-flex: 1 1 auto;
1719
}
1820
.quantumviewfiles-module .quantumviewfiles-module-heading {
1921
display: flex;
2022
margin-top: 5px;
2123
margin-bottom: 10px;
2224
}
2325
.quantumviewfiles-module .filters {
24-
display: flex;
26+
display: none;
2527
margin-top: 8px;
2628
margin-bottom: 8px;
2729
width: 100%;
@@ -62,7 +64,6 @@
6264
}
6365
.quantumviewfiles-module .filter-search svg {
6466
max-width: 100%;
65-
height: auto;
6667
box-sizing: border-box;
6768
width: 16px;
6869
height: 16px;
@@ -189,17 +190,18 @@
189190
transition: display 0.2s ease;
190191
}
191192
.quantumviewfiles-module .view-wrap {
192-
flex: 2;
193193
width: 100%;
194194
display: flex;
195+
flex: 1 1 auto;
196+
-webkit-flex: 1 1 auto;
195197
}
196198
.quantumviewfiles-module .view {
197199
position: relative;
198200
height: 100%;
199201
width: 100%;
200202
}
201203
.quantumviewfiles-module .meta-file ~ .view {
202-
width: 80% ;
204+
width: 80%;
203205
}
204206
.quantumviewfiles-module .meta-file {
205207
position: relative;
@@ -259,6 +261,7 @@
259261
}
260262
.quantumviewfiles-module .field-list-files {
261263
width: 100%;
264+
height: 100%;
262265
position: absolute;
263266
top: 0;
264267
bottom: 0;
@@ -632,4 +635,13 @@
632635
object-fit: contain;
633636
object-position: center;
634637
}
638+
}
639+
640+
@media screen and (max-width: 768px) {
641+
.quantumviewfiles-module-heading {
642+
flex-wrap: wrap;
643+
}
644+
.quantumviewfiles-module-heading > * {
645+
width: 100%;
646+
}
635647
}

‎media/com_quantummanager/js/quantumviewfiles.js‎

Lines changed: 49 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
2727
let self = this;
2828
this.path = this.options.directory;
2929
let openLastDir = localStorage.getItem('quantummanagerLastDir');
30+
let openLastDirHash = localStorage.getItem('quantummanagerLastDirHash');
3031
if(openLastDir !== null)
3132
{
32-
this.path = openLastDir;
33+
if(openLastDirHash === this.options.hash) {
34+
this.path = openLastDir;
35+
}
3336
}
3437

3538
this.loadDirectory();
@@ -186,8 +189,8 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
186189
htmlfilesAndDirectories = "<div class='empty'><div>" + QuantumviewfilesLang.empty + "</div></div>";
187190
}
188191

189-
ViewfilesElement.querySelector('.view').innerHTML = '';
190-
ViewfilesElement.querySelector('.view').innerHTML = htmlfilesAndDirectories;
192+
ViewfilesElement.querySelector('.view-wrap .view').innerHTML = '';
193+
ViewfilesElement.querySelector('.view-wrap .view').innerHTML = htmlfilesAndDirectories;
191194
self.reloadTypeViewFiles(path);
192195
self.listFiles = ViewfilesElement.querySelector('.field-list-files');
193196

@@ -230,6 +233,7 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
230233

231234
if(localStorage !== undefined) {
232235
localStorage.setItem('quantummanagerLastDir', Filemanager.data.path);
236+
localStorage.setItem('quantummanagerLastDirHash', self.options.hash);
233237
}
234238

235239
self.directory = this;
@@ -261,8 +265,36 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
261265
qvf.file = element;
262266
qvf.trigger('clickFile', element);
263267

268+
if(tmpInput.checked) {
269+
self.showMetaFile(element);
270+
} else {
271+
self.hideMetaFile();
272+
}
273+
274+
};
275+
276+
this.fileDblclick = function (element, qvf) {
277+
qvf.trigger('dblclickFile', element);
278+
};
279+
280+
this.preoloader = function () {
281+
ViewfilesElement.querySelector('.view').innerHTML = "<div class=\"loader\">" + QuantumviewfilesLang.loading + "<span></span><span></span><span></span><span></span></div>";
282+
};
283+
284+
this.hideMetaFile = function () {
285+
let self = this;
286+
287+
if(self.options.metafile === '1') {
288+
self.viewMeta.classList.add('hidden');
289+
}
290+
291+
};
292+
293+
this.showMetaFile = function (element) {
294+
let self = this;
295+
264296
if(self.options.metafile === '1') {
265-
jQuery.get("/administrator/index.php?option=com_quantummanager&task=quantumviewfiles.getMetaFile&path=" + encodeURIComponent(qvf.path) + '&name=' + encodeURIComponent(element.getAttribute('data-file'))).done(function (response) {
297+
jQuery.get("/administrator/index.php?option=com_quantummanager&task=quantumviewfiles.getMetaFile&path=" + encodeURIComponent(self.path) + '&name=' + encodeURIComponent(element.getAttribute('data-file'))).done(function (response) {
266298
response = JSON.parse(response);
267299
if(response.global !== undefined || response.find !== undefined) {
268300
self.viewMeta.classList.remove('hidden');
@@ -294,15 +326,15 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
294326
if(buttonToggleTags !== null) {
295327
let metaFind = self.viewMeta.querySelector('.meta-find');
296328
buttonToggleTags.addEventListener('click', function () {
297-
if(this.classList.contains('active')) {
298-
this.classList.remove('active');
299-
this.innerHTML = QuantumviewfilesLang.metaFileShow;
300-
metaFind.classList.add('meta-hidden');
301-
} else {
302-
this.classList.add('active');
303-
this.innerHTML = QuantumviewfilesLang.metaFileHide;
304-
metaFind.classList.remove('meta-hidden');
305-
}
329+
if(this.classList.contains('active')) {
330+
this.classList.remove('active');
331+
this.innerHTML = QuantumviewfilesLang.metaFileShow;
332+
metaFind.classList.add('meta-hidden');
333+
} else {
334+
this.classList.add('active');
335+
this.innerHTML = QuantumviewfilesLang.metaFileHide;
336+
metaFind.classList.remove('meta-hidden');
337+
}
306338
});
307339
}
308340

@@ -311,15 +343,6 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
311343
}
312344
});
313345
}
314-
315-
};
316-
317-
this.fileDblclick = function (element, qvf) {
318-
qvf.trigger('dblclickFile', element);
319-
};
320-
321-
this.preoloader = function () {
322-
ViewfilesElement.querySelector('.view').innerHTML = "<div class=\"loader\">" + QuantumviewfilesLang.loading + "<span></span><span></span><span></span><span></span></div>";
323346
};
324347

325348
this.searchByName = function (search) {
@@ -466,6 +489,7 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
466489

467490
if(localStorage !== undefined) {
468491
localStorage.setItem('quantummanagerLastDir', fm.data.path);
492+
localStorage.setItem('quantummanagerLastDirHash', self.options.hash);
469493
}
470494

471495
self.trigger('updatePath');
@@ -758,14 +782,17 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
758782

759783
let filesAll = el.element.querySelectorAll('.field-list-files .file-item');
760784
let find = false;
785+
let element;
761786

762787
for(let i=0;i<filesAll.length;i++) {
763788
if (filesAll[i].querySelector('input').checked) {
789+
element = filesAll[i];
764790
find = true;
765791
}
766792
}
767793

768794
if(find) {
795+
fm.Quantumviewfiles.showMetaFile(element);
769796
fm.Quantumtoolbar.buttonsList['viewfilesDelete'].classList.remove('btn-hide');
770797
} else {
771798
fm.Quantumtoolbar.buttonsList['viewfilesDelete'].classList.add('btn-hide');

‎quantummanager.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<authorUrl>https://delo-design.ru</authorUrl>
88
<copyright>Copyright (C) 2019 "Delo Design". All rights reserved.</copyright>
99
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
10-
<version>1.1</version>
10+
<version>1.1.2</version>
1111
<description>COM_QUANTUMMANAGER_XML_DESCRIPTION</description>
1212

1313
<scriptfile>script.php</scriptfile>

0 commit comments

Comments
 (0)