gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix "cut to note", closes #2895, #1182

Browse Source
This commit is contained in:
zadam 2022-06-03 22:05:18 +02:00
parent 8fcc76ad6d
commit 5fbaed61c1
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

7
src/public/app/services/note_context.js
View File

@ -248,6 +248,13 @@ class NoteContext extends Component {
ntxId: this.ntxId ntxId: this.ntxId
})); }));
} }
async getTypeWidget() {
return new Promise(resolve => appContext.triggerCommand('executeWithTypeWidget', {
resolve,
ntxId: this.ntxId
}));
}
} }
export default NoteContext; export default NoteContext;

8
src/public/app/services/note_create.js
View File

@ -24,8 +24,8 @@ async function createNote(parentNotePath, options = {}) {
options.saveSelection = false; options.saveSelection = false;
} }
if (options.saveSelection && utils.isCKEditorInitialized()) { if (options.saveSelection) {
[options.title, options.content] = parseSelectedHtml(window.cutToNote.getSelectedHtml()); [options.title, options.content] = parseSelectedHtml(options.textEditor.getSelectedHtml());
} }
const parentNoteId = treeService.getNoteIdFromNotePath(parentNotePath); const parentNoteId = treeService.getNoteIdFromNotePath(parentNotePath);
@ -46,9 +46,9 @@ async function createNote(parentNotePath, options = {}) {
mime: options.mime mime: options.mime
}); });
if (options.saveSelection && utils.isCKEditorInitialized()) { if (options.saveSelection) {
// we remove the selection only after it was saved to server to make sure we don't lose anything // we remove the selection only after it was saved to server to make sure we don't lose anything
window.cutToNote.removeSelection(); options.textEditor.removeSelection();
} }
await ws.waitForMaxKnownEntityChangeId(); await ws.waitForMaxKnownEntityChangeId();

5
src/public/app/services/utils.js
View File

@ -292,10 +292,6 @@ function copySelectionToClipboard() {
} }
} }
function isCKEditorInitialized() {
return !!(window && window.cutToNote);
}
function dynamicRequire(moduleName) { function dynamicRequire(moduleName) {
if (typeof __non_webpack_require__ !== 'undefined') { if (typeof __non_webpack_require__ !== 'undefined') {
return __non_webpack_require__(moduleName); return __non_webpack_require__(moduleName);
@ -405,7 +401,6 @@ export default {
clearBrowserCache, clearBrowserCache,
normalizeShortcut, normalizeShortcut,
copySelectionToClipboard, copySelectionToClipboard,
isCKEditorInitialized,
dynamicRequire, dynamicRequire,
timeLimit, timeLimit,
initHelpDropdown, initHelpDropdown,

15
src/public/app/widgets/note_detail.js
View File

@ -327,7 +327,8 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
// without await as this otherwise causes deadlock through component mutex // without await as this otherwise causes deadlock through component mutex
noteCreateService.createNote(appContext.tabManager.getActiveContextNotePath(), { noteCreateService.createNote(appContext.tabManager.getActiveContextNotePath(), {
isProtected: note.isProtected, isProtected: note.isProtected,
saveSelection: true saveSelection: true,
textEditor: await this.noteContext.getTextEditor()
}); });
} }
@ -341,4 +342,16 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
this.refresh(); this.refresh();
} }
} }
async executeWithTypeWidgetEvent({resolve, ntxId}) {
if (!this.isNoteContext(ntxId)) {
return;
}
await this.initialized;
await this.getWidgetType();
resolve(this.getTypeWidget());
}
} }