From 2ed92d9d228845ea890985bd7d2621b22cd0dc94 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Mon, 27 Apr 2015 12:34:58 -0400
Subject: [PATCH] Fixing a few small button bugs

---
 package.json                                 | 2 +-
 src/app.js                                   | 5 +++--
 src/components/ContainerListNewItem.react.js | 7 +++++--
 src/components/Containers.react.js           | 4 ++--
 src/components/NewContainerPull.react.js     | 2 +-
 src/stores/ContainerStore.js                 | 1 +
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 35ae89fd23..aaee45e253 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
diff --git a/src/app.js b/src/app.js
index 5ec68f4bb4..c59815c5a2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -59,10 +59,11 @@ ipc.on('application:quitting', () => {
 // Event fires when the app receives a docker:// URL such as
 // docker://repository/run/redis
 ipc.on('application:open-url', opts => {
-  request.get('https://kitematic.com/flags.json', (flags, err) => {
-    if (err || !flags) {
+  request.get('https://kitematic.com/flags.json', (err, response, body) => {
+    if (err || response.statusCode !== 200) {
       return;
     }
+    var flags = JSON.parse(body);
     urlUtil.openUrl(opts.url, flags, app.getVersion());
   });
 });
diff --git a/src/components/ContainerListNewItem.react.js b/src/components/ContainerListNewItem.react.js
index d26c98ef32..ab64e5792e 100644
--- a/src/components/ContainerListNewItem.react.js
+++ b/src/components/ContainerListNewItem.react.js
@@ -5,6 +5,9 @@ var ContainerStore = require('../stores/ContainerStore');
 var metrics = require('../utils/MetricsUtil');
 
 var ContainerListNewItem = React.createClass({
+  contextTypes: {
+    router: React.PropTypes.func
+  },
   handleItemMouseEnter: function () {
     var $action = $(this.getDOMNode()).find('.action');
     $action.show();
@@ -20,10 +23,10 @@ var ContainerListNewItem = React.createClass({
       type: 'new'
     });
     var containers = ContainerStore.sorted();
-    $(self.getDOMNode()).fadeOut(300, function () {
+    $(self.getDOMNode()).fadeOut(300, () => {
       if (containers.length > 0) {
         var name = containers[0].Name;
-        self.transitionTo('containerHome', {name: name});
+        this.context.router.transitionTo('containerHome', {name: name});
       }
     });
   },
diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js
index 5549462f50..810d9f4a32 100644
--- a/src/components/Containers.react.js
+++ b/src/components/Containers.react.js
@@ -59,9 +59,9 @@ var Containers = React.createClass({
     });
     if (status === 'destroy') {
       if (sorted.length) {
-        this.transitionTo('containerHome', {name: sorted[0].Name});
+        this.context.router.transitionTo('containerHome', {name: sorted[0].Name});
       } else {
-        this.transitionTo('containers');
+        this.context.router.transitionTo('containers');
       }
     }
   },
diff --git a/src/components/NewContainerPull.react.js b/src/components/NewContainerPull.react.js
index e4da3fd9a3..33a3fcedc9 100644
--- a/src/components/NewContainerPull.react.js
+++ b/src/components/NewContainerPull.react.js
@@ -15,7 +15,7 @@ module.exports = React.createClass({
   },
   handleCancelClick: function () {
     ContainerStore.clearPending();
-    this.transitionTo('new');
+    this.context.router.transitionTo('new');
   },
   handleConfirmClick: function () {
     ContainerStore.clearPending();
diff --git a/src/stores/ContainerStore.js b/src/stores/ContainerStore.js
index 0d24c12530..6dcab31b03 100644
--- a/src/stores/ContainerStore.js
+++ b/src/stores/ContainerStore.js
@@ -307,6 +307,7 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), {
     var containerName = this._generateName(repository);
 
     _placeholders[containerName] = {
+      Id: require('crypto').randomBytes(32).toString('hex'),
       Name: containerName,
       Image: imageName,
       Config: {