Skip to content

Commit 70ca227

Browse files
committed
Merge pull request #227 from karelhala/sort-directive-documentation-typo
Change sortId to currentField in sort directive
2 parents 7f9fd72 + b8768f0 commit 70ca227

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

dist/angular-patternfly.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -775,10 +775,12 @@ angular.module('patternfly.card').directive('pfCard', function () {
775775
var chart;
776776
//generate c3 chart data
777777
var chartData = scope.config;
778-
chartData.bindto = '#' + attrs.id;
779-
chart = c3.generate(chartData);
780-
if (scope.getChartCallback) {
781-
scope.getChartCallback(chart);
778+
if (chartData) {
779+
chartData.bindto = '#' + attrs.id;
780+
chart = c3.generate(chartData);
781+
if (scope.getChartCallback) {
782+
scope.getChartCallback(chart);
783+
}
782784
}
783785
});
784786
}, true);
@@ -4008,7 +4010,7 @@ angular.module('patternfly.select', []).directive('pfSelect', ["$timeout", funct
40084010
* <li>.title - (String) The title to display for the sort field
40094011
* <li>.sortType - (String) The sort type, 'alpha' or 'numeric'
40104012
* </ul>
4011-
* <li>.sortId - (Object) Id of the current sort field
4013+
* <li>.currentField - (Object) Currently selected field
40124014
* <li>.isAscending - (boolean) Current sort direction is ascending. True for ascending, False for descending
40134015
* <li>.onSortChange - ( function(sortId, sortDirection ) Function to call when the current sort params change
40144016
* </ul>

0 commit comments

Comments
 (0)