diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts index 015ad3313..43382c99c 100644 --- a/tests/app/testRunner.ts +++ b/tests/app/testRunner.ts @@ -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())) { diff --git a/tns-core-modules/color/color-common.ts b/tns-core-modules/color/color-common.ts index 8174b93cd..971b81221 100644 --- a/tns-core-modules/color/color-common.ts +++ b/tns-core-modules/color/color-common.ts @@ -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 { diff --git a/tns-core-modules/ui/styling/css-animation-parser.ts b/tns-core-modules/ui/styling/css-animation-parser.ts index 38264bcca..0db5f98e4 100644 --- a/tns-core-modules/ui/styling/css-animation-parser.ts +++ b/tns-core-modules/ui/styling/css-animation-parser.ts @@ -195,10 +195,10 @@ function parseKeyframeDeclarations(keyframe: Object): Array } } } - 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;