Skip to content

Commit

Permalink
Fix render prop after Browse page merge
Browse files Browse the repository at this point in the history
  • Loading branch information
storrisi committed Dec 3, 2018
1 parent 899b2a4 commit 0cff7ca
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 27 deletions.
15 changes: 6 additions & 9 deletions src/components/Navigation/Pages/PageBrowse/ButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ export default class ButtonsBar extends Component {
const { hasChanges, revertAll, collapseAll, doPromptContribute } = this.props
return (
<div className="pull-right">
<ButtonWithTooltip
button={
<Button bsStyle="danger" disabled={hasChanges} onClick={revertAll}>
<i className="fas fa-undo" />
<span>&nbsp;Revert Changes</span>
</Button>
}
tooltip="Revert all changes of all the definitions"
/>
<ButtonWithTooltip tooltip="Revert all changes of all the definitions">
<Button bsStyle="danger" disabled={hasChanges} onClick={revertAll}>
<i className="fas fa-undo" />
<span>&nbsp;Revert Changes</span>
</Button>
</ButtonWithTooltip>
&nbsp;
<Button bsStyle="default" disabled={hasChanges} onClick={collapseAll}>
Collapse All
Expand Down
15 changes: 6 additions & 9 deletions src/components/Navigation/Pages/PageDefinitions/ButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ export default class ButtonsBar extends Component {
const { components, hasChanges, revertAll, doRefreshAll, collapseAll, onRemoveAll, doPromptContribute } = this.props
return (
<div className="pull-right">
<ButtonWithTooltip
button={
<Button bsStyle="danger" disabled={hasChanges} onClick={revertAll}>
<i className="fas fa-undo" />
<span>&nbsp;Revert Changes</span>
</Button>
}
tooltip="Revert all changes of all the definitions"
/>
<ButtonWithTooltip tooltip="Revert all changes of all the definitions">
<Button bsStyle="danger" disabled={hasChanges} onClick={revertAll}>
<i className="fas fa-undo" />
<span>&nbsp;Revert Changes</span>
</Button>
</ButtonWithTooltip>
&nbsp;
<Button bsStyle="default" disabled={hasChanges} onClick={doRefreshAll}>
Refresh
Expand Down
15 changes: 6 additions & 9 deletions src/components/Navigation/Sections/ButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ export default class ButtonsBar extends Component {
const { components, hasChanges, revertAll, doRefreshAll, collapseAll, onRemoveAll, doPromptContribute } = this.props
return (
<div className="pull-right">
<ButtonWithTooltip
button={
<Button bsStyle="danger" disabled={hasChanges} onClick={revertAll}>
<i className="fas fa-undo" />
<span>&nbsp;Revert Changes</span>
</Button>
}
tooltip="Revert all changes of all the definitions"
/>
<ButtonWithTooltip tooltip="Revert all changes of all the definitions">
<Button bsStyle="danger" disabled={hasChanges} onClick={revertAll}>
<i className="fas fa-undo" />
<span>&nbsp;Revert Changes</span>
</Button>
</ButtonWithTooltip>
&nbsp;
<Button bsStyle="default" disabled={hasChanges} onClick={doRefreshAll}>
Refresh
Expand Down

0 comments on commit 0cff7ca

Please sign in to comment.