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

fix($injector): do not use inherited $inject #15538

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/auto/injector.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ function annotate(fn, strictDi, name) {
last;

if (typeof fn === 'function') {
if (!($inject = fn.$inject)) {
$inject = fn.hasOwnProperty('$inject') ? fn.$inject : undefined;
if (!$inject) {
$inject = [];
if (fn.length) {
if (strictDi) {
Expand Down
15 changes: 15 additions & 0 deletions test/auto/injectorSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,21 @@ describe('injector', function() {
});


it('should not use inherited $inject', function() {
function base() {}
base.$inject = ['a'];
function derived(b) {}
if (Object.setPrototypeOf) {
Object.setPrototypeOf(derived, base);
} else {
/* eslint-disable no-proto */
derived.__proto__ = base;
/* eslint-enable */
}
expect(annotate(derived)).toEqual(['b']);
});


it('should create $inject', function() {
var extraParams = angular.noop;
/* eslint-disable space-before-function-paren */
Expand Down