mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-16 23:30:23 +00:00
fix($compile): correctly handle interpolated style in replace templates
A directive with a template with `replace: true` and an interpolated style at the root element should work correctly. Closes #4882.
This commit is contained in:
parent
fa82a31fa6
commit
e1254b266d
2 changed files with 19 additions and 1 deletions
|
|
@ -1588,6 +1588,7 @@ function $CompileProvider($provide) {
|
|||
dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
|
||||
} else if (key == 'style') {
|
||||
$element.attr('style', $element.attr('style') + ';' + value);
|
||||
dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
|
||||
// `dst` will never contain hasOwnProperty as DOM parser won't let it.
|
||||
// You will get an "InvalidCharacterError: DOM Exception 5" error if you
|
||||
// have an attribute like "has-own-property" or "data-has-own-property", etc.
|
||||
|
|
|
|||
|
|
@ -504,6 +504,14 @@ describe('$compile', function() {
|
|||
expect(element).toBe(attr.$$element);
|
||||
}
|
||||
}));
|
||||
directive('replaceWithInterpolatedStyle', valueFn({
|
||||
replace: true,
|
||||
template: '<div style="width:{{1+1}}px">Replace with interpolated style!</div>',
|
||||
compile: function(element, attr) {
|
||||
attr.$set('compiled', 'COMPILED');
|
||||
expect(element).toBe(attr.$$element);
|
||||
}
|
||||
}));
|
||||
}));
|
||||
|
||||
|
||||
|
|
@ -581,13 +589,22 @@ describe('$compile', function() {
|
|||
}));
|
||||
|
||||
|
||||
it('should handle interpolated css from replacing directive', inject(
|
||||
it('should handle interpolated css class from replacing directive', inject(
|
||||
function($compile, $rootScope) {
|
||||
element = $compile('<div replace-with-interpolated-class></div>')($rootScope);
|
||||
$rootScope.$digest();
|
||||
expect(element).toHaveClass('class_2');
|
||||
}));
|
||||
|
||||
if (!msie || msie > 10) {
|
||||
// style interpolation not working on IE<11.
|
||||
it('should handle interpolated css style from replacing directive', inject(
|
||||
function($compile, $rootScope) {
|
||||
element = $compile('<div replace-with-interpolated-style></div>')($rootScope);
|
||||
$rootScope.$digest();
|
||||
expect(element.css('width')).toBe('2px');
|
||||
}));
|
||||
}
|
||||
|
||||
it('should merge interpolated css class', inject(function($compile, $rootScope) {
|
||||
element = $compile('<div class="one {{cls}} three" replace></div>')($rootScope);
|
||||
|
|
|
|||
Loading…
Reference in a new issue