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

Commit

Permalink
fix($compile): bind all directive controllers correctly when using `b…
Browse files Browse the repository at this point in the history
…indToController`

Previously only the first directive's controller would be bound correctly.

Closes #11343
Closes #11345
  • Loading branch information
petebacondarwin committed Nov 10, 2015
1 parent 50557a6 commit bd7b217
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/ng/compileSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4482,7 +4482,7 @@ describe('$compile', function() {
'str': '@fooStr',
'fn': '&fooFn'
},
scope: true,
scope: {},
controllerAs: 'fooCtrl',
controller: function() {
expect(this.data).toEqualData({'foo': 'bar', 'baz': 'biz'});
Expand Down

5 comments on commit bd7b217

@Narretz
Copy link
Contributor

Choose a reason for hiding this comment

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

That's a bit awkward, as it is just a correction in a test ...

@petebacondarwin
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean the commit message?
I just copied the main commit message as this will get squashed when merging the PR.

@Narretz
Copy link
Contributor

Choose a reason for hiding this comment

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

Didn't you merge it already? For me, it now sits on top of the other three commits as a separate commit, but with just the single change in the test.

@petebacondarwin
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah flip. I did squash it but for some reason merged the wrong branch.

@petebacondarwin
Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, so just pretend that this was squashed - it will be pretty obvious in the changelog.
Sorry about that.

Please sign in to comment.