fixed orderBy to work with the new introduced bugs in angular 1.3.x a…

…nd 1.4.x
dlinx · Nov 9, 2015 · 961dd7f · 961dd7f
1 parent 15319ce
commit 961dd7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/angular-tree-control.js b/angular-tree-control.js
@@ -242,8 +242,12 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                     };
 
                     //tree template
+                    $scope.isReverse = function() {
+                      return !($scope.reverseOrder === 'false' || $scope.reverseOrder === 'False' || $scope.reverseOrder === '' || $scope.reverseOrder === false);
+                    };
+
                     var templateOptions = {
-                        orderBy: $scope.orderBy ? ' | orderBy:orderBy:reverseOrder' : '',
+                        orderBy: $scope.orderBy ? " | orderBy:'"+$scope.orderBy+"':isReverse()" : '',
                         ulClass: classIfDefined($scope.options.injectClasses.ul, true),
                         nodeChildren:  $scope.options.nodeChildren,
                         liClass: classIfDefined($scope.options.injectClasses.li, true),

diff --git a/bower.json b/bower.json
@@ -16,10 +16,10 @@
     "karma.conf.js"
   ],
   "dependencies": {
-    "angular": "~1.2.7"
+    "angular": "~1.4.4"
   },
   "devDependencies": {
-    "angular-mocks": "~1.2.7",
+    "angular-mocks": "~1.4.4",
     "jquery": "~2.0.3",
     "bootstrap": "~3.1.1",
     "angular-bootstrap": "~0.11.0",

diff --git a/index.html b/index.html
@@ -1035,6 +1035,7 @@ <h1>Sorting tree nodes <small>(order-by, reserve-order)</small></h1>
         function Sorting($scope) {
             $scope.treedata=createSubTree(3, 4, "");
             $scope.reverse = true;
+
         }
     </script>
 </section>