Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Desktop: Replace Ace with Code mirror #3284

Merged
merged 23 commits into from
Jun 6, 2020
Merged

Desktop: Replace Ace with Code mirror #3284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9d2a95e
add codemirror
CalebJohn May 17, 2020
ca3c754
Merge branch 'master' into code-mirror
CalebJohn May 19, 2020
289bf23
Replace AceEditorReact with codemirror, no integration yet
CalebJohn May 21, 2020
4656d23
Merge branch 'master' into code-mirror
CalebJohn May 21, 2020
4a4cd62
Fix up searching/commenting and list indent
CalebJohn May 22, 2020
7f9497f
Match up scrolling
CalebJohn May 25, 2020
a8002d5
Update wrap selection with strings
CalebJohn May 26, 2020
4107968
Move Codemirror into it's own folder
CalebJohn May 27, 2020
fa32aec
Ignoe Codemirror build files
CalebJohn May 27, 2020
ff6042f
Finish moving codemirror over
CalebJohn May 27, 2020
f288d6c
Merge branch 'master' into code-mirror
CalebJohn May 27, 2020
90e096a
Switch between ace and codemirror with a setting toggle
CalebJohn May 28, 2020
96b1854
Add variable sized headings
CalebJohn May 28, 2020
979af77
Clean up codemirror
CalebJohn May 28, 2020
e40c6eb
Add some QOL improvements
CalebJohn May 29, 2020
de26da1
Add much smarter enter and tab for lists
CalebJohn May 31, 2020
e552c0d
Add Line sorting https://discourse.joplinapp.org/t/sort-lines/8874/2
CalebJohn May 31, 2020
9964a1a
Add a couple more syntax highlighting modes
CalebJohn May 31, 2020
be7c67c
improve header size and line spacing
CalebJohn Jun 2, 2020
ce708e2
Merge branch 'master' into code-mirror
CalebJohn Jun 2, 2020
dd83463
Merge branch 'master' into code-mirror
CalebJohn Jun 2, 2020
aa1607b
Copy over toolbar focus updates
CalebJohn Jun 2, 2020
82f3f17
Update focus behavior to mirror master
CalebJohn Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useFocus.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
ElectronClient/gui/NoteEditor/NoteEditor.js
Expand Down
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useFocus.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
ElectronClient/gui/NoteEditor/NoteEditor.js
Expand Down
4 changes: 3 additions & 1 deletion ElectronClient/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,10 +1312,12 @@ class Application extends BaseApplication {
// The '*' and '!important' parts are necessary to make sure Russian text is displayed properly
// https://github.com/laurent22/joplin/issues/155

const css = `.ace_editor * { font-family: ${fontFamilies.join(', ')} !important; }`;
const css = `.CodeMirror * { font-family: ${fontFamilies.join(', ')} !important; }`;
const ace_css = `.ace_editor * { font-family: ${fontFamilies.join(', ')} !important; }`;
const styleTag = document.createElement('style');
styleTag.type = 'text/css';
styleTag.appendChild(document.createTextNode(css));
styleTag.appendChild(document.createTextNode(ace_css));
document.head.appendChild(styleTag);
}

Expand Down
3 changes: 2 additions & 1 deletion ElectronClient/gui/MainScreen.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,8 @@ class MainScreenComponent extends React.Component {
const noteContentPropertiesDialogOptions = this.state.noteContentPropertiesDialogOptions;
const shareNoteDialogOptions = this.state.shareNoteDialogOptions;

const bodyEditor = this.props.settingEditorCodeView ? 'AceEditor' : 'TinyMCE';
const codeEditor = Setting.value('editor.betaCodeMirror') ? 'CodeMirror' : 'AceEditor';
const bodyEditor = this.props.settingEditorCodeView ? codeEditor : 'TinyMCE';

return (
<div style={style}>
Expand Down
2 changes: 1 addition & 1 deletion ElectronClient/gui/NoteEditor/NoteBody/AceEditor/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function styles(props: NoteBodyEditorProps) {
fontSize: `${theme.editorFontSize}px`,
color: theme.color,
backgroundColor: theme.backgroundColor,
editorTheme: theme.editorTheme, // Defined in theme.js
aceEditorTheme: theme.aceEditorTheme, // Defined in theme.js
},
};
});
Expand Down
Loading