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

PR 7565 fixed #7610

Merged
merged 14 commits into from May 29, 2014
Merged

PR 7565 fixed #7610

merged 14 commits into from May 29, 2014

Conversation

vojtajina
Copy link
Contributor

Still have some internal tests failing - investigating. This PR is just to make it easier to review.

@mary-poppins
Copy link

Thanks for the PR! Please check the items below to help us merge this faster. See the contributing docs for more information.

  • Uses the issue template (#7610)

If you need to make changes to your pull request, you can update the commit with git commit --amend.
Then, update the pull request with git push -f.

Thanks again for your help!

@vojtajina
Copy link
Contributor Author

Ok, I believe this is ready to be merged.

@vojtajina
Copy link
Contributor Author

This PR closes
#7499
#7530
#7565

vojtajina and others added 14 commits May 29, 2014 12:51
If you have two directives that both expect to receive transcluded content
the outer directive works but the inner directive never receives a
transclusion function. This only failed if the first transclude directive
was not the first directive found in compilation.

Handles the regression identified in e994259

Fixes angular#7240
Closes angular#7387
The boundTransclusionFn that is passed in is really the one from the
parent node.  The change to parentBoundTranscludeFn clarifies this compared
to the childBoundTranscludeFn.
…rective

If a directive provides a template but is not explicitly requesting transclusion
then the compiler should not pass a transclusion function to the directives
within the template.
This issue was introduced in b87e5fc.
The state for each row has to be set up *before* linking.

The cloneFn (the function passed into $transclude) is called *before* actual linking and thus it is enough to update the state inside the cloneFn callback.
Nested isolated transclude directives.

This improves/fixes the fix in d414b78.

See the changed ng-ifunit test: The template inside ng-if should be bound to the
isolate scope of `iso` directive (resp. its child scope). Not to a child of
the root scope. This shows the issue with ng-if. It’s however problem with
other directives too.

Instead of remembering the scope, we pass around the bound parent transclusion.
@vojtajina vojtajina merged commit 440be33 into angular:master May 29, 2014
@vojtajina vojtajina deleted the pr-7565-fixed branch May 30, 2014 22:05
This was referenced May 30, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants