You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/15 02:49:15 UTC
[5/7] incubator-weex git commit: * [ios] fix timingFunction bug
* [ios] fix timingFunction bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/75e4cf87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/75e4cf87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/75e4cf87
Branch: refs/heads/0.16-dev
Commit: 75e4cf8707735caa37146fd62b5f17ca6c1f70f7
Parents: 4a3a780
Author: doumafang <do...@gmail.com>
Authored: Sat Aug 12 12:27:36 2017 +0800
Committer: doumafang <do...@gmail.com>
Committed: Sat Aug 12 12:27:36 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75e4cf87/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
index 7258790..18892e6 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
@@ -672,7 +672,8 @@ WX_NUMBER_CONVERT(NSUInteger, unsignedIntegerValue)
@"ease-in":kCAMediaTimingFunctionEaseIn,
@"ease-out":kCAMediaTimingFunctionEaseOut,
@"ease-in-out":kCAMediaTimingFunctionEaseInEaseOut,
- @"linear":kCAMediaTimingFunctionLinear
+ @"linear":kCAMediaTimingFunctionLinear,
+ @"ease":kCAMediaTimingFunctionDefault
};
});