You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by GitBox <gi...@apache.org> on 2018/11/05 09:49:10 UTC

[GitHub] cxfeng1 closed pull request #1669: [iOS] Fix spelling error.

cxfeng1 closed pull request #1669: [iOS] Fix spelling error.
URL: https://github.com/apache/incubator-weex/pull/1669
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.mm
index 64ead8bc11..7d1cbf2202 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.mm
@@ -131,7 +131,7 @@ - (void)removeFromSuperview
     // do nothing
 }
 
-- (BOOL)_isCaculatedFrameChanged:(CGRect)frame
+- (BOOL)_isCalculatedFrameChanged:(CGRect)frame
 {
     /*
      For list(aka UITableView), we cannot ignore left value generated by layout engine.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index fb1b673422..f485a18896 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -219,7 +219,7 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate);
 
 - (void)_setRenderObject:(void *)object;
 
-- (BOOL)_isCaculatedFrameChanged:(CGRect)frame;
+- (BOOL)_isCalculatedFrameChanged:(CGRect)frame;
 
 - (CGFloat)_getInnerContentMainSize;
 
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.mm
index 2d5c6a7bde..fda5e76def 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.mm
@@ -67,7 +67,7 @@ - (void)_removeFromSupercomponent
     [self.delegate headerDidRemove:self];
 }
 
-- (BOOL)_isCaculatedFrameChanged:(CGRect)frame
+- (BOOL)_isCalculatedFrameChanged:(CGRect)frame
 {
     return !CGSizeEqualToSize(frame.size, _calculatedFrame.size); // only compares sizes
 }
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
index e22dc38d76..24e7a0f4e9 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
@@ -716,7 +716,7 @@ - (void)layoutComponent:(WXComponent*)component frame:(CGRect)frame innerMainSiz
         }
     }
     
-    if ([component _isCaculatedFrameChanged:frame]) {
+    if ([component _isCalculatedFrameChanged:frame]) {
         [component _assignCalculatedFrame:frame];
         [component _assignInnerContentMainSize:innerMainSize];
         [component _frameDidCalculated:YES];
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
index e00a8edf7d..a2e43ead7f 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -514,7 +514,7 @@ - (void)_assignInnerContentMainSize:(CGFloat)value
 {
 }
 
-- (BOOL)_isCaculatedFrameChanged:(CGRect)frame
+- (BOOL)_isCalculatedFrameChanged:(CGRect)frame
 {
     return !CGRectEqualToRect(frame, _calculatedFrame);
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services