Merge pull request #549 from atom/aw-etch-a-sketch

Convert StatusBarTileController hierarchy to React
atom · Feb 24, 2017 · e438fed · e438fed
2 parents 6c0565f + 7406952
commit e438fed
Show file tree

Hide file tree

Showing 14 changed files with 631 additions and 557 deletions.
diff --git a/lib/controllers/git-controller.js b/lib/controllers/git-controller.js
@@ -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,
@@ -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>
     );
   }