Remove editing feature flag
Part of https://github.com/vector-im/riot-web/issues/10282pull/21833/head
							parent
							
								
									88a0dbe2f1
								
							
						
					
					
						commit
						25351d552e
					
				| 
						 | 
				
			
			@ -208,9 +208,6 @@ class MatrixClientPeg {
 | 
			
		|||
    }
 | 
			
		||||
 | 
			
		||||
    _createClient(creds: MatrixClientCreds) {
 | 
			
		||||
        const aggregateRelations = SettingsStore.isFeatureEnabled("feature_reactions");
 | 
			
		||||
        const enableEdits = SettingsStore.isFeatureEnabled("feature_message_editing");
 | 
			
		||||
 | 
			
		||||
        const opts = {
 | 
			
		||||
            baseUrl: creds.homeserverUrl,
 | 
			
		||||
            idBaseUrl: creds.identityServerUrl,
 | 
			
		||||
| 
						 | 
				
			
			@ -220,7 +217,7 @@ class MatrixClientPeg {
 | 
			
		|||
            timelineSupport: true,
 | 
			
		||||
            forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
 | 
			
		||||
            verificationMethods: [verificationMethods.SAS],
 | 
			
		||||
            unstableClientRelationAggregation: aggregateRelations || enableEdits,
 | 
			
		||||
            unstableClientRelationAggregation: true,
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        this.matrixClient = createMatrixClient(opts);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -110,7 +110,6 @@ module.exports = React.createClass({
 | 
			
		|||
    },
 | 
			
		||||
 | 
			
		||||
    componentWillMount: function() {
 | 
			
		||||
        this._editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
 | 
			
		||||
        // the event after which we put a visible unread marker on the last
 | 
			
		||||
        // render cycle; null if readMarkerVisible was false or the RM was
 | 
			
		||||
        // suppressed (eg because it was at the end of the timeline)
 | 
			
		||||
| 
						 | 
				
			
			@ -586,7 +585,7 @@ module.exports = React.createClass({
 | 
			
		|||
                <EventTile mxEvent={mxEv}
 | 
			
		||||
                    continuation={continuation}
 | 
			
		||||
                    isRedacted={mxEv.isRedacted()}
 | 
			
		||||
                    replacingEventId={this._editingEnabled && mxEv.replacingEventId()}
 | 
			
		||||
                    replacingEventId={mxEv.replacingEventId()}
 | 
			
		||||
                    editState={isEditing && this.props.editState}
 | 
			
		||||
                    onHeightChanged={this._onHeightChanged}
 | 
			
		||||
                    readReceipts={readReceipts}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -127,10 +127,6 @@ export default class MessageActionBar extends React.PureComponent {
 | 
			
		|||
        return SettingsStore.isFeatureEnabled("feature_reactions");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    isEditingEnabled() {
 | 
			
		||||
        return SettingsStore.isFeatureEnabled("feature_message_editing");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    renderReactButton() {
 | 
			
		||||
        if (!this.isReactionsEnabled()) {
 | 
			
		||||
            return null;
 | 
			
		||||
| 
						 | 
				
			
			@ -158,7 +154,7 @@ export default class MessageActionBar extends React.PureComponent {
 | 
			
		|||
                onClick={this.onReplyClick}
 | 
			
		||||
            />;
 | 
			
		||||
        }
 | 
			
		||||
        if (this.isEditingEnabled() && canEditContent(this.props.mxEvent)) {
 | 
			
		||||
        if (canEditContent(this.props.mxEvent)) {
 | 
			
		||||
            editButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_editButton"
 | 
			
		||||
                title={_t("Edit")}
 | 
			
		||||
                onClick={this.onEditClick}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -829,7 +829,7 @@ module.exports.haveTileForEvent = function(e) {
 | 
			
		|||
    if (e.isRedacted() && !isMessageEvent(e)) return false;
 | 
			
		||||
 | 
			
		||||
    // No tile for replacement events since they update the original tile
 | 
			
		||||
    if (e.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return false;
 | 
			
		||||
    if (e.isRelation("m.replace")) return false;
 | 
			
		||||
 | 
			
		||||
    const handler = getHandlerTile(e);
 | 
			
		||||
    if (handler === undefined) return false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1141,9 +1141,8 @@ export default class MessageComposerInput extends React.Component {
 | 
			
		|||
            if (!selection.anchor.isAtEndOfNode(document)) return;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
 | 
			
		||||
        const shouldSelectHistory = (editingEnabled && e.altKey) || !editingEnabled;
 | 
			
		||||
        const shouldEditLastMessage = editingEnabled && !e.altKey && up && !RoomViewStore.getQuotingEvent();
 | 
			
		||||
        const shouldSelectHistory = e.altKey;
 | 
			
		||||
        const shouldEditLastMessage = !e.altKey && up && !RoomViewStore.getQuotingEvent();
 | 
			
		||||
 | 
			
		||||
        if (shouldSelectHistory) {
 | 
			
		||||
            // Try select composer history
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -315,7 +315,6 @@
 | 
			
		|||
    "Custom user status messages": "Custom user status messages",
 | 
			
		||||
    "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
 | 
			
		||||
    "Render simple counters in room header": "Render simple counters in room header",
 | 
			
		||||
    "Edit messages after they have been sent (refresh to apply changes)": "Edit messages after they have been sent (refresh to apply changes)",
 | 
			
		||||
    "React to messages with emoji (refresh to apply changes)": "React to messages with emoji (refresh to apply changes)",
 | 
			
		||||
    "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
 | 
			
		||||
    "Use compact timeline layout": "Use compact timeline layout",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -114,12 +114,6 @@ export const SETTINGS = {
 | 
			
		|||
        supportedLevels: LEVELS_FEATURE,
 | 
			
		||||
        default: false,
 | 
			
		||||
    },
 | 
			
		||||
    "feature_message_editing": {
 | 
			
		||||
        isFeature: true,
 | 
			
		||||
        displayName: _td("Edit messages after they have been sent (refresh to apply changes)"),
 | 
			
		||||
        supportedLevels: LEVELS_FEATURE,
 | 
			
		||||
        default: true,
 | 
			
		||||
    },
 | 
			
		||||
    "feature_reactions": {
 | 
			
		||||
        isFeature: true,
 | 
			
		||||
        displayName: _td("React to messages with emoji (refresh to apply changes)"),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,7 +47,7 @@ export default function shouldHideEvent(ev) {
 | 
			
		|||
    if (ev.isRedacted() && !isEnabled('showRedactions')) return true;
 | 
			
		||||
 | 
			
		||||
    // Hide replacement events since they update the original tile (if enabled)
 | 
			
		||||
    if (ev.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return true;
 | 
			
		||||
    if (ev.isRelation("m.replace")) return true;
 | 
			
		||||
 | 
			
		||||
    const eventDiff = memberEventDiff(ev);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue