Repository: incubator-weex Updated Branches: refs/heads/master caa5c5808 -> 8d5b79a45
* [ios] refix transform's parse bug about translate close #898, close #903, close #907 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0699264d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0699264d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0699264d Branch: refs/heads/master Commit: 0699264ded1bb01d82283e4f271018e1cbe4ee46 Parents: caa5c58 Author: doumafang <doumaf...@gmail.com> Authored: Fri Nov 17 14:09:36 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Thu Nov 23 20:59:07 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0699264d/ios/sdk/WeexSDK/Sources/Component/WXTransform.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index 9e5c362..a73d92d 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -348,6 +348,12 @@ - (void)parseTranslate:(NSArray *)value { + [self parseTranslatex:@[value[0]]]; + [self parseTranslatey:@[value[1]]]; +} + +- (void)parseTranslatex:(NSArray *)value +{ WXLength *translateX; double x = [value[0] doubleValue]; if ([value[0] hasSuffix:@"%"]) { @@ -356,32 +362,24 @@ x = WXPixelScale(x, self.weexInstance.pixelScaleFactor); translateX = [WXLength lengthWithFloat:x type:WXLengthTypeFixed]; } + _translateX = translateX; +} +- (void)parseTranslatey:(NSArray *)value +{ WXLength *translateY; if (value.count > 1) { - double y = [value[1] doubleValue]; - if ([value[1] hasSuffix:@"%"]) { + double y = [value[0] doubleValue]; + if ([value[0] hasSuffix:@"%"]) { translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; } else { y = WXPixelScale(y, self.weexInstance.pixelScaleFactor); translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed]; } } - - _translateX = translateX; _translateY = translateY; } -- (void)parseTranslatex:(NSArray *)value -{ - [self parseTranslate:@[value[0], @"0"]]; -} - -- (void)parseTranslatey:(NSArray *)value -{ - [self parseTranslate:@[@"0", value[0]]]; -} - - (void)parseScale:(NSArray *)value { double x = [value[0] doubleValue];
