Skip to content

fix(animations): getAnimationStyle causes exceptions in older browsers #29709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Serginho wants to merge 1 commit into from
Closed

fix(animations): getAnimationStyle causes exceptions in older browsers #29709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/animations/browser/src/render/css_keyframes/element_animation_style_handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ function setAnimationStyle(element: any, name: string, value: string, index?: nu
element.style[prop] = value;
}

function getAnimationStyle(element: any, name: string) {
return element.style[ANIMATION_PROP + name];
export function getAnimationStyle(element: any, name: string) {
return element.style[ANIMATION_PROP + name] || '';
Comment thread
AndrewKushnir marked this conversation as resolved.
}

function countChars(value: string, char: string): number {
Expand Down
21 changes: 19 additions & 2 deletions ...ages/animations/browser/test/render/css_keyframes/element_animation_style_handler_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import {ElementAnimationStyleHandler} from '../../../src/render/css_keyframes/element_animation_style_handler';
import {ElementAnimationStyleHandler, getAnimationStyle} from '../../../src/render/css_keyframes/element_animation_style_handler';
import {computeStyle} from '../../../src/util';

import {assertStyle, createElement, makeAnimationEvent, supportsAnimationEventCreation} from './shared';

const EMPTY_FN = () => {};
Expand Down Expand Up @@ -227,5 +226,23 @@ const EMPTY_FN = () => {};
element.dispatchEvent(event);
expect(done).toBeTruthy();
});

// Issue: https://github.com/angular/angular/issues/24094
it('should not break getAnimationStyle in old browsers', () => {
// Old browsers like Chrome Android 34 returns null if element.style
// is not found, modern browsers returns empty string.
const fakeElement = {
style: {
'animationstyle1': 'value',
'animationstyle2': null,
'animationstyle3': '',
'animation': null
}
};
expect(getAnimationStyle(fakeElement, 'style1')).toBe('value');
expect(getAnimationStyle(fakeElement, 'style2')).toBe('');
expect(getAnimationStyle(fakeElement, 'style3')).toBe('');
expect(getAnimationStyle(fakeElement, '')).toBe('');
});
});
}