1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-12 08:54:00 +02:00

Merge branch 'master' of github.com:laurent22/joplin

This commit is contained in:
Laurent Cozic 2020-02-18 16:19:25 +00:00
commit 805cf06af7

View File

@ -2144,7 +2144,9 @@ class NoteTextComponent extends React.Component {
onFocus={this.aceEditor_focus} onFocus={this.aceEditor_focus}
readOnly={visiblePanes.indexOf('editor') < 0} readOnly={visiblePanes.indexOf('editor') < 0}
// Enable/Disable the autoclosing braces // Enable/Disable the autoclosing braces
setOptions={{ behavioursEnabled: Setting.value('editor.autoMatchingBraces') }} setOptions={{
behavioursEnabled: Setting.value('editor.autoMatchingBraces'),
useSoftTabs: false }}
// Disable warning: "Automatically scrolling cursor into view after // Disable warning: "Automatically scrolling cursor into view after
// selection change this will be disabled in the next version set // selection change this will be disabled in the next version set
// editor.$blockScrolling = Infinity to disable this message" // editor.$blockScrolling = Infinity to disable this message"