Skip to content
Snippets Groups Projects
Commit 259e4016 authored by Karishma Chadha's avatar Karishma Chadha
Browse files

Revert "Merge pull request #2845 from kchadha/disable-sprite-restore" 

This reverts commit 1c20d6db, reversing
changes made to 2f1cce93.
parent f26e3c3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/components/menu-bar/menu-bar.jsx
+ 21
− 26
View file @ 259e4016
......@@ -145,9 +145,9 @@ class MenuBar extends React.Component {
this.props.onClickLanguage(e);
}
}
handleRestoreOption (restoreFun /* eslint-disable-line no-unused-vars */) {
handleRestoreOption (restoreFun) {
return () => {
// restoreFun(); TODO re-enable this when validation issues are fixed
restoreFun();
this.props.onRequestCloseEdit();
};
}
......@@ -301,30 +301,25 @@ class MenuBar extends React.Component {
place={this.props.isRtl ? 'left' : 'right'}
onRequestClose={this.props.onRequestCloseEdit}
>
<MenuItemTooltip
id="restore"
isRtl={this.props.isRtl}
>
<DeletionRestorer>{(handleRestore, {restorable /* eslint-disable-line no-unused-vars, max-len */, deletedItem}) => (
<MenuItem
className={classNames(styles.disabled)}
onClick={this.handleRestoreOption(handleRestore)}
>
{deletedItem === 'Sprite' ?
<FormattedMessage
defaultMessage="Restore Sprite"
description="Menu bar item for restoring the last deleted sprite."
id="gui.menuBar.restoreSprite"
/> :
<FormattedMessage
defaultMessage="Restore"
description="Menu bar item for restoring the last deleted item in its disabled state." /* eslint-disable-line max-len */
id="gui.menuBar.restore"
/>
}
</MenuItem>
)}</DeletionRestorer>
</MenuItemTooltip>
<DeletionRestorer>{(handleRestore, {restorable, deletedItem}) => (
<MenuItem
className={classNames({[styles.disabled]: !restorable})}
onClick={this.handleRestoreOption(handleRestore)}
>
{deletedItem === 'Sprite' ?
<FormattedMessage
defaultMessage="Restore Sprite"
description="Menu bar item for restoring the last deleted sprite."
id="gui.menuBar.restoreSprite"
/> :
<FormattedMessage
defaultMessage="Restore"
description="Menu bar item for restoring the last deleted item in its disabled state." /* eslint-disable-line max-len */
id="gui.menuBar.restore"
/>
}
</MenuItem>
)}</DeletionRestorer>
<MenuSection>
<TurboMode>{(toggleTurboMode, {turboMode}) => (
<MenuItem onClick={toggleTurboMode}>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment