Controller cleanup

js/app.js

@@ -2,7 +2,7 @@
 
 angular.module('dockerui', ['dockerui.services', 'dockerui.filters'])
     .config(['$routeProvider', function ($routeProvider) {
-        $routeProvider.when('/', {templateUrl: 'partials/home.html', controller: 'HomeController'});
+        $routeProvider.when('/', {templateUrl: 'partials/home.html', controller: 'DashboardController'});
         $routeProvider.when('/containers/', {templateUrl: 'partials/containers.html', controller: 'ContainersController'});
         $routeProvider.when('/containers/:id/', {templateUrl: 'partials/container.html', controller: 'ContainerController'});
         $routeProvider.when('/images/', {templateUrl: 'partials/images.html', controller: 'ImagesController'});

js/controllers.js

@@ -1,5 +1,4 @@
 
-// Controller for the top masthead
 function MastheadController($scope) {
     $scope.template = 'partials/masthead.html';
 
@@ -34,7 +33,7 @@ function MastheadController($scope) {
     };
 }
 
-function HomeController() {
+function DashboardController($scope, Container) {
     
 }
 
@@ -48,30 +47,18 @@ function SettingsController($scope, Auth, System, Docker, Settings) {
     $('#response').hide();
     $scope.alertClass = 'block';
 
-    var showAndHide = function(hide) {
-        $('#response').show();
-        if (hide) {
-            setTimeout(function() { $('#response').hide();}, 5000);
-        }
-    };
-
     $scope.updateAuthInfo = function() {
         if ($scope.auth.password != $scope.auth.cpassword) {
-            $scope.response = 'Your passwords do not match.';
+            setSuccessfulResponse($scope, 'Your passwords do not match.', '#response');
-            showAndHide(true);
             return;
         }
         Auth.update(
             {username: $scope.auth.username, email: $scope.auth.email, password: $scope.auth.password}, function(d) {
                 console.log(d);
-                $scope.alertClass = 'success';
+                setSuccessfulResponse($scope, 'Auto information updated.', '#response');
-                $scope.response = 'Auth information updated.';
-                showAndHide(true);
             }, function(e) {
                console.log(e);
-               $scope.alertClass = 'error';
+               setFailedResponse($scope, e.data, '#response');
-               $scope.response = e.data;
-               showAndHide(false);
             });    
     }; 
 
@@ -93,52 +80,33 @@ function ContainerController($scope, $routeParams, $location, Container) {
     $('#response').hide();
     $scope.alertClass = 'block';
 
-    var showAndHide = function(hide) {
-        $('#response').show();
-        if (hide) {
-            setTimeout(function() { $('#response').hide();}, 5000);
-        }
-    };
-
     $scope.start = function(){
         Container.start({id: $routeParams.id}, function(d) {
             console.log(d);
-            $scope.alertClass = 'success';
+            setSuccessfulResponse($scope, 'Container started.', '#response');
-            $scope.response = 'Container started.';
-            showAndHide(true);
         }, function(e) {
             console.log(e);
-            $scope.alertClass = 'error';
+            setFailedResponse($scope, e.data, '#response');
-            $scope.response = e.data;
-            showAndHide(false);
         }); 
     };
 
     $scope.stop = function() {
         Container.stop({id: $routeParams.id}, function(d) {
             console.log(d);
-            $scope.alertClass = 'success';
+            setSuccessfulResponse($scope, 'Container stopped.', '#response');
-            $scope.response = 'Container stopped.';
-            showAndHide(true);
         }, function(e) {
             console.log(e);
-            $scope.alertClass = 'error';
+            setFailedResponse($scope, e.data, '#response');
-            $scope.response = e.data;
-            showAndHide(false);
         });
     };
 
     $scope.kill = function() {
         Container.kill({id: $routeParams.id}, function(d) {
             console.log(d);
-            $scope.alertClass = 'success';
+            setSuccessfulResponse($scope, 'Container killed.', '#response');
-            $scope.response = 'Container killed.';
-            showAndHide(true);
         }, function(e) {
             console.log(e);
-            $scope.alertClass = 'error';
+            setFailedResponse($scope, e.data, '#response');
-            $scope.response = e.data;
-            showAndHide(false);
         });
     };
 
@@ -146,14 +114,10 @@ function ContainerController($scope, $routeParams, $location, Container) {
         if (confirm("Are you sure you want to remove the container?")) {
             Container.remove({id: $routeParams.id}, function(d) {
                 console.log(d);
-                $scope.alertClass = 'success';
+                setSuccessfulResponse($scope, 'Container removed.', '#response');
-                $scope.response = 'Container removed.';
-                showAndHide(true);
             }, function(e){
                 console.log(e);
-                $scope.alertClass = 'error';
+                setFailedResponse($scope, e.data, '#response');
-                $scope.response = e.data;
-                showAndHide(false);
             });
         }
     };
@@ -217,26 +181,15 @@ function ImageController($scope, $routeParams, $location, Image) {
 
     $('#response').hide();
     $scope.alertClass = 'block';
-
+    
-    var showAndHide = function(hide) {
-        $('#response').show();
-        if (hide) {
-            setTimeout(function() { $('#response').hide();}, 5000);
-        }
-    };
-
     $scope.remove = function() {
         if (confirm("Are you sure you want to delete this image?")) {
             Image.remove({id: $routeParams.id}, function(d) {
                 console.log(d);
-                $scope.alertClass = 'success';
+                setSuccessfulResponse($scope, 'Image removed.', '#response');
-                $scope.response = 'Image removed.';
-                showAndHide(true);
             }, function(e) {
                 console.log(e);
-                $scope.alertClass = 'error';
+                setFailedResponse($scope, e.data, '#response');
-                $scope.response = e.data;
-                showAndHide(false);
             }); 
         }
     };
@@ -251,14 +204,10 @@ function ImageController($scope, $routeParams, $location, Image) {
         var tag = $scope.tag;
         Image.tag({id: $routeParams.id, repo: tag.repo, force: tag.force ? 1 : 0}, function(d) {
             console.log(d);
-            $scope.alertClass = 'success';
+            setSuccessfulResponse($scope, 'Tag added.', '#response');
-            $scope.response = 'Tag added.';
-            showAndHide(true);
         }, function(e) {
             console.log(e);
-            $scope.alertClass = 'error';
+            setFailedResponse($scope, e.data, '#response');
-            $scope.response = e.data;
-            showAndHide(false);
         });
     };
     
@@ -314,3 +263,16 @@ function StartContainerController($scope, $routeParams, $location, Container) {
         });
     };
 }
+
+function setSuccessfulResponse($scope, msg, msgId) {
+    $scope.alertClass = 'success';
+    $scope.response = msg;
+    $(msgId).show();
+    setTimeout(function() { $(msgId).hide();}, 5000);
+}
+
+function setFailedResponse($scope, msg, msgId) {
+    $scope.alertClass = 'error';
+    $scope.response = msg;
+    $(msgId).show();
+}