From 53c895e8078ae43f67b706816eead1cb87d929e1 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Sat, 15 Dec 2018 09:48:57 +0300 Subject: [PATCH] TASK: remove weird currentlyEditedPropertyNameIntermediate logic. The position of the switcher will soon change anyways --- packages/neos-ui-redux-store/src/CR/Nodes/index.ts | 6 ------ packages/neos-ui-redux-store/src/UI/ContentCanvas/index.js | 2 -- 2 files changed, 8 deletions(-) diff --git a/packages/neos-ui-redux-store/src/CR/Nodes/index.ts b/packages/neos-ui-redux-store/src/CR/Nodes/index.ts index abbb48d5ee..ebf2d13c6f 100644 --- a/packages/neos-ui-redux-store/src/CR/Nodes/index.ts +++ b/packages/neos-ui-redux-store/src/CR/Nodes/index.ts @@ -398,12 +398,6 @@ export const subReducer = (state: State = defaultState, action: InitAction | Act draft.focused.contextPath = contextPath; draft.focused.fusionPath = fusionPath; break; - // TODO: fix this code - // Set currentlyEditedPropertyName to currentlyEditedPropertyNameIntermediate and clear out currentlyEditedPropertyNameIntermediate - // This is needed because SET_CURRENTLY_EDITED_PROPERTY_NAME if fired before SET_FOCUS, but we still want to clear out currentlyEditedPropertyName - // when SET_FOCUS is triggered not from inline - // globalState.ui.contentCanvas.currentlyEditedPropertyName = globalState.ui.contentCanvas.currentlyEditedPropertyNameIntermediate; - // globalState.ui.contentCanvas.currentlyEditedPropertyNameIntermediate = ''; } case actionTypes.UNFOCUS: { draft.focused.contextPath = null; diff --git a/packages/neos-ui-redux-store/src/UI/ContentCanvas/index.js b/packages/neos-ui-redux-store/src/UI/ContentCanvas/index.js index 8d9901e55e..f8fb341107 100644 --- a/packages/neos-ui-redux-store/src/UI/ContentCanvas/index.js +++ b/packages/neos-ui-redux-store/src/UI/ContentCanvas/index.js @@ -89,8 +89,6 @@ export const reducer = handleActions({ [FORMATTING_UNDER_CURSOR]: ({formatting}) => $set('ui.contentCanvas.formattingUnderCursor', new Map(formatting)), [SET_CURRENTLY_EDITED_PROPERTY_NAME]: ({propertyName}) => $all( $set('ui.contentCanvas.currentlyEditedPropertyName', propertyName), - // See SET_FOCUS why it's needed - $set('ui.contentCanvas.currentlyEditedPropertyNameIntermediate', propertyName) ), [STOP_LOADING]: () => $set('ui.contentCanvas.isLoading', false), [START_LOADING]: () => $set('ui.contentCanvas.isLoading', true),