Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-30 19:52:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit e930ae5f407b28de9edd65f038237d061f8d8c16.
This commit is contained in:
Elian Doran 2025-03-05 21:57:08 +02:00
parent 8d60429b9c
commit c99c4a4302
No known key found for this signature in database
3 changed files with 66 additions and 83 deletions
Show Stats 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

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

@ -110,19 +110,19 @@ export function buildConfig() {
} }
export function buildToolbarConfig(isClassicToolbar: boolean) { export function buildToolbarConfig(isClassicToolbar: boolean) {
const languages = JSON.parse(options.get("languages") ?? "[]") as string[];
const enableLanguageSwitcher = languages.length > 1;
if (isClassicToolbar) { if (isClassicToolbar) {
const multilineToolbar = utils.isDesktop() && options.get("textNoteEditorMultilineToolbar") === "true" const multilineToolbar = utils.isDesktop() && options.get("textNoteEditorMultilineToolbar") === "true"
return buildClassicToolbar(multilineToolbar, enableLanguageSwitcher); return buildClassicToolbar(multilineToolbar);
} else { } else {
return buildFloatingToolbar(enableLanguageSwitcher); return buildFloatingToolbar();
} }
} }
function buildClassicToolbar(multilineToolbar: boolean, enableLanguageSwitcher: boolean) { function buildClassicToolbar(multilineToolbar: boolean) {
const items = [ // 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: [
'heading', 'fontSize', 'heading', 'fontSize',
'|', '|',
'bold', 'italic', 'bold', 'italic',
@ -163,25 +163,17 @@ function buildClassicToolbar(multilineToolbar: boolean, enableLanguageSwitcher:
'|', '|',
'outdent', 'indent', 'outdent', 'indent',
'|', '|',
'markdownImport', 'cuttonote', 'findAndReplace', 'markdownImport', 'cuttonote', 'findAndReplace'
]; ],
if (enableLanguageSwitcher) {
items.push('|');
items.push('textPartLanguage');
}
// 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,
shouldNotGroupWhenFull: multilineToolbar shouldNotGroupWhenFull: multilineToolbar
} }
} }
} }
function buildFloatingToolbar(enableLanguageSwitcher: boolean) { function buildFloatingToolbar() {
const items = [ return {
toolbar: {
items: [
'fontSize', 'fontSize',
'bold', 'bold',
'italic', 'italic',
@ -196,16 +188,7 @@ function buildFloatingToolbar(enableLanguageSwitcher: boolean) {
'removeFormat', 'removeFormat',
'internallink', 'internallink',
'cuttonote' 'cuttonote'
]; ]
if (enableLanguageSwitcher) {
items.push('|');
items.push('textPartLanguage');
}
return {
toolbar: {
items
}, },
blockToolbar: [ blockToolbar: [