Skip to content

Commit

Permalink
Merge pull request #4690 from himdel/npm-timeline
Browse files Browse the repository at this point in the history
bower to npm: patternfly-timeline (@pf3/timeline)
  • Loading branch information
mzazrivec authored Oct 5, 2018
2 parents af4fa22 + d5d31cf commit 80770b9
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@
//= require ./miq_explorer
//= require ./miq_timeline
//= require bower_components/manageiq-ui-components/dist/js/ui-components
//= require bower_components/patternfly-timeline/dist/timeline
//= require ui-select/dist/select
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*= require ./physical_infra_topology
*= require ./metrics
*= require ./service_dialogs
*= require bower_components/patternfly-timeline/dist/timeline
*= require @pf3/timeline/style
*= require bower_components/manageiq-ui-components/dist/css/ui-components
*= require ui-select/dist/select
*= require ./remote_console
Expand Down
2 changes: 2 additions & 0 deletions app/javascript/packs/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ window.moment = require('moment');
require("moment-strftime");
require("moment-timezone");
require("moment-duration-format")(window.moment);

require('@pf3/timeline');
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"tests"
],
"dependencies": {
"manageiq-ui-components": "bower-dev",
"patternfly-timeline": "~1.0.5"
"manageiq-ui-components": "bower-dev"
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"homepage": "https://github.com/ManageIQ/manageiq#readme",
"dependencies": {
"@manageiq/react-ui-components": "~0.10.8",
"@pf3/timeline": "~1.0.8",
"angular": "~1.6.6",
"angular-animate": "~1.6.6",
"angular-bootstrap-switch": "~0.5.2",
Expand Down
8 changes: 8 additions & 0 deletions spec/javascripts/globals_pack_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,12 @@ describe('packs/global.js', function() {
expect(angular.module('ui.bootstrap')).toBeDefined();
});
});

context('d3 plugins', function() {
it('loads patternfly-timeline', function() {
expect(d3.chart.timeline).toBeDefined();
expect(d3.chart.timeline().start).toBeDefined();
expect(d3.chart.timeline().end).toBeDefined();
});
});
});

0 comments on commit 80770b9

Please sign in to comment.