mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u

Browse source 
Allow underline through MD and in RTE (MD) using <u> which works with CM
This commit is contained in:
Luke Barnard 2017-07-06 14:08:01 +01:00 committed by GitHub
commit 6404f7603c
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Markdown.js
View file

@ -17,7 +17,7 @@ limitations under the License.
import commonmark from 'commonmark'; import commonmark from 'commonmark';
import escape from 'lodash/escape'; import escape from 'lodash/escape';
const ALLOWED_HTML_TAGS = ['del']; const ALLOWED_HTML_TAGS = ['del', 'u'];
// These types of node are definitely text // These types of node are definitely text
const TEXT_NODES = ['text', 'softbreak', 'linebreak', 'paragraph', 'document']; const TEXT_NODES = ['text', 'softbreak', 'linebreak', 'paragraph', 'document'];

9
src/components/views/rooms/MessageComposer.js
View file

@ -21,7 +21,6 @@ import Modal from '../../../Modal';
import sdk from '../../../index'; import sdk from '../../../index';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import Autocomplete from './Autocomplete'; import Autocomplete from './Autocomplete';
import classNames from 'classnames';
import UserSettingsStore from '../../../UserSettingsStore'; import UserSettingsStore from '../../../UserSettingsStore';
@ -408,14 +407,10 @@ export default class MessageComposer extends React.Component {
const active = style.includes(name) || blockType === name; const active = style.includes(name) || blockType === name;
const suffix = active ? '-o-n' : ''; const suffix = active ? '-o-n' : '';
const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name); const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
const disabled = !this.state.inputState.isRichtextEnabled && 'underline' === name; const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
const className = classNames("mx_MessageComposer_format_button", {
mx_MessageComposer_format_button_disabled: disabled,
mx_filterFlipColor: true,
});
return <img className={className} return <img className={className}
title={ _t(name) } title={ _t(name) }
onMouseDown={disabled ? null : onFormatButtonClicked} onMouseDown={onFormatButtonClicked}
key={name} key={name}
src={`img/button-text-${name}${suffix}.svg`} src={`img/button-text-${name}${suffix}.svg`}
height="17" />; height="17" />;

4
src/components/views/rooms/MessageComposerInput.js
View file

@ -420,7 +420,7 @@ export default class MessageComposerInput extends React.Component {
const modifyFn = { const modifyFn = {
'bold': (text) => `**${text}**`, 'bold': (text) => `**${text}**`,
'italic': (text) => `*${text}*`, 'italic': (text) => `*${text}*`,
'underline': (text) => `_${text}_`, // there's actually no valid underline in Markdown, but *shrug* 'underline': (text) => `<u>${text}</u>`,
'strike': (text) => `<del>${text}</del>`, 'strike': (text) => `<del>${text}</del>`,
'code-block': (text) => `\`\`\`\n${text}\n\`\`\`\n`, 'code-block': (text) => `\`\`\`\n${text}\n\`\`\`\n`,
'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n', 'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
@ -431,7 +431,7 @@ export default class MessageComposerInput extends React.Component {
const selectionAfterOffset = { const selectionAfterOffset = {
'bold': -2, 'bold': -2,
'italic': -1, 'italic': -1,
'underline': -1, 'underline': -4,
'strike': -6, 'strike': -6,
'code-block': -5, 'code-block': -5,
'blockquote': -2, 'blockquote': -2,