self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-01 19:15:01 +02:00
Code Issues Releases Activity

Revert "Desktop: Change codemirror to user import syntax (#3375)"

Browse Source 
This reverts commit 3a7a068196cb79954f1671affad1c2af31270dd9.
This commit is contained in:
Laurent Cozic 2020-06-17 23:45:36 +01:00
parent 3a7a068196
commit 1205908233
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -69,7 +69,6 @@ ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js

1
.gitignore vendored
View File

@ -59,7 +59,6 @@ ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js

5
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
View File

@ -1,8 +1,5 @@
import * as React from 'react'; import * as React from 'react';
import { useEffect, useImperativeHandle, useState, useRef, useCallback, forwardRef } from 'react'; import { useEffect, useImperativeHandle, useState, useRef, useCallback, forwardRef } from 'react';
import * as CodeMirror from 'codemirror';
import 'codemirror/addon/comment/comment'; import 'codemirror/addon/comment/comment';
import 'codemirror/addon/dialog/dialog'; import 'codemirror/addon/dialog/dialog';
import 'codemirror/addon/edit/closebrackets'; import 'codemirror/addon/edit/closebrackets';
@ -28,6 +25,8 @@ import 'codemirror/mode/clike/clike';
import 'codemirror/mode/diff/diff'; import 'codemirror/mode/diff/diff';
import 'codemirror/mode/sql/sql'; import 'codemirror/mode/sql/sql';
const CodeMirror = require('codemirror');
export interface CancelledKeys { export interface CancelledKeys {
mac: string[], mac: string[],
default: string[], default: string[],

4
ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.ts vendored
View File

@ -1,4 +0,0 @@
// Declare codemirror module so that we can import it using the import syntax.
// This also means it will implicitly have the any type, which is necessary because
// of the flexible manner that codemirror is made https://discuss.codemirror.net/t/basic-codemirror-configuration-in-typescript-project/2047/2
declare module 'codemirror';