|
614 | 614 | try {
|
615 | 615 | var directive = angular.copy(originalDirectiveFactory)();
|
616 | 616 | directive.directiveName = directiveName;
|
617 |
| - if (directive.hasOwnProperty('css') && !arrayExists(arraySelect($directives, function(x) {return x.dir.directiveName}), directiveName)) { |
618 |
| - $directives.push({dir: directive, handled: false}); |
| 617 | + if (directive.hasOwnProperty('css') && !arrayExists(arraySelect($directives, function(x) {return x.ddo.directiveName}), directiveName)) { |
| 618 | + $directives.push({ ddo: directive, handled: false }); |
619 | 619 | }
|
620 | 620 | } catch (e) { }
|
621 | 621 | return originalDirective.apply(this, arguments);
|
622 | 622 | };
|
| 623 | + var originalComponent = module.component; |
| 624 | + module.component = function (componentName, componentObject) { |
| 625 | + componentObject.directiveName = componentName; |
| 626 | + if (componentObject.hasOwnProperty('css') && !arrayExists(arraySelect($directives, function(x) {return x.ddo.directiveName}), componentName)) { |
| 627 | + $directives.push({ ddo: componentObject, handled: false }); |
| 628 | + } |
| 629 | + return originalComponent.apply(this, arguments); |
| 630 | + }; |
623 | 631 | module.config(['$provide','$injector', function ($provide, $injector) {
|
624 | 632 | angular.forEach($directives, function ($dir) {
|
625 | 633 | if (!$dir.handled) {
|
626 |
| - var $directive = $dir.dir; |
| 634 | + var $directive = $dir.ddo; |
627 | 635 | var dirProvider = $directive.directiveName + 'Directive';
|
628 | 636 | if ($injector.has(dirProvider)) {
|
629 | 637 | $dir.handled = true;
|
630 | 638 | $provide.decorator(dirProvider, ['$delegate', '$rootScope', '$timeout', function ($delegate, $rootScope, $timeout) {
|
631 | 639 | var directive = $delegate[0];
|
632 | 640 | var compile = directive.compile;
|
633 |
| - if (directive.css) { |
634 |
| - $directive.css = directive.css; |
| 641 | + if (!directive.css) { |
| 642 | + directive.css = $directive.css; |
635 | 643 | }
|
636 | 644 | directive.compile = function() {
|
637 | 645 | var link = compile ? compile.apply(this, arguments): false;
|
|
0 commit comments