An attempt at supporting multiple value sort (fixes #160)

esvit · Dec 28, 2013 · bf5c04e · bf5c04e
1 parent 107138b
commit bf5c04e
Show file tree

Hide file tree

Showing 27 changed files with 180 additions and 132 deletions.
diff --git a/examples/app/app.js b/examples/app/app.js
@@ -51,7 +51,7 @@ define([
         $scope.$watch('tableParams', function(params) {
             // use build-in angular filter
             var orderedData = params.sorting ? 
-                                $filter('orderBy')(data, params.orderBy()) :
+                                $filter('orderBy')(data, params.sorting()) :
                                 data;
             orderedData = params.filter ? 
                                 $filter('filter')(orderedData, params.filter) :
@@ -62,4 +62,4 @@ define([
         }, true);
     });
     return app;
-});
+});
diff --git a/examples/demo10.html b/examples/demo10.html
@@ -70,7 +70,7 @@ <h1>Table with checkboxes</h1>
             getData: function($defer, params) {
                 // use build-in angular filter
                 var orderedData = params.sorting() ?
-                        $filter('orderBy')(data, params.orderBy()) :
+                        $filter('orderBy')(data, params.sorting()) :
                         data;
                 orderedData = params.filter() ?
                         $filter('filter')(orderedData, params.filter()) :
@@ -149,4 +149,4 @@ <h1>Table with checkboxes</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo11.html b/examples/demo11.html
@@ -74,7 +74,7 @@ <h1>Custom filters</h1>
             getData: function($defer, params) {
                 // use build-in angular filter
                 var orderedData = params.sorting ?
-                        $filter('orderBy')(data, params.orderBy()) :
+                        $filter('orderBy')(data, params.sorting()) :
                         data;
                 orderedData = params.filter ?
                         $filter('filter')(orderedData, params.filter()) :
@@ -126,4 +126,4 @@ <h1>Custom filters</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo12.html b/examples/demo12.html
@@ -71,7 +71,7 @@ <h1>Table with grouping</h1>
                 total: data.length,
                 getData: function($defer, params) {
                     var orderedData = params.sorting() ?
-                            $filter('orderBy')(data, $scope.tableParams.orderBy()) :
+                            $filter('orderBy')(data, $scope.tableParams.sorting()) :
                             data;
 
                     $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -84,4 +84,4 @@ <h1>Table with grouping</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo13.html b/examples/demo13.html
@@ -74,7 +74,7 @@ <h1>Table with grouping with callback</h1>
                 total: data.length,
                 getData: function($defer, params) {
                     var orderedData = params.sorting() ?
-                            $filter('orderBy')(data, $scope.tableParams.orderBy()) :
+                            $filter('orderBy')(data, $scope.tableParams.sorting()) :
                             data;
 
                     $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -87,4 +87,4 @@ <h1>Table with grouping with callback</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo14.html b/examples/demo14.html
@@ -93,7 +93,7 @@ <h2>Dataset: <select ng-model="dataset" ng-options="ds for ds in datasets"></sel
                 getData: function($defer, params) {
                     var filteredData = getData();
                     var orderedData = params.sorting() ?
-                                        $filter('orderBy')(filteredData, params.orderBy()) :
+                                        $filter('orderBy')(filteredData, params.sorting()) :
                                         filteredData;
 
                     $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));

diff --git a/examples/demo18.html b/examples/demo18.html
@@ -89,7 +89,7 @@ <h1>Custom header</h1>
                         getData: function($defer, params) {
                             // use build-in angular filter
                             var orderedData = params.sorting() ?
-                                    $filter('orderBy')(data, params.orderBy()) :
+                                    $filter('orderBy')(data, params.sorting()) :
                                     data;
 
                             $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -102,4 +102,4 @@ <h1>Custom header</h1>
 
 
 </body>
-</html>
+</html>
diff --git a/examples/demo19.html b/examples/demo19.html
@@ -85,7 +85,7 @@ <h2>Table #2</h2>
                         getData: function($defer, params) {
                             // use build-in angular filter
                             var orderedData = params.sorting() ?
-                                    $filter('orderBy')(data, params.orderBy()) :
+                                    $filter('orderBy')(data, params.sorting()) :
                                     data;
                             orderedData = params.filter() ?
                                     $filter('filter')(orderedData, params.filter()) :
@@ -105,7 +105,7 @@ <h2>Table #2</h2>
                         getData: function($defer, params) {
                             // use build-in angular filter
                             var orderedData = params.sorting() ?
-                                    $filter('orderBy')(data, params.orderBy()) :
+                                    $filter('orderBy')(data, params.sorting()) :
                                     data;
                             orderedData = params.filter() ?
                                     $filter('filter')(orderedData, params.filter()) :
@@ -122,4 +122,4 @@ <h2>Table #2</h2>
 
 
 </body>
-</html>
+</html>
diff --git a/examples/demo20.html b/examples/demo20.html
@@ -84,7 +84,7 @@ <h1>Dynamic columns</h1>
                         getData: function($defer, params) {
                             // use build-in angular filter
                             var orderedData = params.sorting() ?
-                                    $filter('orderBy')(data, params.orderBy()) :
+                                    $filter('orderBy')(data, params.sorting()) :
                                     data;
 
                             $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -97,4 +97,4 @@ <h1>Dynamic columns</h1>
 
 
 </body>
-</html>
+</html>
diff --git a/examples/demo21.html b/examples/demo21.html
@@ -97,7 +97,7 @@ <h1>Dynamic grouping</h1>
                         total: function () { return $scope.rows.length; }, // length of data
                         getData: function($defer, params) {
                             var orderedData = params.sorting() ?
-                                    $filter('orderBy')($scope.rows, $scope.tableParams.orderBy()) :   $scope.rows;
+                                    $filter('orderBy')($scope.rows, $scope.tableParams.sorting()) :   $scope.rows;
 
                             $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
                         }
@@ -117,4 +117,4 @@ <h1>Dynamic grouping</h1>
 
 
 </body>
-</html>
+</html>
diff --git a/examples/demo22.html b/examples/demo22.html
@@ -208,7 +208,7 @@ <h1>Inline edit example by Maximilian Eberl</h1>
                     },{
                         total: data.length,
                         getData: function($defer, params) {
-                            var orderedData = params.sorting()?$filter('orderBy')(data, params.orderBy()):data;
+                            var orderedData = params.sorting()?$filter('orderBy')(data, params.sorting()):data;
                             $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
                         }
                     });
@@ -225,4 +225,4 @@ <h1>Inline edit example by Maximilian Eberl</h1>
 
 
 </body>
-</html>
+</html>
diff --git a/examples/demo23.html b/examples/demo23.html
@@ -76,7 +76,7 @@ <h1>Table combining sorting and filtering</h1>
                                     $filter('filter')(data, params.filter()) :
                                     data;
                             var orderedData = params.sorting() ?
-                                    $filter('orderBy')(filteredData, params.orderBy()) :
+                                    $filter('orderBy')(filteredData, params.sorting()) :
                                     data;
 
                             params.total(orderedData.length); // set total for recalc pagination

diff --git a/examples/demo24.html b/examples/demo24.html
@@ -90,7 +90,7 @@ <h1>Table with row selection</h1>
                                 $filter('filter')(data, params.filter()) :
                                 data;
                         var orderedData = params.sorting() ?
-                                $filter('orderBy')(filteredData, params.orderBy()) :
+                                $filter('orderBy')(filteredData, params.sorting()) :
                                 data;
 
                         params.total(orderedData.length); // set total for recalc pagination

diff --git a/examples/demo25.html b/examples/demo25.html
@@ -88,7 +88,7 @@ <h1>Table with custom header class</h1>
                                 $filter('filter')(data, params.filter()) :
                                 data;
                         var orderedData = params.sorting() ?
-                                $filter('orderBy')(filteredData, params.orderBy()) :
+                                $filter('orderBy')(filteredData, params.sorting()) :
                                 data;
 
                         params.total(orderedData.length); // set total for recalc pagination

diff --git a/examples/demo26.html b/examples/demo26.html
@@ -89,7 +89,7 @@ <h1>Table with custom header class</h1>
                                 $filter('filter')(data, params.filter()) :
                                 data;
                         var orderedData = params.sorting() ?
-                                $filter('orderBy')(filteredData, params.orderBy()) :
+                                $filter('orderBy')(filteredData, params.sorting()) :
                                 data;
 
                         params.total(orderedData.length); // set total for recalc pagination

diff --git a/examples/demo3.html b/examples/demo3.html
@@ -68,7 +68,7 @@ <h1>Table with sorting</h1>
                 getData: function($defer, params) {
                     // use build-in angular filter
                     var orderedData = params.sorting() ?
-                                        $filter('orderBy')(data, params.orderBy()) :
+                                        $filter('orderBy')(data, params.sorting()) :
                                         data;
 
                     $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));

diff --git a/examples/demo5.html b/examples/demo5.html
@@ -70,7 +70,7 @@ <h1>Saving params in url</h1>
 
                         // use build-in angular filter
                         var orderedData = params.sorting ?
-                                $filter('orderBy')(data, params.orderBy()) :
+                                $filter('orderBy')(data, params.sorting()) :
                                 data;
 
                         $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -84,4 +84,4 @@ <h1>Saving params in url</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo6.html b/examples/demo6.html
@@ -118,7 +118,7 @@ <h1>AJAX Data Loading</h1>
 
                     var params = new ngTableParams(requestParams);
                     data = params.filter() ? $filter('filter')(data, params.filter()) : data;
-                    data = params.sorting() ? $filter('orderBy')(data, params.orderBy()) : data;
+                    data = params.sorting() ? $filter('orderBy')(data, params.sorting()) : data;
 
                     var total = data.length;
                     data = data.slice((params.page() - 1) * params.count(), params.page() * params.count());
@@ -174,4 +174,4 @@ <h1>AJAX Data Loading</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo8.html b/examples/demo8.html
@@ -66,7 +66,7 @@ <h1>Cell Template</h1>
             getData: function($defer, params) {
                 // use build-in angular filter
                 var orderedData = params.sorting() ?
-                        $filter('orderBy')(data, params.orderBy()) :
+                        $filter('orderBy')(data, params.sorting()) :
                         data;
 
                 $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -112,4 +112,4 @@ <h1>Cell Template</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo9.html b/examples/demo9.html
@@ -66,7 +66,7 @@ <h1>Row Template</h1>
             getData: function($defer, params) {
                 // use build-in angular filter
                 var orderedData = params.sorting() ?
-                        $filter('orderBy')(data, params.orderBy()) :
+                        $filter('orderBy')(data, params.sorting()) :
                         data;
 
                 $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
@@ -84,4 +84,4 @@ <h1>Row Template</h1>
 
 
     </body>
-</html>
+</html>