Skip to content

Change sortId to currentField in sort directive #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2016
Merged

Change sortId to currentField in sort directive #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions dist/angular-patternfly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,10 +775,12 @@ angular.module('patternfly.card').directive('pfCard', function () {
var chart;
//generate c3 chart data
var chartData = scope.config;
chartData.bindto = '#' + attrs.id;
chart = c3.generate(chartData);
if (scope.getChartCallback) {
scope.getChartCallback(chart);
if (chartData) {
chartData.bindto = '#' + attrs.id;
chart = c3.generate(chartData);
if (scope.getChartCallback) {
scope.getChartCallback(chart);
}
}
Copy link
Member

@jeff-phillips-18 jeff-phillips-18 Apr 28, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an issue with a rebase here. This is re-adding the change from #226.

EDIT:

Actually, looks like #226 did not include the dist files as necessary. Please leave this change so that it does make it in.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I figured that #226 did not included dist folder. I'll keep it in.

});
}, true);
Expand Down Expand Up @@ -4008,7 +4010,7 @@ angular.module('patternfly.select', []).directive('pfSelect', ["$timeout", funct
* <li>.title - (String) The title to display for the sort field
* <li>.sortType - (String) The sort type, 'alpha' or 'numeric'
* </ul>
* <li>.sortId - (Object) Id of the current sort field
* <li>.currentField - (Object) Currently selected field
* <li>.isAscending - (boolean) Current sort direction is ascending. True for ascending, False for descending
* <li>.onSortChange - ( function(sortId, sortDirection ) Function to call when the current sort params change
* </ul>
Expand Down
Loading