Extracting changeSorting into the Helper

lexandro · Jun 14, 2015 · ae20355 · ae20355
1 parent e7edf34
commit ae20355
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 24 deletions.
diff --git a/app/containers/containers.js b/app/containers/containers.js
@@ -14,13 +14,12 @@ angular.module('containers', ['ngRoute'])
             $scope.showAllContainersFlag = false;
             $scope.showContainerSizeFlag = false;
             $scope.selectAllFlag = false;
-            var sort = {};
             //
+            var sort = {};
             sort.column = 'Id'
             sort.direction = 'ascending';
             sort.desc = false;
             $scope.sort = sort;
-            console.log(JSON.stringify(sort));
             //
             refreshContainers();
             //
@@ -182,26 +181,8 @@ angular.module('containers', ['ngRoute'])
             };
 
             $scope.changeSorting = function (column) {
-                var sort = $scope.sort;
-                if (sort.column === column) {
-                    if (sort.direction === 'ascending') {
-                        sort.direction = 'descending';
-                        sort.desc = true;
-                    } else if (sort.direction === 'descending') {
-                        sort.column = null;
-                        sort.direction = null;
-                        sort.desc = null;
-                    }
-                } else {
-                    sort.column = column;
-                    sort.direction = 'ascending';
-                    sort.desc = false;
-
-                }
-                $scope.sort = sort;
-                console.log(JSON.stringify(sort));
+                $scope.sort = Helpers.changeSorting($scope.sort, column);
             };
-
         }
 
         function getContainerData(containerDataList, containerId) {

diff --git a/app/images/images.js b/app/images/images.js
@@ -14,13 +14,18 @@ angular.module('images', ['ngRoute'])
             $location.path('/hosts');
         } else {
             //
-
             $scope.showAllImagesFlag = false;
             $scope.showUntaggedImagesFlag = false;
             $scope.selectAllImagesFlag = false;
+            //
+            var sort = {};
+            sort.column = 'Id'
+            sort.direction = 'ascending';
+            sort.desc = false;
+            $scope.sort = sort;
+            //
             refreshImages();
-
-
+            //
             $scope.switchShowAllFlag = function () {
                 $scope.showAllImagesFlag = !$scope.showAllImagesFlag;
                 refreshImages();
@@ -39,6 +44,9 @@ angular.module('images', ['ngRoute'])
             };
         }
 
+        $scope.changeSorting = function (column) {
+            $scope.sort = Helpers.changeSorting($scope.sort, column);
+        };
 
         $scope.removeSelectedImages = function () {
             $scope.images.forEach(function (image) {

diff --git a/app/shared/services.js b/app/shared/services.js
@@ -24,6 +24,23 @@ angular.module('services', [])
                 var rx = new RegExp('^\/?[a-zA-Z0-9][a-zA-Z0-9_.-]+$');
 
                 return rx.test(containerName);
+            },
+            changeSorting: function (sort, column) {
+                if (sort.column === column) {
+                    if (sort.direction === 'ascending') {
+                        sort.direction = 'descending';
+                        sort.desc = true;
+                    } else if (sort.direction === 'descending') {
+                        sort.column = null;
+                        sort.direction = null;
+                        sort.desc = null;
+                    }
+                } else {
+                    sort.column = column;
+                    sort.direction = 'ascending';
+                    sort.desc = false;
+                }
+                return sort;
             }
         }
     })