File tree Expand file tree Collapse file tree 2 files changed +12
-7
lines changed Expand file tree Collapse file tree 2 files changed +12
-7
lines changed Original file line number Diff line number Diff line change @@ -4,11 +4,6 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4
4
5
5
module . exports = function ( defaults ) {
6
6
let app = new EmberAddon ( defaults , {
7
- 'ember-bootstrap' : {
8
- bootstrapVersion : 4 ,
9
- importBootstrapFont : false ,
10
- importBootstrapCSS : false
11
- } ,
12
7
svgJar : {
13
8
sourceDirs : [
14
9
'public' ,
Original file line number Diff line number Diff line change @@ -18,11 +18,21 @@ module.exports = {
18
18
]
19
19
} ,
20
20
googleFonts : [
21
- 'Roboto:400,700'
21
+ 'Roboto:400,700'
22
22
] ,
23
23
} ,
24
24
25
- included ( ) {
25
+ included ( app , parentAddon ) {
26
+ let target = ( app || parentAddon ) ;
27
+ target . options = target . options || { } ;
28
+
29
+ const defaultEmberBootStrapOptions = {
30
+ bootstrapVersion : 4 ,
31
+ importBootstrapFont : false ,
32
+ importBootstrapCSS : false
33
+ } ;
34
+ target . options [ 'ember-bootstrap' ] = target . options [ 'ember-bootstrap' ] || defaultEmberBootStrapOptions ;
35
+
26
36
this . _super . included . apply ( this , arguments ) ;
27
37
} ,
28
38
You can’t perform that action at this time.
0 commit comments