mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-02-20 21:28:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(rtl): add language switcher toolbar"

Browse Source 
This reverts commit e930ae5f40.
This commit is contained in:
Elian Doran
2025-03-05 21:57:08 +02:00
parent 8d60429b9c
commit c99c4a4302
3 changed files with 66 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

143
src/public/app/widgets/type_widgets/ckeditor/toolbars.ts
View File

@@ -110,102 +110,85 @@ export function buildConfig() {
}
export function buildToolbarConfig(isClassicToolbar: boolean) {
const languages = JSON.parse(options.get("languages") ?? "[]") as string[];
const enableLanguageSwitcher = languages.length > 1;
if (isClassicToolbar) {
const multilineToolbar = utils.isDesktop() && options.get("textNoteEditorMultilineToolbar") === "true"
return buildClassicToolbar(multilineToolbar, enableLanguageSwitcher);
return buildClassicToolbar(multilineToolbar);
} else {
return buildFloatingToolbar(enableLanguageSwitcher);
return buildFloatingToolbar();
}
}
function buildClassicToolbar(multilineToolbar: boolean, enableLanguageSwitcher: boolean) {
const items = [
'heading', 'fontSize',
'|',
'bold', 'italic',
{
label: "Text formatting",
icon: "text",
items: [
'underline',
'strikethrough',
'superscript',
'subscript',
'code',
],
},
'|',
'fontColor', 'fontBackgroundColor', 'removeFormat',
'|',
'bulletedList', 'numberedList', 'todoList',
'|',
'blockQuote', 'insertTable', 'codeBlock', 'footnote',
{
label: "Insert",
icon: "plus",
items: [
'imageUpload',
'|',
'link',
'internallink',
'includeNote',
'|',
'specialCharacters',
'math',
'mermaid',
'horizontalLine',
'pageBreak'
]
},
'|',
'outdent', 'indent',
'|',
'markdownImport', 'cuttonote', 'findAndReplace',
];
if (enableLanguageSwitcher) {
items.push('|');
items.push('textPartLanguage');
}
function buildClassicToolbar(multilineToolbar: boolean) {
// For nested toolbars, refer to https://ckeditor.com/docs/ckeditor5/latest/getting-started/setup/toolbar.html#grouping-toolbar-items-in-dropdowns-nested-toolbars.
return {
toolbar: {
items,
items: [
'heading', 'fontSize',
'|',
'bold', 'italic',
{
label: "Text formatting",
icon: "text",
items: [
'underline',
'strikethrough',
'superscript',
'subscript',
'code',
],
},
'|',
'fontColor', 'fontBackgroundColor', 'removeFormat',
'|',
'bulletedList', 'numberedList', 'todoList',
'|',
'blockQuote', 'insertTable', 'codeBlock', 'footnote',
{
label: "Insert",
icon: "plus",
items: [
'imageUpload',
'|',
'link',
'internallink',
'includeNote',
'|',
'specialCharacters',
'math',
'mermaid',
'horizontalLine',
'pageBreak'
]
},
'|',
'outdent', 'indent',
'|',
'markdownImport', 'cuttonote', 'findAndReplace'
],
shouldNotGroupWhenFull: multilineToolbar
}
}
}
function buildFloatingToolbar(enableLanguageSwitcher: boolean) {
const items = [
'fontSize',
'bold',
'italic',
'underline',
'strikethrough',
'superscript',
'subscript',
'fontColor',
'fontBackgroundColor',
'code',
'link',
'removeFormat',
'internallink',
'cuttonote'
];
if (enableLanguageSwitcher) {
items.push('|');
items.push('textPartLanguage');
}
function buildFloatingToolbar() {
return {
toolbar: {
items
items: [
'fontSize',
'bold',
'italic',
'underline',
'strikethrough',
'superscript',
'subscript',
'fontColor',
'fontBackgroundColor',
'code',
'link',
'removeFormat',
'internallink',
'cuttonote'
]
},
blockToolbar: [