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

fix(ngStyle): skip setting empty value when new style has the property #16709

Merged
merged 7 commits into from
Oct 4, 2018
Merged

fix(ngStyle): skip setting empty value when new style has the property #16709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81b65bf
fix(ngStyle): skip setting empty value when new style has the property
itchyny Oct 2, 2018
02f0d0b
style(ngStyle): fix indentation
itchyny Oct 2, 2018
5d74f0f
fix(ngStyle): clear the style even when newStyle has the property but…
itchyny Oct 2, 2018
704ce65
test(ngStyle): add a test for falsy values
itchyny Oct 2, 2018
95d2458
perf(ngStyle): use newStyles to reduce the number of element.css
itchyny Oct 4, 2018
cbb0b7d
test(ngStyle): add a test for setting style when the new value is num…
itchyny Oct 4, 2018
c44b2f2
test(ngStyle): add a test for the case the new model is null
itchyny Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/ng/directive/ngStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,14 @@
var ngStyleDirective = ngDirective(function(scope, element, attr) {
scope.$watchCollection(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
if (oldStyles && (newStyles !== oldStyles)) {
forEach(oldStyles, function(val, style) { element.css(style, '');});
if (!newStyles) {
newStyles = {};
}
forEach(oldStyles, function(val, style) {
if (newStyles[style] == null) {
newStyles[style] = '';
}
});
}
if (newStyles) element.css(newStyles);
});
Expand Down
33 changes: 33 additions & 0 deletions test/ng/directive/ngStyleSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,38 @@ describe('ngStyle', function() {
expect(element.css(preCompStyle)).not.toBe('88px');
expect(element.css(postCompStyle)).not.toBe('99px');
});

it('should clear style when the new model is null', function() {
scope.styleObj = {'height': '99px', 'width': '88px'};
scope.$apply();
expect(element.css(preCompStyle)).toBe('88px');
expect(element.css(postCompStyle)).toBe('99px');
scope.styleObj = null;
scope.$apply();
expect(element.css(preCompStyle)).not.toBe('88px');
expect(element.css(postCompStyle)).not.toBe('99px');
});

it('should clear style when the value is undefined or null', function() {
scope.styleObj = {'height': '99px', 'width': '88px'};
scope.$apply();
expect(element.css(preCompStyle)).toBe('88px');
expect(element.css(postCompStyle)).toBe('99px');
scope.styleObj = {'height': undefined, 'width': null};
scope.$apply();
expect(element.css(preCompStyle)).not.toBe('88px');
expect(element.css(postCompStyle)).not.toBe('99px');
});

it('should set style when the value is zero', function() {
scope.styleObj = {'height': '99px', 'width': '88px'};
scope.$apply();
expect(element.css(preCompStyle)).toBe('88px');
expect(element.css(postCompStyle)).toBe('99px');
scope.styleObj = {'height': 0, 'width': 0};
scope.$apply();
expect(element.css(preCompStyle)).toBe('0px');
expect(element.css(postCompStyle)).toBe('0px');
});
});
});