imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into key-bindings

Browse source
This commit is contained in:
Clemens Zeidler 2021-03-12 16:44:12 +13:00
commit 2a21d45ac0
388 changed files with 4301 additions and 1549 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/SendMessageComposer.js
View file

@ -47,6 +47,7 @@ import CountlyAnalytics from "../../../CountlyAnalytics";
import {MatrixClientPeg} from "../../../MatrixClientPeg";
import EMOJI_REGEX from 'emojibase-regex';
import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager';
import {replaceableComponent} from "../../../utils/replaceableComponent";
import SettingsStore from '../../../settings/SettingsStore';
function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
@ -111,6 +112,7 @@ export function isQuickReaction(model) {
return false;
}
@replaceableComponent("views.rooms.SendMessageComposer")
export default class SendMessageComposer extends React.Component {
static propTypes = {
room: PropTypes.object.isRequired,