self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Desktop: Rich text editor: Add a right-click "Open" menu item for external links (#12391)

Browse Source
This commit is contained in:
Henry Heino
2025-06-06 02:32:35 -07:00
committed by GitHub
parent 945b309a4d
commit ca653d3e88
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.ts
View File

@@ -39,7 +39,7 @@ export default function(editor: Editor, plugins: PluginStates, dispatch: Dispatc
const makeMainMenuItems = (element: Element) => {
let itemType: ContextMenuItemType = ContextMenuItemType.None;
let resourceId = '';
let linkToCopy = null;
let linkUrl = null;
const pathToId = (path: string) => {
const id = Resource.pathToId(path);
@@ -52,7 +52,7 @@ export default function(editor: Editor, plugins: PluginStates, dispatch: Dispatc
} else if (element.nodeName === 'A') {
resourceId = pathToId((element as HTMLAnchorElement).href);
itemType = resourceId ? ContextMenuItemType.Resource : ContextMenuItemType.Link;
linkToCopy = element.getAttribute('href') || '';
linkUrl = element.getAttribute('href') || '';
} else {
itemType = ContextMenuItemType.Text;
}
@@ -62,7 +62,8 @@ export default function(editor: Editor, plugins: PluginStates, dispatch: Dispatc
resourceId,
filename: null,
mime: null,
linkToCopy,
linkToCopy: linkUrl,
linkToOpen: linkUrl,
textToCopy: null,
htmlToCopy: editor.selection ? editor.selection.getContent() : '',
insertContent: (content: string) => {

14
packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts
View File

@@ -15,6 +15,7 @@ import Setting from '@joplin/lib/models/Setting';
import ItemChange from '@joplin/lib/models/ItemChange';
import shim from '@joplin/lib/shim';
import { openFileWithExternalEditor } from '@joplin/lib/services/ExternalEditWatcher/utils';
import CommandService from '@joplin/lib/services/CommandService';
const fs = require('fs-extra');
const { writeFile } = require('fs-extra');
const { clipboard } = require('electron');
@@ -84,9 +85,18 @@ export function menuItems(dispatch: Function): ContextMenuItems {
open: {
label: _('Open...'),
onAction: async (options: ContextMenuOptions) => {
await openItemById(options.resourceId, dispatch);
if (options.resourceId) {
await openItemById(options.resourceId, dispatch);
} else if (options.linkToOpen) {
await CommandService.instance().execute('openItem', options.linkToOpen);
} else {
await shim.showErrorDialog('No link found');
}
},
isActive: (itemType: ContextMenuItemType, options: ContextMenuOptions) => !options.textToCopy && (itemType === ContextMenuItemType.Image || itemType === ContextMenuItemType.Resource),
isActive: (itemType: ContextMenuItemType, options: ContextMenuOptions) => (
(!options.textToCopy && (itemType === ContextMenuItemType.Image || itemType === ContextMenuItemType.Resource))
|| (!!options.linkToOpen && itemType === ContextMenuItemType.Link)
),
},
saveAs: {
label: _('Save as...'),

1
packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.ts
View File

@@ -17,6 +17,7 @@ export interface ContextMenuOptions {
resourceId: string;
mime: string;
filename: string;
linkToOpen: string;
linkToCopy: string;
textToCopy: string;
htmlToCopy: string;

1
packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts
View File

@@ -52,6 +52,7 @@ export default function useMessageHandler(
resourceId: arg0.resourceId,
filename: arg0.filename,
mime: arg0.mime,
linkToOpen: null,
textToCopy: arg0.textToCopy,
linkToCopy: arg0.linkToCopy || null,
htmlToCopy: '',

1
packages/app-desktop/gui/PdfViewer.tsx
View File

@@ -62,6 +62,7 @@ export default function PdfViewer(props: Props) {
mime: 'text/plain',
textToCopy: text,
linkToCopy: null,
linkToOpen: null,
htmlToCopy: '',
insertContent: () => { console.warn('insertContent() not implemented'); },
fireEditorEvent: () => { console.warn('fireEditorEvent() not implemented'); },