Fixed formatting of richText.js

This commit is contained in:
Andrey Okonetchnikov 2016-09-22 10:03:02 +02:00
parent 3e22b13612
commit d351f10a9b

View File

@ -15,7 +15,6 @@ import { Icon } from '../UI';
let processedPlugins = List([]); let processedPlugins = List([]);
const nodes = {}; const nodes = {};
let augmentedMarkdownSyntax = markdownSyntax; let augmentedMarkdownSyntax = markdownSyntax;
let augmentedHTMLSyntax = htmlSyntax; let augmentedHTMLSyntax = htmlSyntax;
@ -27,7 +26,7 @@ function processEditorPlugins(plugins) {
plugins.forEach(plugin => { plugins.forEach(plugin => {
const basicRule = MarkupIt.Rule(plugin.id).regExp(plugin.pattern, (state, match) => ( const basicRule = MarkupIt.Rule(plugin.id).regExp(plugin.pattern, (state, match) => (
{ data: plugin.fromBlock(match) } { data: plugin.fromBlock(match) }
)); ));
const markdownRule = basicRule.toText((state, token) => ( const markdownRule = basicRule.toText((state, token) => (
@ -68,8 +67,8 @@ function processMediaProxyPlugins(getMedia) {
} }
var imgData = Map({ var imgData = Map({
alt: match[1], alt: match[1],
src: match[2], src: match[2],
title: match[3] title: match[3]
}).filter(Boolean); }).filter(Boolean);
@ -78,9 +77,9 @@ function processMediaProxyPlugins(getMedia) {
}; };
}); });
const mediaProxyMarkdownRule = mediaProxyRule.toText((state, token) => { const mediaProxyMarkdownRule = mediaProxyRule.toText((state, token) => {
var data = token.getData(); var data = token.getData();
var alt = data.get('alt', ''); var alt = data.get('alt', '');
var src = data.get('src', ''); var src = data.get('src', '');
var title = data.get('title', ''); var title = data.get('title', '');
if (title) { if (title) {
@ -90,9 +89,9 @@ function processMediaProxyPlugins(getMedia) {
} }
}); });
const mediaProxyHTMLRule = mediaProxyRule.toText((state, token) => { const mediaProxyHTMLRule = mediaProxyRule.toText((state, token) => {
var data = token.getData(); var data = token.getData();
var alt = data.get('alt', ''); var alt = data.get('alt', '');
var src = data.get('src', ''); var src = data.get('src', '');
return `<img src=${getMedia(src)} alt=${alt} />`; return `<img src=${getMedia(src)} alt=${alt} />`;
}); });
@ -103,7 +102,7 @@ function processMediaProxyPlugins(getMedia) {
const className = isFocused ? 'active' : null; const className = isFocused ? 'active' : null;
const src = node.data.get('src'); const src = node.data.get('src');
return ( return (
<img {...props.attributes} src={getMedia(src)} className={className} /> <img {...props.attributes} src={getMedia(src)} className={className}/>
); );
}; };
augmentedMarkdownSyntax = augmentedMarkdownSyntax.addInlineRules(mediaProxyMarkdownRule); augmentedMarkdownSyntax = augmentedMarkdownSyntax.addInlineRules(mediaProxyMarkdownRule);
@ -111,9 +110,11 @@ function processMediaProxyPlugins(getMedia) {
} }
function getPlugins() { function getPlugins() {
return processedPlugins.map(plugin => ( return processedPlugins.map(plugin => ({
{ id: plugin.id, icon: plugin.icon, fields: plugin.fields } id: plugin.id,
)).toArray(); icon: plugin.icon,
fields: plugin.fields
})).toArray();
} }
function getNodes() { function getNodes() {
@ -124,7 +125,7 @@ function getSyntaxes(getMedia) {
if (getMedia) { if (getMedia) {
processMediaProxyPlugins(getMedia); processMediaProxyPlugins(getMedia);
} }
return { markdown: augmentedMarkdownSyntax, html:augmentedHTMLSyntax }; return { markdown: augmentedMarkdownSyntax, html: augmentedHTMLSyntax };
} }
export { processEditorPlugins, getNodes, getSyntaxes, getPlugins }; export { processEditorPlugins, getNodes, getSyntaxes, getPlugins };