fix: modify CSS loaded for modules with dependencies

- Modify loading of CSS to be purely in the index.js files for modules that depend on other modules with CSS files

Closes #5698

Author: Wei Wang

README.md

@@ -117,6 +117,8 @@ If you would prefer not to load your css through your JavaScript file loader/bun
 * carousel
 * datepicker
 * datepickerPopup
+* dropdown
+* popover
 * position
 * timepicker
 * tooltip

src/datepickerPopup/index-nocss.js

@@ -1,5 +1,5 @@
-require('../datepicker');
-require('../position');
+require('../datepicker/index-nocss.js');
+require('../position/index-nocss.js');
 require('../../template/datepickerPopup/popup.html.js');
 
 var MODULE_NAME = 'ui.bootstrap.module.datepickerPopup';

src/datepickerPopup/index.js

@@ -1,2 +1,4 @@
+require('../datepicker/datepicker.css');
+require('../position/position.css');
 require('./popup.css');
 module.exports = require('./index-nocss.js');

src/dropdown/index-nocss.js

@@ -0,0 +1,8 @@
+require('../position/index-nocss.js');
+require('./dropdown');
+
+var MODULE_NAME = 'ui.bootstrap.module.dropdown';
+
+angular.module(MODULE_NAME, ['ui.bootstrap.dropdown']);
+
+module.exports = MODULE_NAME;

src/dropdown/index.js

@@ -1,8 +1,2 @@
-require('../position');
-require('./dropdown');
-
-var MODULE_NAME = 'ui.bootstrap.module.dropdown';
-
-angular.module(MODULE_NAME, ['ui.bootstrap.dropdown']);
-
-module.exports = MODULE_NAME;
+require('../position/position.css');
+module.exports = require('./index-nocss.js');

src/popover/index-nocss.js

@@ -0,0 +1,11 @@
+require('../tooltip/index-nocss.js');
+require('../../template/popover/popover.html.js');
+require('../../template/popover/popover-html.html.js');
+require('../../template/popover/popover-template.html.js');
+require('./popover');
+
+var MODULE_NAME = 'ui.bootstrap.module.popover';
+
+angular.module(MODULE_NAME, ['ui.bootstrap.popover', 'uib/template/popover/popover.html', 'uib/template/popover/popover-html.html', 'uib/template/popover/popover-template.html']);
+
+module.exports = MODULE_NAME;

src/popover/index.js

@@ -1,11 +1,2 @@
-require('../tooltip');
-require('../../template/popover/popover.html.js');
-require('../../template/popover/popover-html.html.js');
-require('../../template/popover/popover-template.html.js');
-require('./popover');
-
-var MODULE_NAME = 'ui.bootstrap.module.popover';
-
-angular.module(MODULE_NAME, ['ui.bootstrap.popover', 'uib/template/popover/popover.html', 'uib/template/popover/popover-html.html', 'uib/template/popover/popover-template.html']);
-
-module.exports = MODULE_NAME;
+require('../tooltip/tooltip.css');
+module.exports = require('./index-nocss.js');

src/tooltip/index-nocss.js

@@ -1,4 +1,4 @@
-require('../position');
+require('../position/index-nocss.js');
 require('../stackedMap');
 require('../../template/tooltip/tooltip-popup.html.js');
 require('../../template/tooltip/tooltip-html-popup.html.js');

src/tooltip/index.js

@@ -1,2 +1,3 @@
+require('../position/position.css');
 require('./tooltip.css');
 module.exports = require('./index-nocss.js');

src/typeahead/index-nocss.js

@@ -1,5 +1,5 @@
 require('../debounce');
-require('../position');
+require('../position/index-nocss.js');
 require('../../template/typeahead/typeahead-match.html.js');
 require('../../template/typeahead/typeahead-popup.html.js');
 require('./typeahead');

src/typeahead/index.js

@@ -1,2 +1,3 @@
+require('../position/position.css');
 require('./typeahead.css');
 module.exports = require('./index-nocss.js');