mirror of https://github.com/docker/docs.git
Merge branch 'master' into fix-log-scroll
Conflicts: src/NewContainer.react.js
This commit is contained in:
commit
fb5c472e73
|
@ -5,8 +5,6 @@ var RetinaImage = require('react-retina-image');
|
||||||
var Radial = require('./Radial.react');
|
var Radial = require('./Radial.react');
|
||||||
var ImageCard = require('./ImageCard.react');
|
var ImageCard = require('./ImageCard.react');
|
||||||
var Promise = require('bluebird');
|
var Promise = require('bluebird');
|
||||||
var assign = require('object-assign');
|
|
||||||
var ContainerStore = require('./ContainerStore');
|
|
||||||
|
|
||||||
var _recommended = [];
|
var _recommended = [];
|
||||||
var _searchPromise = null;
|
var _searchPromise = null;
|
||||||
|
@ -16,7 +14,6 @@ var NewContainer = React.createClass({
|
||||||
return {
|
return {
|
||||||
query: '',
|
query: '',
|
||||||
loading: false,
|
loading: false,
|
||||||
tags: {},
|
|
||||||
results: _recommended
|
results: _recommended
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -93,26 +90,6 @@ var NewContainer = React.createClass({
|
||||||
}
|
}
|
||||||
this.search(query);
|
this.search(query);
|
||||||
},
|
},
|
||||||
handleClick: function (name) {
|
|
||||||
ContainerStore.create(name, 'latest', function (err) {
|
|
||||||
if (err) {
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
$(document.body).find('.new-container-item').parent().fadeOut();
|
|
||||||
}.bind(this));
|
|
||||||
},
|
|
||||||
handleDropdownClick: function (name) {
|
|
||||||
if (this.state.tags[name]) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$.get('https://registry.hub.docker.com/v1/repositories/' + name + '/tags', function (result) {
|
|
||||||
var res = {};
|
|
||||||
res[name] = result;
|
|
||||||
this.setState({
|
|
||||||
tags: assign(this.state.tags, res)
|
|
||||||
});
|
|
||||||
}.bind(this));
|
|
||||||
},
|
|
||||||
render: function () {
|
render: function () {
|
||||||
var title = this.state.query ? 'Results' : 'Recommended';
|
var title = this.state.query ? 'Results' : 'Recommended';
|
||||||
var data = this.state.results;
|
var data = this.state.results;
|
||||||
|
|
Loading…
Reference in New Issue