coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into toc

Browse Source
This commit is contained in:
Tom Moor
2017-10-24 08:46:48 -07:00
committed by GitHub
parent 23c95f4d56 df3d73a2a2
commit 4f7e5b8122
62 changed files with 610 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/components/Editor/Editor.js
View File

@ -4,7 +4,7 @@ import { observable } from 'mobx';
import { observer } from 'mobx-react';
import { Editor, Plain } from 'slate';
import keydown from 'react-keydown';
import type { Document, State, Editor as EditorType } from './types';
import type { State, Editor as EditorType } from './types';
import getDataTransferFiles from 'utils/getDataTransferFiles';
import Flex from 'components/Flex';
import ClickablePadding from './components/ClickablePadding';
@ -50,7 +50,7 @@ type KeyData = {
onImageUploadStop: props.onImageUploadStop,
});
if (props.text) {
if (props.text.trim().length) {
this.editorState = Markdown.deserialize(props.text);
} else {
this.editorState = Plain.deserialize('');
@ -73,12 +73,12 @@ type KeyData = {
}
}
onChange = (editorState: State) => {
this.editorState = editorState;
};
onChange = (state: State) => {
if (this.editorState !== state) {
this.props.onChange(Markdown.serialize(state));
}
onDocumentChange = (document: Document, editorState: State) => {
this.props.onChange(Markdown.serialize(editorState));
this.editorState = editorState;
};
handleDrop = async (ev: SyntheticEvent) => {
@ -205,7 +205,6 @@ type KeyData = {
state={this.editorState}
onKeyDown={this.onKeyDown}
onChange={this.onChange}
onDocumentChange={this.onDocumentChange}
onSave={onSave}
readOnly={readOnly}
/>