Skip to content

Commit 131235b

Browse files
Update to use patternfly settings without jQuery
1 parent d9141b9 commit 131235b

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ require('angular-animate');
33
require('angular-sanitize');
44
require('angular-ui-bootstrap');
55
require('lodash');
6-
require('patternfly/dist/js/patternfly.min');
6+
require('patternfly/dist/js/patternfly-settings.min');
77
require('./dist/angular-patternfly');
8-
module.exports = 'angular-patternfly';
8+
module.exports = 'angular-patternfly';

src/charts/c3/c3-chart-defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function () {
22
'use strict';
33

4-
var patternflyDefaults = $().c3ChartDefaults();
4+
var patternflyDefaults = patternfly.c3ChartDefaults();
55

66
angular.module('patternfly.charts').constant('c3ChartDefaults', {
77
getDefaultColors: patternflyDefaults.getDefaultColors,

src/charts/c3/c3-chart.directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
$scope.total = 1000;
3939
$scope.available = $scope.total - $scope.used;
4040
41-
$scope.chartConfig = $().c3ChartDefaults().getDefaultDonutConfig('MHz Used');
41+
$scope.chartConfig = patternfly.c3ChartDefaults().getDefaultDonutConfig('MHz Used');
4242
$scope.chartConfig.data = {
4343
type: "donut",
4444
columns: [

src/charts/donut/donut-pct-chart-directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ angular.module('patternfly.charts').directive('pfDonutPctChart', function (pfUti
384384
$scope.config.data.onclick = $scope.config.onClickFn;
385385
};
386386

387-
$scope.config = pfUtils.merge($().c3ChartDefaults().getDefaultDonutConfig(), $scope.config);
387+
$scope.config = pfUtils.merge(patternfly.c3ChartDefaults().getDefaultDonutConfig(), $scope.config);
388388
$scope.updateAll($scope);
389389

390390

src/charts/line/line-chart.directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ angular.module('patternfly.charts').directive('pfLineChart', function (pfUtils)
174174
$scope.showYAxis = ($scope.config.showAxis !== undefined) && $scope.config.showAxis;
175175
}
176176

177-
$scope.defaultConfig = $().c3ChartDefaults().getDefaultLineConfig();
177+
$scope.defaultConfig = patternfly.c3ChartDefaults().getDefaultLineConfig();
178178
$scope.defaultConfig.axis = {
179179
x: {
180180
show: $scope.showXAxis === true,

src/charts/sparkline/sparkline-chart.directive.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ angular.module('patternfly.charts').directive('pfSparklineChart', function (pfUt
232232
'</tr>';
233233
break;
234234
default:
235-
tipRows = $().c3ChartDefaults().getDefaultSparklineTooltip().contents(d);
235+
tipRows = patternfly.c3ChartDefaults().getDefaultSparklineTooltip().contents(d);
236236
}
237237
}
238238
return $scope.getTooltipTableHTML(tipRows);
@@ -278,7 +278,7 @@ angular.module('patternfly.charts').directive('pfSparklineChart', function (pfUt
278278
$scope.showYAxis = ($scope.config.showAxis !== undefined) && $scope.config.showAxis;
279279
}
280280

281-
$scope.defaultConfig = $().c3ChartDefaults().getDefaultSparklineConfig();
281+
$scope.defaultConfig = patternfly.c3ChartDefaults().getDefaultSparklineConfig();
282282
$scope.defaultConfig.axis = {
283283
x: {
284284
show: $scope.showXAxis === true,

src/utils/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
return mergeDeep({}, angular.copy(source1), angular.copy(source2));
3131
},
3232

33-
colorPalette: $.pfPaletteColors
33+
colorPalette: patternfly.pfPaletteColors
3434
});
3535
})();
3636

0 commit comments

Comments
 (0)