Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

PROOF OF CONCEPT #11775 (show module name for conflicting directives), DO NOT MERGE #11793

Closed
wants to merge 1 commit into from
Closed

PROOF OF CONCEPT #11775 (show module name for conflicting directives), DO NOT MERGE #11793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/auto/injector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,22 +722,23 @@ function createInjector(modulesToLoad, strictDi) {
if (loadedModules.get(module)) return;
loadedModules.put(module, true);

function runInvokeQueue(queue) {
function runInvokeQueue(queue, moduleFn) {
var i, ii;
for (i = 0, ii = queue.length; i < ii; i++) {
var invokeArgs = queue[i],
provider = providerInjector.get(invokeArgs[0]);

provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
var args = Array.prototype.slice.call(invokeArgs[2]);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not so sure I like adding another arg... But can't think of another way to do it.

args.push(moduleFn); // add the module function here
provider[invokeArgs[1]].apply(provider, args);
}
}

try {
if (isString(module)) {
moduleFn = angularModule(module);
runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
runInvokeQueue(moduleFn._invokeQueue);
runInvokeQueue(moduleFn._configBlocks);
runInvokeQueue(moduleFn._invokeQueue, moduleFn);
runInvokeQueue(moduleFn._configBlocks, moduleFn);
} else if (isFunction(module)) {
runBlocks.push(providerInjector.invoke(module));
} else if (isArray(module)) {
Expand Down
13 changes: 11 additions & 2 deletions src/ng/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
* {@link guide/directive} for more info.
* @returns {ng.$compileProvider} Self for chaining.
*/
this.directive = function registerDirective(name, directiveFactory) {
this.directive = function registerDirective(name, directiveFactory, ngModule) {
assertNotHasOwnProperty(name, 'directive');
if (isString(name)) {
assertValidDirectiveName(name);
Expand All @@ -837,6 +837,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
} else if (!directive.compile && directive.link) {
directive.compile = valueFn(directive.link);
}
directive.ngModule = ngModule;
directive.priority = directive.priority || 0;
directive.index = index;
directive.name = directive.name || name;
Expand Down Expand Up @@ -2299,7 +2300,15 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
function assertNoDuplicate(what, previousDirective, directive, element) {
if (previousDirective) {
throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
previousDirective.name, directive.name, what, startingTag(element));
getDirectiveLabel(previousDirective), getDirectiveLabel(directive), what, startingTag(element));
}

function getDirectiveLabel(dir) {
if (dir.ngModule) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forced to do this check because sometimes the directive function can be called without passing an ngModule.

return dir.name + ' (module: ' + dir.ngModule.name + ')';
} else {
return dir.name;
}
}
}

Expand Down
7 changes: 4 additions & 3 deletions test/ng/compileSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,6 +2113,7 @@ describe('$compile', function() {
var iscope;

beforeEach(module(function() {
var fakeModule = {name: 'fakeModule'};
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Faking out a module to pass to the directive function so the test will show the result of passing a module.

forEach(['', 'a', 'b'], function(name) {
directive('scope' + uppercase(name), function(log) {
return {
Expand All @@ -2125,7 +2126,7 @@ describe('$compile', function() {
}};
}
};
});
}, fakeModule);
directive('iscope' + uppercase(name), function(log) {
return {
scope: {},
Expand All @@ -2138,7 +2139,7 @@ describe('$compile', function() {
};
}
};
});
}, fakeModule);
directive('tscope' + uppercase(name), function(log) {
return {
scope: true,
Expand Down Expand Up @@ -2320,7 +2321,7 @@ describe('$compile', function() {
function($rootScope, $compile) {
expect(function() {
$compile('<div class="iscope-a; scope-b"></div>');
}).toThrowMinErr('$compile', 'multidir', 'Multiple directives [iscopeA, scopeB] asking for new/isolated scope on: ' +
}).toThrowMinErr('$compile', 'multidir', 'Multiple directives [iscopeA (module: fakeModule), scopeB (module: fakeModule)] asking for new/isolated scope on: ' +
'<div class="iscope-a; scope-b">');
})
);
Expand Down