From fd30c0fef65a968c522c9df26bb14c50ca165415 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Mon, 25 May 2015 15:27:49 -0700
Subject: [PATCH] Fixing minor bugs

---
 src/components/NewContainerSearch.react.js |  2 +-
 src/utils/DockerUtil.js                    | 10 +++++++---
 src/utils/RegHubUtil.js                    |  9 ++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/NewContainerSearch.react.js b/src/components/NewContainerSearch.react.js
index a66ca0e718..3aa7ca5776 100644
--- a/src/components/NewContainerSearch.react.js
+++ b/src/components/NewContainerSearch.react.js
@@ -96,7 +96,7 @@ module.exports = React.createClass({
   render: function () {
     let filter = this.getQuery().filter || 'all';
     let repos = _.values(this.state.repos)
-        .filter(repo => repo.name.indexOf(this.state.query) !== -1 || repo.namespace.indexOf(this.state.query) !== -1)
+        .filter(repo => repo.name.toLowerCase().indexOf(this.state.query.toLowerCase()) !== -1 || repo.namespace.toLowerCase().indexOf(this.state.query.toLowerCase()) !== -1)
         .filter(repo => filter === 'all' || (filter === 'recommended' && repo.is_recommended) || (filter === 'userrepos' && repo.is_user_repo));
 
     let results;
diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js
index 47c0d0757d..103cedee73 100644
--- a/src/utils/DockerUtil.js
+++ b/src/utils/DockerUtil.js
@@ -373,10 +373,14 @@ export default {
           if (!columns.progress) {
             columns.progress = []; // layerIDs, nbLayers, maxLayers, progress value
             let layersToLoad = _.keys(layerProgress).length;
+            let layersPerColumn = Math.floor(layersToLoad / columns.amount);
+            let leftOverLayers = layersToLoad % columns.amount;
             for (let i = 0; i < columns.amount; i++) {
-              let layerAmount = Math.ceil(layersToLoad / (columns.amount - i));
-              layersToLoad -= layerAmount;
-              columns.progress[i] = {layerIDs:[], nbLayers:0, maxLayers:layerAmount, value:0.0};
+              let layerAmount = layersPerColumn;
+              if (i < leftOverLayers) {
+                layerAmount += 1;
+              }
+              columns.progress[i] = {layerIDs: [], nbLayers:0, maxLayers: layerAmount, value: 0.0};
             }
           }
 
diff --git a/src/utils/RegHubUtil.js b/src/utils/RegHubUtil.js
index 662f090fd2..0ecb9add7b 100644
--- a/src/utils/RegHubUtil.js
+++ b/src/utils/RegHubUtil.js
@@ -5,6 +5,8 @@ var util = require('../utils/Util');
 var repositoryServerActions = require('../actions/RepositoryServerActions');
 var tagServerActions = require('../actions/TagServerActions');
 
+let searchReq = null;
+
 module.exports = {
   // Normalizes results from search to v2 repository results
   normalize: function (repo) {
@@ -21,11 +23,16 @@ module.exports = {
   },
 
   search: function (query, page) {
+    if (searchReq) {
+      searchReq.abort();
+      searchReq = null;
+    }
+
     if (!query) {
       repositoryServerActions.resultsUpdated({repos: []});
     }
 
-    request.get({
+    searchReq = request.get({
       url: 'https://registry.hub.docker.com/v1/search?',
       qs: {q: query, page}
     }, (error, response, body) => {