Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix show revisions for html and txt

Stanimir7be44c536362
diff --git a/src/renderer/components/Revisions.tsx b/src/renderer/components/Revisions.tsx
index e3e91707a..829176cfc 100644
--- a/src/renderer/components/Revisions.tsx
+++ b/src/renderer/components/Revisions.tsx
@@ -79,10 +79,10 @@ function Revisions() {
const location = findLocation(openedFile.locationID);
if (location) {
getMetadataID(openedFile.path, openedFile.uuid, location).then((id) => {
- openedFile.uuid = id;
+ //openedFile.uuid = id;
const backupFilePath = getBackupFileLocation(
openedFile.path,
- openedFile.uuid,
+ id,
location.getDirSeparator(),
);
const backupPath = extractContainingDirectoryPath(
diff --git a/src/renderer/components/dialogs/FilePreviewDialog.tsx b/src/renderer/components/dialogs/FilePreviewDialog.tsx
index 1b7c131cc..366541780 100644
--- a/src/renderer/components/dialogs/FilePreviewDialog.tsx
+++ b/src/renderer/components/dialogs/FilePreviewDialog.tsx
@@ -25,14 +25,12 @@ import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { getCurrentTheme } from '-/reducers/settings';
import { TS } from '-/tagspaces.namespace';
-import useEventListener from '-/utils/useEventListener';
import { Typography } from '@mui/material';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import { extractContainingDirectoryPath } from '@tagspaces/tagspaces-common/paths';
-import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import { MutableRefObject, useRef } from 'react';
import { useSelector } from 'react-redux';
@@ -68,56 +66,68 @@ function FilePreviewDialog(props: Props) {
: undefined;
const handleMessage = (data: any) => {
- let textFilePath;
- switch (
- data.command // todo use diff command
- ) {
- case 'parentLoadTextContent':
- if (!openedFile || !openedFile.path) {
- break;
- }
- textFilePath = openedFile.path;
- const openLocation = findLocation(openedFile.locationID);
-
- openLocation
- ?.loadTextFilePromise(
- textFilePath,
- data.preview ? data.preview : false,
- )
- .then((content) => {
- // Check and remove UTF-8 BOM
- const cleanedContent = content.startsWith('\uFEFF')
- ? content.slice(1)
- : content;
- /* let fileDirectory = extractContainingDirectoryPath(
- textFilePath,
- openLocation?.getDirSeparator(),
- );
+ if (!openedFile || !openedFile.path) {
+ return;
+ }
+ switch (data.command) {
+ case 'loadDefaultTextContent':
+ getFileContent(data.preview ? data.preview : false).then((content) => {
+ if (
+ fileViewer &&
+ fileViewer.current &&
+ fileViewer.current.contentWindow &&
+ // @ts-ignore
+ fileViewer.current.contentWindow.setContent
+ ) {
+ let fileDirectory = extractContainingDirectoryPath(openedFile.path);
if (AppConfig.isWeb) {
const webDir = extractContainingDirectoryPath(
// eslint-disable-next-line no-restricted-globals
location.href,
- openLocation?.getDirSeparator(),
);
fileDirectory =
(webDir && webDir !== '/' ? webDir + '/' : '') + fileDirectory;
- }*/
- fileViewer?.current?.contentWindow?.postMessage(
- {
- action: 'fileContent',
- content: cleanedContent,
- isEditMode: isEditMode,
- },
- '*',
+ }
+ // @ts-ignore call setContent from iframe
+ fileViewer.current.contentWindow.setContent(
+ content,
+ fileDirectory,
+ !isEditMode,
+ theme.palette.mode,
);
- })
- .catch((err) => {
- console.log('Error loading text content ' + err);
- });
+ }
+ });
+ break;
+ case 'parentLoadTextContent':
+ getFileContent(data.preview ? data.preview : false).then((content) => {
+ fileViewer?.current?.contentWindow?.postMessage(
+ {
+ action: 'fileContent',
+ content: content,
+ isEditMode: isEditMode,
+ },
+ '*',
+ );
+ });
break;
}
};
+ function getFileContent(preview): Promise<string> {
+ const openLocation = findLocation(openedFile.locationID);
+
+ return openLocation
+ ?.loadTextFilePromise(openedFile.path, preview)
+ .then((content) => {
+ // Check and remove UTF-8 BOM
+ return content.startsWith('\uFEFF') ? content.slice(1) : content;
+ })
+ .catch((err) => {
+ console.log('Error loading text content ' + err);
+ return undefined;
+ });
+ }
+
if (!fsEntry) {
return null;
}
diff --git a/src/renderer/components/dialogs/components/TargetPath.tsx b/src/renderer/components/dialogs/components/TargetPath.tsx
index 0473fbd7e..2aa96bc07 100644
--- a/src/renderer/components/dialogs/components/TargetPath.tsx
+++ b/src/renderer/components/dialogs/components/TargetPath.tsx
@@ -41,9 +41,8 @@ function TargetPath() {
{t('core:entriesWillBeCreatedIn') +
' ' +
(currentLocation?.type === locationType.TYPE_CLOUD
- ? currentLocation.name
+ ? currentLocation.name + '/'
: '') +
- '/' +
targetDirectoryPath}
</Typography>
) : (