pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix bug 74941' (#307) from fix/bug-74941 into fix/fix-bugs

Browse Source
This commit is contained in:
Maxim Kadushkin
2025-06-11 10:01:30 +00:00
parent 438802ff7e 06d5f3e9bb
commit 782331cb98
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/loginpage/src/css/styles.less
View File

@ -821,7 +821,12 @@ li.menu-item {
}
#box-recent {
display: flex;
padding-bottom: 32px;
&.empty {
display: none;
}
}
#box-recovery {

2
common/loginpage/src/dnd-file-zone.js
View File

@ -18,7 +18,7 @@ window.DnDFileZone = function () {
$parent = parentElement;
$el = $parent.append(_template).find('.dnd-zone');
$el.find('a').bind('click', function () {
$el.find('button').bind('click', function () {
openFile(OPEN_FILE_FOLDER, '');
});
},

45
common/loginpage/src/panelrecent.js
View File

@ -141,13 +141,13 @@
<div ${id} class="row text-normal">
<div class="col-name">
<div class="icon">
<svg class="icon" data-iconname="${info.type == 'folder' ? 'folder' : `${info.format}`}" data-precls="tool-icon">
<use xlink:href="#${info.type == 'folder' ? 'folder-small' : info.format}"></use>
<svg class="icon" data-iconname="${info.type === 'folder' ? 'folder' : `${info.format}`}" data-precls="tool-icon">
<use xlink:href="#${info.type === 'folder' ? 'folder-small' : info.format}"></use>
</svg>
${info.crypted ? `<svg class="icon" data-iconname="shield" data-precls="tool-icon">
<use xlink:href="#shield"></use>
</svg>` : ''}
${!isSvgIcons ? `<i class="icon tool-icon ${info.type == 'folder' ? 'folder' : `${info.format}`}"></i>` :''}
${!isSvgIcons ? `<i class="icon tool-icon ${info.type === 'folder' ? 'folder' : `${info.format}`}"></i>` :''}
</div>
<p class="name">${info.name}</p>
<span class="ext">${info.ext}</span>
@ -290,7 +290,7 @@
this.rawRecents = undefined;
}
this.view.$boxRecent.css('display', collectionRecents.size() > 0 ? 'flex' : 'none');
// this.view.$boxRecent.css('display', collectionRecents.size() > 0 ? 'flex' : 'none');
// requestAnimationFrame(() => this.view.updateListSize());
if (collectionRecents.size() > 0 || collectionRecovers.size() > 0) {
@ -421,19 +421,33 @@
menu.actionlist == 'recent' ?
openFile(OPEN_FILE_RECENT, data) :
openFile(OPEN_FILE_RECOVERY, data);
} else
if (/\:clear/.test(action)) {
menu.actionlist == 'recent' ?
window.sdk.LocalFileRemoveAllRecents() :
} else if (/\:clear/.test(action)) {
if (menu.actionlist === 'recent') {
window.sdk.LocalFileRemoveAllRecents();
if (collectionRecovers.size() === 0) {
this.dndZone.show();
}
} else {
window.sdk.LocalFileRemoveAllRecovers();
if (collectionRecents.size() === 0) {
this.dndZone.show();
}
}
} else
if (/\:forget/.test(action)) {
$('#' + data.uid, this.view.$panel).addClass('lost');
setTimeout(e => {
menu.actionlist == 'recent' ?
window.sdk.LocalFileRemoveRecent(parseInt(data.fileid)) :
window.sdk.LocalFileRemoveRecover(parseInt(data.fileid));}
, 300); // 300ms - duration of item's 'collapse' transition
if (menu.actionlist === 'recent') {
window.sdk.LocalFileRemoveRecent(parseInt(data.fileid));
if (collectionRecovers.size() === 0) {
this.dndZone.show();
}
} else {
window.sdk.LocalFileRemoveRecover(parseInt(data.fileid));
if (collectionRecents.size() === 0) {
this.dndZone.show();
}
}
} else
if (/\:explore/.test(action)) {
if (menu.actionlist == 'recent') {
@ -518,11 +532,6 @@
console.log('portal authorized');
});
$('#box-recent .table-box').scroll(e => {
if ( Menu.opened )
Menu.closeAll();
});
this.dndZone = new DnDFileZone();
this.dndZone.render(this.view.$panel.find("#area-dnd-file"));