Web:Client: Fixed bug(60349) the file opens in the same tab

This commit is contained in:
Akmal Isomadinov 2022-12-27 16:23:53 +05:00
parent fc52606db3
commit 26b1de6d97
2 changed files with 22 additions and 5 deletions

View File

@ -359,7 +359,12 @@ export default inject(
name = splitted[0]; name = splitted[0];
} }
const { personal, theme } = auth.settingsStore; const { personal, theme } = auth.settingsStore;
const { getIconSrc, isArchive } = settingsStore; const {
canViewedDocs,
isMediaOrImage,
getIconSrc,
isArchive,
} = settingsStore;
const { const {
uploaded, uploaded,
primaryProgressDataStore, primaryProgressDataStore,
@ -377,8 +382,7 @@ export default inject(
setCurrentItem, setCurrentItem,
} = mediaViewerDataStore; } = mediaViewerDataStore;
const { loadingFile: file } = primaryProgressDataStore; const { loadingFile: file } = primaryProgressDataStore;
const isMedia = const isMedia = isMediaOrImage(ext);
item.viewAccessability?.ImageView || item.viewAccessability?.MediaView;
const isMediaActive = const isMediaActive =
playlist.findIndex((el) => el.fileId === item.fileId) !== -1; playlist.findIndex((el) => el.fileId === item.fileId) !== -1;
@ -391,8 +395,7 @@ export default inject(
? loadingFile.percent ? loadingFile.percent
: null; : null;
const downloadInCurrentTab = const downloadInCurrentTab = isArchive(ext) || !canViewedDocs(ext);
isArchive(ext) || !item.viewAccessability?.WebView;
return { return {
isPersonal: personal, isPersonal: personal,

View File

@ -194,8 +194,22 @@ class SettingsStore {
this.hideConfirmConvertSave = hideConfirmConvertSave; this.hideConfirmConvertSave = hideConfirmConvertSave;
}; };
canViewedDocs = (extension) =>
presentInArray(this.extsWebPreviewed, extension);
canConvert = (extension) => presentInArray(this.extsMustConvert, extension); canConvert = (extension) => presentInArray(this.extsMustConvert, extension);
isMediaOrImage = (fileExst) => {
if (
this.extsVideo.includes(fileExst) ||
this.extsImage.includes(fileExst) ||
this.extsAudio.includes(fileExst)
) {
return true;
}
return false;
};
isArchive = (extension) => presentInArray(this.extsArchive, extension); isArchive = (extension) => presentInArray(this.extsArchive, extension);
isImage = (extension) => presentInArray(this.extsImage, extension); isImage = (extension) => presentInArray(this.extsImage, extension);