javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3506 from NativeScript/cankov/css-animation-tests

Browse Source 
Fixed CSS-ANIMATION tests
This commit is contained in:
Panayot Cankov
2017-01-18 13:59:38 +02:00
committed by GitHub
parent a28825ca36 8e0aeb8ec2
commit 8382e98d80
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/testRunner.ts
View File

@ -95,7 +95,7 @@ allTests["REPEATER"] = require("./ui/repeater/repeater-tests");
allTests["SEARCH-BAR"] = require('./ui/search-bar/search-bar-tests');
allTests["SEGMENTED-BAR"] = require("./ui/segmented-bar/segmented-bar-tests");
allTests["ANIMATION"] = require("./ui/animation/animation-tests");
//allTests["CSS-ANIMATION"] = require("./ui/animation/css-animation-tests");
allTests["CSS-ANIMATION"] = require("./ui/animation/css-animation-tests");
// Skip transitions on android emulators with API 23
if (!(platform.device.os === platform.platformNames.android && parseInt(platform.device.sdkVersion) === 23 && isRunningOnEmulator())) {

2
tns-core-modules/color/color-common.ts
View File

@ -99,7 +99,7 @@ export class Color implements definition.Color {
}
public equals(value: definition.Color): boolean {
return this.argb === value.argb;
return value && this.argb === value.argb;
}
public static equals(value1: definition.Color, value2: definition.Color): boolean {

4
tns-core-modules/ui/styling/css-animation-parser.ts
View File

@ -195,10 +195,10 @@ function parseKeyframeDeclarations(keyframe: Object): Array<KeyframeDeclaration>
}
}
}
declarations[propertyName] = parseFloat(value);
delete declarations[propertyName];
}
else if (propertyName === "backgroundColor" || propertyName === "background-color") {
declarations[propertyName] = new Color(value);
declarations["backgroundColor"] = new Color(value);
}
else {
declarations[propertyName] = value;