docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/kitematic

This commit is contained in:
Jeffrey Morgan 2015-12-01 12:08:16 -08:00
parent 4e14413786 bc6c264989
commit f8746f4d66
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app.js
View File

@ -47,8 +47,7 @@ var router = Router.create({
router.run(Handler => React.render(<Handler/>, document.body)); router.run(Handler => React.render(<Handler/>, document.body));
routerContainer.set(router); routerContainer.set(router);
let setup = util.isLinux() ? setupUtil.nativeSetup : setupUtil.nonNativeSetup; setupUtil.setup().then(() => {
setup().then(() => {
Menu.setApplicationMenu(Menu.buildFromTemplate(template())); Menu.setApplicationMenu(Menu.buildFromTemplate(template()));
docker.init(); docker.init();
if (!hub.prompted() && !hub.loggedin()) { if (!hub.prompted() && !hub.loggedin()) {

4
src/utils/SetupUtil.js
View File

@ -51,6 +51,10 @@ export default {
return _retryPromise.promise; return _retryPromise.promise;
}, },
setup() {
return util.isLinux() ? this.nativeSetup() : this.nonNativeSetup();
},
async nativeSetup () { async nativeSetup () {
while (true) { while (true) {
try { try {