1
0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00

Merge remote-tracking branch 'origin/sean-polish'

Conflicts:
src/Radial.react.js
src/Setup.react.js
styles/radial.less
This commit is contained in:
Jeffrey Morgan
2015-02-13 10:44:00 -08:00
parent e8f87e1ebe
commit c338678094
24 changed files with 1482 additions and 365 deletions

View File

@@ -20,7 +20,7 @@ var Containers = React.createClass({
ContainerStore.on(ContainerStore.CLIENT_CONTAINER_EVENT, this.updateFromClient);
if (this.state.sorted.length) {
this.transitionTo('container', {name: this.state.sorted[0].Name});
this.transitionTo('containerHome', {name: this.state.sorted[0].Name});
}
},
componentDidUnmount: function () {
@@ -34,7 +34,7 @@ var Containers = React.createClass({
});
if (status === 'destroy') {
if (this.state.sorted.length) {
this.transitionTo('container', {name: this.state.sorted[0].Name});
this.transitionTo('containerHome', {name: this.state.sorted[0].Name});
} else {
this.transitionTo('containers');
}
@@ -46,7 +46,7 @@ var Containers = React.createClass({
sorted: ContainerStore.sorted()
});
if (status === 'create') {
this.transitionTo('container', {name: name});
this.transitionTo('containerHome', {name: name});
}
},
handleScroll: function (e) {