Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add redux-devtools-extension trace feature in development mode if available. #3661

Closed
wants to merge 17 commits into from
Closed

Add redux-devtools-extension trace feature in development mode if available. #3661

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3a328bc
Added devToolsTrace prop to CoreAdmin
WiXSL Sep 9, 2019
7eb7d92
Added devToolsTrace prop to allow Redux DevTools Trace to be enable.
WiXSL Sep 9, 2019
aaac598
Changes suggested by Prettier
WiXSL Sep 9, 2019
6c5e0c6
Changes suggested by Prettier
WiXSL Sep 9, 2019
d3947dc
More Prettier suggestions.
WiXSL Sep 9, 2019
365dc95
Removed trailing space.
WiXSL Sep 9, 2019
9bdac1c
Revert #3661
WiXSL Sep 12, 2019
a28a341
Add DevTools trace feature in development mode if available.
WiXSL Sep 12, 2019
7d5ba54
Corrected parentheses
WiXSL Sep 12, 2019
0b697a0
Prettier suggestions
WiXSL Sep 12, 2019
8cb7da3
Prettier suggestion.
WiXSL Sep 12, 2019
0c88b09
Merge remote-tracking branch 'upstream/next' into next
Sep 14, 2019
21d28ba
Add custom icons for Confirm action buttons.
Sep 14, 2019
317553e
Revert changes for Confirm Component.
Sep 14, 2019
2a54d29
Add custom icons for Confirm action buttons.
Sep 14, 2019
f5b5618
Revert changes for Confirm Component.
Sep 14, 2019
ba24b16
Merge pull request #3 from marmelab/next
WiXSL Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert changes for Confirm Component.
  • Loading branch information
asvarcas committed Sep 14, 2019
commit f5b5618fc8c60b07020f8226417fbcfef36f7b3b
10 changes: 2 additions & 8 deletions packages/ra-ui-materialui/src/layout/Confirm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ const Confirm = ({
confirm,
cancel,
confirmColor,
ConfirmIcon,
CancelIcon,
onClose,
onConfirm,
classes: classesOverride,
Expand Down Expand Up @@ -100,7 +98,7 @@ const Confirm = ({
</DialogContent>
<DialogActions>
<Button disabled={loading} onClick={onClose}>
<CancelIcon className={classes.iconPaddingStyle} />
<AlertError className={classes.iconPaddingStyle} />
{translate(cancel, { _: cancel })}
</Button>
<Button
Expand All @@ -112,7 +110,7 @@ const Confirm = ({
})}
autoFocus
>
<ConfirmIcon className={classes.iconPaddingStyle} />
<ActionCheck className={classes.iconPaddingStyle} />
{translate(confirm, { _: confirm })}
</Button>
</DialogActions>
Expand All @@ -125,8 +123,6 @@ Confirm.propTypes = {
classes: PropTypes.object,
confirm: PropTypes.string.isRequired,
confirmColor: PropTypes.string.isRequired,
ConfirmIcon: PropTypes.elementType.isRequired,
CancelIcon: PropTypes.elementType.isRequired,
content: PropTypes.string.isRequired,
isOpen: PropTypes.bool,
loading: PropTypes.bool,
Expand All @@ -140,8 +136,6 @@ Confirm.defaultProps = {
classes: {},
confirm: 'ra.action.confirm',
confirmColor: 'primary',
ConfirmIcon: ActionCheck,
CancelIcon: AlertError,
isOpen: false,
};

Expand Down