Merge pull request #116 from jeff-phillips-18/master

Fixes #115 - makes pfSimpleSort direction toggle work in Firefox

Author: Eleni Rundle

dist/angular-patternfly.js

@@ -4759,7 +4759,7 @@ angular.module('patternfly.views').directive('pfDataToolbar',
   'use strict';
 
   $templateCache.put('sort/simple-sort.html',
-    "<div class=simple-sort><form><div class=form-group><div class=\"dropdown btn-group\"><button type=button class=\"btn btn-default dropdown-toggle\" data-toggle=dropdown aria-haspopup=true aria-expanded=false>{{config.currentField.title}} <span class=caret></span></button><ul class=dropdown-menu><li ng-repeat=\"item in config.fields\" ng-class=\"{'selected': item === config.currentField}\"><a class=sort-field role=menuitem tabindex=-1 ng-click=selectField(item)>{{item.title}}</a></li></ul></div><button class=\"btn btn-link\" type=button><span class=sort-direction ng-class=getSortIconClass() ng-click=changeDirection()></span></button></div></form></div>"
+    "<div class=simple-sort><form><div class=form-group><div class=\"dropdown btn-group\"><button type=button class=\"btn btn-default dropdown-toggle\" data-toggle=dropdown aria-haspopup=true aria-expanded=false>{{config.currentField.title}} <span class=caret></span></button><ul class=dropdown-menu><li ng-repeat=\"item in config.fields\" ng-class=\"{'selected': item === config.currentField}\"><a class=sort-field role=menuitem tabindex=-1 ng-click=selectField(item)>{{item.title}}</a></li></ul></div><button class=\"btn btn-link\" type=button ng-click=changeDirection()><span class=sort-direction ng-class=getSortIconClass()></span></button></div></form></div>"
   );
 
 }]);

dist/angular-patternfly.min.js

@@ -14,8 +14,8 @@
           </li>
         </ul>
       </div>
-      <button class="btn btn-link" type="button">
-        <span class="sort-direction" ng-class="getSortIconClass()" ng-click="changeDirection()"></span>
+      <button class="btn btn-link" type="button"  ng-click="changeDirection()">
+        <span class="sort-direction" ng-class="getSortIconClass()"></span>
       </button>
     </div>
   </form>

src/sort/simple-sort.html

@@ -102,10 +102,12 @@ describe('Directive:  pfSimpleSort', function () {
   });
 
   it('should reverse the sort direction when the direction button is clicked', function () {
+    var sortButton = element.find('.simple-sort .btn.btn-link');
     var sortIcon = element.find('.simple-sort .fa-sort-alpha-asc');
+    expect(sortButton.length).toBe(1);
     expect(sortIcon.length).toBe(1);
 
-    eventFire(sortIcon[0], 'click');
+    eventFire(sortButton[0], 'click');
     $scope.$digest();
 
     sortIcon = element.find('.simple-sort .fa-sort-alpha-desc');
@@ -141,7 +143,7 @@ describe('Directive:  pfSimpleSort', function () {
     var notified = false;
     var chosenField = '';
     var chosenDir = '';
-    var sortIcon = element.find('.simple-sort .fa-sort-alpha-asc');
+    var sortButton = element.find('.simple-sort .btn.btn-link');
 
     var watchForNotify = function (sortField, isAscending) {
       notified = true;
@@ -151,9 +153,9 @@ describe('Directive:  pfSimpleSort', function () {
 
     $scope.sortConfig.onSortChange = watchForNotify;
 
-    expect(sortIcon.length).toBe(1);
+    expect(sortButton.length).toBe(1);
 
-    eventFire(sortIcon[0], 'click');
+    eventFire(sortButton[0], 'click');
     $scope.$digest();
 
     expect(notified).toBeTruthy();

test/sort/simple-sort.spec.js

@@ -389,9 +389,11 @@ describe('Directive:  pfDataToolbar', function () {
 
   it('should reverse the sort direction when the direction button is clicked', function () {
     var sortIcon = element.find('.simple-sort .fa-sort-alpha-asc');
+    var sortButton = element.find('.simple-sort .btn.btn-link');
     expect(sortIcon.length).toBe(1);
+    expect(sortButton.length).toBe(1);
 
-    eventFire(sortIcon[0], 'click');
+    eventFire(sortButton[0], 'click');
     $scope.$digest();
 
     sortIcon = element.find('.simple-sort .fa-sort-alpha-desc');
@@ -427,7 +429,7 @@ describe('Directive:  pfDataToolbar', function () {
     var notified = false;
     var chosenField = '';
     var chosenDir = '';
-    var sortIcon = element.find('.simple-sort .fa-sort-alpha-asc');
+    var sortButton = element.find('.simple-sort .btn.btn-link');
 
     var watchForNotify = function (sortField, isAscending) {
       notified = true;
@@ -437,9 +439,9 @@ describe('Directive:  pfDataToolbar', function () {
 
     $scope.config.sortConfig.onSortChange = watchForNotify;
 
-    expect(sortIcon.length).toBe(1);
+    expect(sortButton.length).toBe(1);
 
-    eventFire(sortIcon[0], 'click');
+    eventFire(sortButton[0], 'click');
     $scope.$digest();
 
     expect(notified).toBeTruthy();