honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ShadowCss): keyframes tests failing in Safari 

Closes #2283
This commit is contained in:
Marc Laval 2015-06-02 14:59:35 +02:00
parent 3d6c44e2a7
commit 4c8e11a577
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/angular2/test/render/dom/shadow_dom/shadow_css_spec.ts
View File

@ -11,7 +11,7 @@ import {
} from 'angular2/test_lib'; } from 'angular2/test_lib';
import {ShadowCss} from 'angular2/src/render/dom/shadow_dom/shadow_css'; import {ShadowCss} from 'angular2/src/render/dom/shadow_dom/shadow_css';
import {RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/facade/lang';
import {DOM} from 'angular2/src/dom/dom_adapter'; import {DOM} from 'angular2/src/dom/dom_adapter';
export function main() { export function main() {
@ -56,18 +56,22 @@ export function main() {
expect(s(css, 'a')).toEqual(expected); expect(s(css, 'a')).toEqual(expected);
}); });
it('should handle keyframes rules', () => { // Check that the browser supports unprefixed CSS animation
var css = '@keyframes foo {0% {transform: translate(-50%) scaleX(0);}}'; if (isPresent(DOM.defaultDoc().body.style) &&
var passRe = RegExpWrapper.create( isPresent(DOM.defaultDoc().body.style.animationName)) {
'@keyframes foo {\\s*0% {\\s*transform:translate\\(-50%\\) scaleX\\(0\\);\\s*}\\s*}'); it('should handle keyframes rules', () => {
expect(RegExpWrapper.test(passRe, s(css, 'a'))).toEqual(true); var css = '@keyframes foo {0% {transform: translate(-50%) scaleX(0);}}';
}); var passRe = RegExpWrapper.create(
'@keyframes foo {\\s*0% {\\s*transform:translate\\(-50%\\) scaleX\\(0\\);\\s*}\\s*}');
expect(RegExpWrapper.test(passRe, s(css, 'a'))).toEqual(true);
});
}
if (DOM.getUserAgent().indexOf('AppleWebKit') > -1) { if (DOM.getUserAgent().indexOf('AppleWebKit') > -1) {
it('should handle -webkit-keyframes rules', () => { it('should handle -webkit-keyframes rules', () => {
var css = '@-webkit-keyframes foo {0% {transform: translate(-50%) scaleX(0);}}'; var css = '@-webkit-keyframes foo {0% {-webkit-transform: translate(-50%) scaleX(0);}}';
var passRe = RegExpWrapper.create( var passRe = RegExpWrapper.create(
'@-webkit-keyframes foo {\\s*0% {\\s*transform:translate\\(-50%\\) scaleX\\(0\\);\\s*}}'); '@-webkit-keyframes foo {\\s*0% {\\s*(-webkit-)*transform:translate\\(-50%\\) scaleX\\(0\\);\\s*}}');
expect(RegExpWrapper.test(passRe, s(css, 'a'))).toEqual(true); expect(RegExpWrapper.test(passRe, s(css, 'a'))).toEqual(true);
}); });
} }