This repository was archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27.4k
fix(ngInclude): correctly add non-html namespaced template content #8981
Closed
+54
−0
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b2227d0
chore(.jshintrc): add jqLiteBuildFragment to globals
caitp 09296d5
chore(.jshintrc): add jqLiteParseHTML to globals
caitp 026a1f8
fix(ngInclude): correctly add non-html namespaced template content
caitp c5c08d7
WIP: make broken tests pass, yeah
caitp 9af0e85
Revert "WIP: make broken tests pass, yeah"
caitp 2ee7ac3
WIP: fix again, but moreso this time
caitp f2f8d42
WIP
caitp 70a515d
Test for SVG-ness in ngIncludeFillContent linkFn
caitp 2a8da48
WIP --- Final version of fix
caitp c5478ad
WIP: make SVG ngIncluded templates behave the same as HTML templates
caitp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -267,6 +267,18 @@ var ngIncludeFillContentDirective = ['$compile', | |
priority: -400, | ||
require: 'ngInclude', | ||
link: function(scope, $element, $attr, ctrl) { | ||
if (/SVG/.test($element[0].toString())) { | ||
// WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not | ||
// support innerHTML, so detect this here and try to generate the contents | ||
// specially. | ||
$element.empty(); | ||
$compile(jqLiteBuildFragment(ctrl.template, document).childNodes)(scope, | ||
function namespaceAdaptedClone(clone) { | ||
$element.append(clone); | ||
}, undefined, undefined, $element); | ||
return; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add a blank line after this line |
||
|
||
$element.html(ctrl.template); | ||
$compile($element.contents())(scope); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the jqLiteParseHTML addition doesn't matter much, but I don't think it's bad to have it