Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-23 05:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix($compile): correctly merge class attr for replace directives

Browse source 
Merging of interpolated class attribute from directive template with replace:true works

Closes #1006
This commit is contained in:
Max Martinsson 2012-06-06 16:23:07 +02:00 committed by Igor Minar
parent 10f80d7d29
commit fb99b539b4
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ng/compile.js
View file

@ -865,6 +865,7 @@ function $CompileProvider($provide) {
var srcAttr = src.$attr, var srcAttr = src.$attr,
dstAttr = dst.$attr, dstAttr = dst.$attr,
$element = dst.$$element; $element = dst.$$element;
// reapply the old attributes to the new element // reapply the old attributes to the new element
forEach(dst, function(value, key) { forEach(dst, function(value, key) {
if (key.charAt(0) != '$') { if (key.charAt(0) != '$') {
@ -874,10 +875,12 @@ function $CompileProvider($provide) {
dst.$set(key, value, true, srcAttr[key]); dst.$set(key, value, true, srcAttr[key]);
} }
}); });
// copy the new attributes on the old attrs object // copy the new attributes on the old attrs object
forEach(src, function(value, key) { forEach(src, function(value, key) {
if (key == 'class') { if (key == 'class') {
safeAddClass($element, value); safeAddClass($element, value);
dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
} else if (key == 'style') { } else if (key == 'style') {
$element.attr('style', $element.attr('style') + ';' + value); $element.attr('style', $element.attr('style') + ';' + value);
} else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) { } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {

16
test/ng/compileSpec.js
View file

@ -388,6 +388,14 @@ describe('$compile', function() {
expect(element).toBe(attr.$$element); expect(element).toBe(attr.$$element);
} }
})); }));
directive('replaceWithInterpolatedClass', valueFn({
replace: true,
template: '<div class="class_{{1+1}}">Replace with interpolated class!</div>',
compile: function(element, attr) {
attr.$set('compiled', 'COMPILED');
expect(element).toBe(attr.$$element);
}
}));
})); }));
@ -466,6 +474,14 @@ describe('$compile', function() {
})); }));
it('should handle interpolated css from replacing directive', inject(
function($compile, $rootScope) {
element = $compile('<div replace-with-interpolated-class></div>')($rootScope);
$rootScope.$digest();
expect(element).toHaveClass('class_2');
}));
it('should merge interpolated css class', inject(function($compile, $rootScope) { it('should merge interpolated css class', inject(function($compile, $rootScope) {
element = $compile('<div class="one {{cls}} three" replace></div>')($rootScope); element = $compile('<div class="one {{cls}} three" replace></div>')($rootScope);