Allow ordering by expression as well as string

wix-incubator · Mar 6, 2015 · 9ca7f55 · 9ca7f55
1 parent 7d9eac2
commit 9ca7f55
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -129,6 +129,7 @@ Attributes of angular treecontrol
     - `labelSelected` : inject classes into the div element around the label only when the node is selected
 - `order-by` : value for ng-repeat to use for ordering sibling nodes
 - `reverse-order` : whether or not to reverse the ordering of sibling nodes based on the value of `order-by`
+- `order-by-expression` : Expression evaluated by ng-repeat to use for ordering sibling nodes
 - `filter-expression` : value for ng-repeat to use for filtering the sibling nodes
 - `filter-comparator` : value for ng-repeat to use for comparing nodes with the filter expression
 

diff --git a/angular-tree-control.js b/angular-tree-control.js
@@ -36,6 +36,7 @@
                     onNodeToggle: "&",
                     options: "=?",
                     orderBy: "@",
+                    orderByExpression: "=?",
                     reverseOrder: "@",
                     filterExpression: "=?",
                     filterComparator: "=?"
@@ -197,7 +198,12 @@
                     };
 
                     //tree template
-                    var orderBy = $scope.orderBy ? ' | orderBy:orderBy:reverseOrder' : '';
+                    var orderBy = '';
+                    if ($scope.orderByExpression) {
+                        orderBy = ' | orderBy:orderByExpression:reverseOrder';
+                    } else if ($scope.orderBy) {
+                        orderBy = ' | orderBy:orderBy:reverseOrder';
+                    }
                     var template =
                         '<ul '+classIfDefined($scope.options.injectClasses.ul, true)+'>' +
                             '<li ng-repeat="node in node.' + $scope.options.nodeChildren + ' | filter:filterExpression:filterComparator ' + orderBy + '" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +

diff --git a/test/angular-tree-control-test.js b/test/angular-tree-control-test.js
@@ -1,5 +1,5 @@
 describe('treeControl', function() {
-    var $compile, $rootScope, element, num;
+    var $compile, $rootScope, orderBy, element, num;
 
     beforeEach(function () {
         module('treeControl');
@@ -357,34 +357,38 @@ describe('treeControl', function() {
             expect(element.find('li:eq(2)').text()).toBe('b');
         });
 
-        it('should order sibling nodes in normal order', function() {
-            $rootScope.treedata = [
-                { label: "a", children: [] },
-                { label: "c", children: [] },
-                { label: "b", children: [] }
-            ];
-            $rootScope.predicate = 'label';
-            $rootScope.reverse = false;
-            element = $compile('<treecontrol tree-model="treedata" order-by="{{predicate}}" reverse-order="{{reverse}}">{{node.label}}</treecontrol>')($rootScope);
-            $rootScope.$digest();
-            expect(element.find('li:eq(0)').text()).toBe('a');
-            expect(element.find('li:eq(1)').text()).toBe('b');
-            expect(element.find('li:eq(2)').text()).toBe('c');
-        });
-
-        it('should order sibling nodes in reverse order', function() {
-            $rootScope.treedata = [
-                { label: "a", children: [] },
-                { label: "c", children: [] },
-                { label: "b", children: [] }
-            ];
-            $rootScope.predicate = 'label';
-            $rootScope.reverse = true;
-            element = $compile('<treecontrol tree-model="treedata" order-by="{{predicate}}" reverse-order="{{reverse}}">{{node.label}}</treecontrol>')($rootScope);
-            $rootScope.$digest();
-            expect(element.find('li:eq(0)').text()).toBe('c');
-            expect(element.find('li:eq(1)').text()).toBe('b');
-            expect(element.find('li:eq(2)').text()).toBe('a');
+        [false, true].forEach(function (orderbyExpression) {
+            it('should order sibling nodes in normal order', function() {
+                $rootScope.treedata = [
+                    { label: "a", children: [] },
+                    { label: "c", children: [] },
+                    { label: "b", children: [] }
+                ];
+                $rootScope.predicate = 'label';
+                $rootScope.reverse = false;
+                orderBy = orderbyExpression ? 'order-by-expression="predicate"' : 'order-by="{{predicate}}"';
+                element = $compile('<treecontrol tree-model="treedata" ' + orderBy + ' reverse-order="{{reverse}}">{{node.label}}</treecontrol>')($rootScope);
+                $rootScope.$digest();
+                expect(element.find('li:eq(0)').text()).toBe('a');
+                expect(element.find('li:eq(1)').text()).toBe('b');
+                expect(element.find('li:eq(2)').text()).toBe('c');
+            });
+
+            it('should order sibling nodes in reverse order', function() {
+                $rootScope.treedata = [
+                    { label: "a", children: [] },
+                    { label: "c", children: [] },
+                    { label: "b", children: [] }
+                ];
+                $rootScope.predicate = 'label';
+                $rootScope.reverse = true;
+                orderBy = orderbyExpression ? 'order-by-expression="predicate"' : 'order-by="{{predicate}}"';
+                element = $compile('<treecontrol tree-model="treedata" ' + orderBy + ' reverse-order="{{reverse}}">{{node.label}}</treecontrol>')($rootScope);
+                $rootScope.$digest();
+                expect(element.find('li:eq(0)').text()).toBe('c');
+                expect(element.find('li:eq(1)').text()).toBe('b');
+                expect(element.find('li:eq(2)').text()).toBe('a');
+            });
         });
 
         it('should be able to accept alternative children variable name', function () {