Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Convert StatusBarTileController hierarchy to React #549

Merged
merged 21 commits into from
Feb 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions lib/controllers/git-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export default class GitController extends React.Component {
workspace: React.PropTypes.object.isRequired,
commandRegistry: React.PropTypes.object.isRequired,
notificationManager: React.PropTypes.object.isRequired,
tooltips: React.PropTypes.object.isRequired,
confirm: React.PropTypes.func.isRequired,
repository: React.PropTypes.object,
resolutionProgress: React.PropTypes.object,
Expand Down Expand Up @@ -116,15 +117,14 @@ export default class GitController extends React.Component {
renderStatusBarTile() {
return (
<StatusBar statusBar={this.props.statusBar} onConsumeStatusBar={sb => this.onConsumeStatusBar(sb)}>
<EtchWrapper type="span">
<StatusBarTileController
workspace={this.props.workspace}
repository={this.props.repository}
commandRegistry={this.props.commandRegistry}
notificationManager={this.props.notificationManager}
toggleGitPanel={this.toggleGitPanel}
/>
</EtchWrapper>
<StatusBarTileController
workspace={this.props.workspace}
repository={this.props.repository}
commandRegistry={this.props.commandRegistry}
notificationManager={this.props.notificationManager}
tooltips={this.props.tooltips}
toggleGitPanel={this.toggleGitPanel}
/>
</StatusBar>
);
}
Expand Down
Loading