You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/05/21 16:37:13 UTC
[10/10] git commit: [flex-asjs] [refs/heads/develop] - remove unnamed
if check
remove unnamed if check
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a3d6ae41
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a3d6ae41
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a3d6ae41
Branch: refs/heads/develop
Commit: a3d6ae413d6449bdbfe765ba37af657cb350b71c
Parents: 60f614a
Author: Justin Mclean <jm...@apache.org>
Authored: Sun May 21 09:46:52 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun May 21 09:46:52 2017 +1000
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a3d6ae41/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index d854ca4..70c597a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -478,10 +478,10 @@ package org.apache.flex.core
if (parentObject)
{
value = getValue(parentObject, valueName, state, attrs);
- if (value === INHERIT || value === undefined)
+ if (value === INHERIT || value === undefined) {
return getInheritingValue(parentObject, valueName, state, attrs);
- if (value !== undefined)
- return value;
+ }
+ return value;
}
return undefined;
}