From 0bf099ec95f6af72d57b1d0330a4c3a9bca3db12 Mon Sep 17 00:00:00 2001
From: John Hoffman <john.matthew.hoffman@gmail.com>
Date: Fri, 28 Mar 2014 12:27:20 -0600
Subject: [PATCH 1/3] added support for an orderBy attribute for the tree
 control

---
 angular-tree-control.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/angular-tree-control.js b/angular-tree-control.js
index 840ff93..bfb63bd 100644
--- a/angular-tree-control.js
+++ b/angular-tree-control.js
@@ -108,10 +108,19 @@
                         return (this.$id == $scope.selectedScope)?"tree-selected" + injectSelectionClass:"";
                     };
 
+                    // orderBy clause (if any) for template
+                    var orderByClause = (function() {
+                      if (angular.isDefined($scope.orderBy)) {
+                        return " | orderBy:'" + $scope.orderBy + "'";
+                      } else {
+                        return '';
+                      }
+                    })();
+
                     //tree template
                     var template =
                         '<ul '+classIfDefined($scope.options.injectClasses.ul, true)+'>' +
-                            '<li ng-repeat="node in node.' + $scope.options.nodeChildren+'" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
+                            '<li ng-repeat="node in node.' + $scope.options.nodeChildren + orderByClause + '" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
                             '<i class="tree-branch-head" ng-class="iBranchClass()" ng-click="selectNodeHead(node)"></i>' +
                             '<i class="tree-leaf-head '+classIfDefined($scope.options.injectClasses.iLeaf, false)+'"></i>' +
                             '<div class="tree-label '+classIfDefined($scope.options.injectClasses.label, false)+'" ng-class="selectedClass()" ng-click="selectNodeLabel(node)" tree-transclude></div>' +

From d5e2b821d4e894de85f466277696bb2edce9963d Mon Sep 17 00:00:00 2001
From: John Hoffman <john.matthew.hoffman@gmail.com>
Date: Fri, 28 Mar 2014 14:49:35 -0600
Subject: [PATCH 2/3] added support for reverse ordering

---
 angular-tree-control.js      | 15 ++++-----------
 test/angular-tree-control.js | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/angular-tree-control.js b/angular-tree-control.js
index bfb63bd..55c3b90 100644
--- a/angular-tree-control.js
+++ b/angular-tree-control.js
@@ -31,7 +31,9 @@
                     treeModel: "=",
                     selectedNode: "=?",
                     onSelection: "&",
-                    options: "=?"
+                    options: "=?",
+                    orderBy: "@",
+                    reverseOrder: "@"
                 },
                 controller: function( $scope ) {
 
@@ -108,19 +110,10 @@
                         return (this.$id == $scope.selectedScope)?"tree-selected" + injectSelectionClass:"";
                     };
 
-                    // orderBy clause (if any) for template
-                    var orderByClause = (function() {
-                      if (angular.isDefined($scope.orderBy)) {
-                        return " | orderBy:'" + $scope.orderBy + "'";
-                      } else {
-                        return '';
-                      }
-                    })();
-
                     //tree template
                     var template =
                         '<ul '+classIfDefined($scope.options.injectClasses.ul, true)+'>' +
-                            '<li ng-repeat="node in node.' + $scope.options.nodeChildren + orderByClause + '" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
+                            '<li ng-repeat="node in node.' + $scope.options.nodeChildren + ' | orderBy:orderBy:reverseOrder" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
                             '<i class="tree-branch-head" ng-class="iBranchClass()" ng-click="selectNodeHead(node)"></i>' +
                             '<i class="tree-leaf-head '+classIfDefined($scope.options.injectClasses.iLeaf, false)+'"></i>' +
                             '<div class="tree-label '+classIfDefined($scope.options.injectClasses.label, false)+'" ng-class="selectedClass()" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
diff --git a/test/angular-tree-control.js b/test/angular-tree-control.js
index 558a82e..24bdab2 100644
--- a/test/angular-tree-control.js
+++ b/test/angular-tree-control.js
@@ -108,6 +108,25 @@ describe('unit testing angular tree control directive', function() {
       expect($rootScope.itemSelected).toHaveBeenCalledWith('node 1');
     });
 
+    if('should be able to order sibling nodes using orderBy and reverseOrder attributes', function() {
+      $rootScope.treedata = [
+        { label: "a", children: [] },
+        { label: "c", children: [] },
+        { label: "b", children: [] },
+      ];
+      $rootScope.predicate = 'label';
+      $rootScope.reverse = false;
+      element = $compile('<treecontrol tree-model="treedata" orderBy="{{predicate}}" reverseOrder="{{reverse}}">{{node.label}}</treecontrol>')($rootScope);
+      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');
+      $rootScope.reverse = true;
+      $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 () {
       $rootScope.treedata = createSubTree(2, 2);
       $rootScope.treedata.push({kinder: [{}]});

From 69bca9fee227a4295c2b42b76ee94b4fc95cba8d Mon Sep 17 00:00:00 2001
From: John Hoffman <john.matthew.hoffman@gmail.com>
Date: Fri, 28 Mar 2014 14:55:34 -0600
Subject: [PATCH 3/3] added order-by and reverse-order

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index edc6418..2173680 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,8 @@ Attributes of angular treecontrol
     - `labelSelected` : inhect classes into the div element around the label only when the node is selected
 - `on-selection` : function to call on the current `$scope` on node selection.
 - `selected-node` : parameter on the `$scope` to update with the current selection.
+- `order-by` : value for ng-repeat to use for ording sibling nodes
+- `reverse-order` : whether or not to reverse the ordering of sibling nodes based on the value of `order-by`
 
 ### The tree labels