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/05/23 06:32:09 UTC

[01/10] incubator-weex git commit: * [ios] try to fix insert object out of range

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 3777cee9b -> a66a6bf14


* [ios] try to fix insert object out of range


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3a972c83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3a972c83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3a972c83

Branch: refs/heads/0.13-dev
Commit: 3a972c839223f9f0d14a47c7a992f2cb7d3358d2
Parents: 8acc6e6
Author: acton393 <zh...@gmail.com>
Authored: Fri May 19 15:07:33 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri May 19 15:07:33 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 6 ++++++
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m         | 3 +++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3a972c83/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index eb5c12f..8eb6aa9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -480,6 +480,9 @@
     
     NSIndexPath *fromIndexPath = [self indexPathForCell:cell sections:_sections];
     NSIndexPath *toIndexPath = [self indexPathForSubIndex:index];
+    if (toIndexPath.row > [_sections[toIndexPath.section].rows count] || toIndexPath.row < 0) {
+        return;
+    }
     [self removeCellForIndexPath:fromIndexPath withSections:_sections];
     [self insertCell:cell forIndexPath:toIndexPath withSections:_sections];
     
@@ -713,6 +716,9 @@
 - (void)insertCell:(WXCellComponent *)cell forIndexPath:(NSIndexPath *)indexPath withSections:(NSMutableArray *)sections
 {
     WXSection *section = [sections wx_safeObjectAtIndex:indexPath.section];
+    if (indexPath.row > [section.rows count] || indexPath.row < 0) {
+        return;
+    }
     WXAssert(section, @"inserting cell at indexPath:%@ section has not been inserted to list before, sections:%@", indexPath, sections);
     WXAssert(indexPath.row <= section.rows.count, @"inserting cell at indexPath:%@ outof range, sections:%@", indexPath, sections);
     [section.rows insertObject:cell atIndex:indexPath.row];

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3a972c83/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 8ee5393..6fc6c73 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -337,6 +337,9 @@
 - (void)_insertSubcomponent:(WXComponent *)subcomponent atIndex:(NSInteger)index
 {
     WXAssert(subcomponent, @"The subcomponent to insert to %@ at index %d must not be nil", self, index);
+    if (index > [_subcomponents count]) {
+        return;
+    }
     
     subcomponent->_supercomponent = self;
     


[10/10] incubator-weex git commit: Merge branch '0.13-dev-fix-out-range' of https://github.com/acton393/incubator-weex into wip-us-0.13-dev

Posted by ac...@apache.org.
Merge branch '0.13-dev-fix-out-range' of https://github.com/acton393/incubator-weex into wip-us-0.13-dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a66a6bf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a66a6bf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a66a6bf1

Branch: refs/heads/0.13-dev
Commit: a66a6bf14c0ed760358f92f7c0620f877f2f11cf
Parents: a9ac0d1 2d7fde0
Author: acton393 <zh...@gmail.com>
Authored: Tue May 23 14:31:34 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue May 23 14:31:34 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 8 ++++++++
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m         | 4 ++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a66a6bf1/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------


[07/10] incubator-weex git commit: Merge branch 'ios-bugfix-border-radius-0.13-dev' of https://github.com/kfeagle/incubator-weex into wip-us-0.13-dev

Posted by ac...@apache.org.
Merge branch 'ios-bugfix-border-radius-0.13-dev' of https://github.com/kfeagle/incubator-weex into wip-us-0.13-dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a9ac0d18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a9ac0d18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a9ac0d18

Branch: refs/heads/0.13-dev
Commit: a9ac0d1851b6c2b191cabb296051bce632fe47b8
Parents: 3777cee f597dd6
Author: acton393 <zh...@gmail.com>
Authored: Tue May 23 11:37:08 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue May 23 11:37:08 2017 +0800

----------------------------------------------------------------------
 .../Sources/View/WXComponent+ViewManagement.m   | 72 ++++++++++++++++++++
 1 file changed, 72 insertions(+)
----------------------------------------------------------------------



[08/10] incubator-weex git commit: * [ios] add error log about out of range error

Posted by ac...@apache.org.
* [ios] add error log about out of range error


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6806fed0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6806fed0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6806fed0

Branch: refs/heads/0.13-dev
Commit: 6806fed03a3fc783119d11ea04f6c61a352d297b
Parents: 3a972c8
Author: acton393 <zh...@gmail.com>
Authored: Tue May 23 11:46:13 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue May 23 11:46:13 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 2 ++
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m         | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6806fed0/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index 8eb6aa9..dc23bf4 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -481,6 +481,7 @@
     NSIndexPath *fromIndexPath = [self indexPathForCell:cell sections:_sections];
     NSIndexPath *toIndexPath = [self indexPathForSubIndex:index];
     if (toIndexPath.row > [_sections[toIndexPath.section].rows count] || toIndexPath.row < 0) {
+        WXLogError(@"toIndexPath %@ is out of range as the current is %d",toIndexPath ,[_sections[toIndexPath.section].rows count]);
         return;
     }
     [self removeCellForIndexPath:fromIndexPath withSections:_sections];
@@ -717,6 +718,7 @@
 {
     WXSection *section = [sections wx_safeObjectAtIndex:indexPath.section];
     if (indexPath.row > [section.rows count] || indexPath.row < 0) {
+        WXLogError(@"inserting cell at indexPath:%@ outof range, sections:%@", indexPath, sections);
         return;
     }
     WXAssert(section, @"inserting cell at indexPath:%@ section has not been inserted to list before, sections:%@", indexPath, sections);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6806fed0/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 6fc6c73..ee80c72 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -338,6 +338,7 @@
 {
     WXAssert(subcomponent, @"The subcomponent to insert to %@ at index %d must not be nil", self, index);
     if (index > [_subcomponents count]) {
+        WXLogError(@"the index of inserted %ld is out of range as the current is %ld", index, [_subcomponents count]);
         return;
     }
     


[02/10] incubator-weex git commit: + [ios] fixbug: fix border reset bug

Posted by ac...@apache.org.
+ [ios] fixbug: fix border reset 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/36cd101c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/36cd101c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/36cd101c

Branch: refs/heads/0.13-dev
Commit: 36cd101c11edd571475b3523def497ba946f9e60
Parents: 8acc6e6
Author: 齐山 <su...@163.com>
Authored: Mon May 22 11:33:25 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon May 22 11:33:25 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/36cd101c/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index 42ace57..c084a52 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -209,6 +209,14 @@
         _boxShadow = nil;
         [self setNeedsDisplay];
     }
+    if (styles && [styles containsObject:@"borderRadius"]) {
+        //reset
+        _borderTopStyle = _borderRightStyle = _borderBottomStyle = _borderLeftStyle = WXBorderStyleSolid;
+        _borderTopColor = _borderLeftColor = _borderRightColor = _borderBottomColor = [UIColor blackColor];
+        _borderTopWidth = _borderLeftWidth = _borderRightWidth = _borderBottomWidth = 0;
+        _borderTopLeftRadius = _borderTopRightRadius = _borderBottomLeftRadius = _borderBottomRightRadius = 0;
+        [self setNeedsDisplay];
+    }
 }
 
 - (void)_unloadViewWithReusing:(BOOL)isReusing


[05/10] incubator-weex git commit: + [ios] add border color width RADIUS

Posted by ac...@apache.org.
+ [ios] add border color width RADIUS


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aafe6a8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aafe6a8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aafe6a8f

Branch: refs/heads/0.13-dev
Commit: aafe6a8f1f8b77fa566851aa9bb90db0848abfb5
Parents: 32bc9c8
Author: 齐山 <su...@163.com>
Authored: Mon May 22 15:16:08 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon May 22 15:16:08 2017 +0800

----------------------------------------------------------------------
 .../Sources/View/WXComponent+ViewManagement.m   | 63 +++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aafe6a8f/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index da9db13..a4b20b8 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -30,7 +30,7 @@
 do {\
     if (styles && [styles containsObject:@#key]) {\
         _borderTopLeftRadius = _borderTopRightRadius = _borderBottomLeftRadius = _borderBottomRightRadius = 0;\
-        [self setNeedsLayout];\
+        [self setNeedsDisplay];\
     }\
 } while(0);
 
@@ -38,7 +38,39 @@ do {\
 do {\
     if (styles && [styles containsObject:@#key]) {\
     _##key = 0;\
-    [self setNeedsLayout];\
+    [self setNeedsDisplay];\
+    }\
+} while(0);
+
+#define WX_BOARD_WIDTH_RESET_ALL(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+        _borderTopWidth = _borderLeftWidth = _borderRightWidth = _borderBottomWidth = 0;\
+        [self setNeedsDisplay];\
+    }\
+} while(0);
+
+#define WX_BOARD_WIDTH_RESET(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+        _##key = 0;\
+        [self setNeedsLayout];\
+    }\
+} while(0);
+
+#define WX_BOARD_RADIUS_COLOR_RESET_ALL(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+        _borderTopColor = _borderLeftColor = _borderRightColor = _borderBottomColor = [UIColor blackColor];\
+        [self setNeedsLayout];\
+    }\
+} while(0);
+
+#define WX_BOARD_COLOR_RESET(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+        _##key = [UIColor blackColor];\
+        [self setNeedsDisplay];\
     }\
 } while(0);
 
@@ -215,6 +247,26 @@ do {\
     }
 }
 
+-(void)resetBorder:(NSArray *)styles
+{
+    WX_BOARD_RADIUS_RESET_ALL(borderRadius);
+    WX_BOARD_RADIUS_RESET(borderTopLeftRadius);
+    WX_BOARD_RADIUS_RESET(borderTopRightRadius);
+    WX_BOARD_RADIUS_RESET(borderBottomLeftRadius);
+    WX_BOARD_RADIUS_RESET(borderBottomRightRadius);
+    
+    WX_BOARD_WIDTH_RESET_ALL(borderWidth);
+    WX_BOARD_WIDTH_RESET(borderTopWidth);
+    WX_BOARD_WIDTH_RESET(borderLeftWidth);
+    WX_BOARD_WIDTH_RESET(borderRightWidth);
+    WX_BOARD_WIDTH_RESET(borderBottomWidth);
+    
+    WX_BOARD_RADIUS_COLOR_RESET_ALL(borderColor);
+    WX_BOARD_COLOR_RESET(borderTopColor);
+    WX_BOARD_COLOR_RESET(borderLeftColor);
+    WX_BOARD_COLOR_RESET(borderRightColor);
+    WX_BOARD_COLOR_RESET(borderBottomColor);
+}
 
 -(void)_resetStyles:(NSArray *)styles
 {
@@ -227,11 +279,8 @@ do {\
         _boxShadow = nil;
         [self setNeedsDisplay];
     }
-    WX_BOARD_RADIUS_RESET_ALL(borderRadius);
-    WX_BOARD_RADIUS_RESET(borderTopLeftRadius);
-    WX_BOARD_RADIUS_RESET(borderTopRightRadius);
-    WX_BOARD_RADIUS_RESET(borderBottomLeftRadius);
-    WX_BOARD_RADIUS_RESET(borderBottomRightRadius);
+    
+    [self resetBorder:styles];
 }
 
 - (void)_unloadViewWithReusing:(BOOL)isReusing


[04/10] incubator-weex git commit: + [ios] format code

Posted by ac...@apache.org.
+ [ios] format code


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/32bc9c8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/32bc9c8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/32bc9c8a

Branch: refs/heads/0.13-dev
Commit: 32bc9c8a3714c1eeab51cd383594db273648d559
Parents: ae7ca8d
Author: 齐山 <su...@163.com>
Authored: Mon May 22 12:14:33 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon May 22 12:14:33 2017 +0800

----------------------------------------------------------------------
 .../Sources/View/WXComponent+ViewManagement.m   | 32 +++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/32bc9c8a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index 125b491..da9db13 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -25,6 +25,23 @@
 #import "WXSDKInstance_private.h"
 #import "WXTransform.h"
 
+
+#define WX_BOARD_RADIUS_RESET_ALL(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+        _borderTopLeftRadius = _borderTopRightRadius = _borderBottomLeftRadius = _borderBottomRightRadius = 0;\
+        [self setNeedsLayout];\
+    }\
+} while(0);
+
+#define WX_BOARD_RADIUS_RESET(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+    _##key = 0;\
+    [self setNeedsLayout];\
+    }\
+} while(0);
+
 #pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
 
 @implementation WXComponent (ViewManagement)
@@ -198,21 +215,6 @@
     }
 }
 
-#define WX_BOARD_RADIUS_RESET_ALL(key)\
-do {\
-    if (styles && [styles containsObject:@#key]) {\
-        _borderTopLeftRadius = _borderTopRightRadius = _borderBottomLeftRadius = _borderBottomRightRadius = 0;\
-        [self setNeedsLayout];\
-    }\
-} while(0);
-
-#define WX_BOARD_RADIUS_RESET(key)\
-do {\
-if (styles && [styles containsObject:@#key]) {\
-    _##key = 0;\
-    [self setNeedsLayout];\
-    }\
-} while(0);
 
 -(void)_resetStyles:(NSArray *)styles
 {


[03/10] incubator-weex git commit: + [ios] boader reset

Posted by ac...@apache.org.
+ [ios] boader reset


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ae7ca8de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ae7ca8de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ae7ca8de

Branch: refs/heads/0.13-dev
Commit: ae7ca8de5249d9bb15f8a061261aa3e68272f4a0
Parents: 36cd101
Author: 齐山 <su...@163.com>
Authored: Mon May 22 12:13:02 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon May 22 12:13:02 2017 +0800

----------------------------------------------------------------------
 .../Sources/View/WXComponent+ViewManagement.m   | 29 ++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ae7ca8de/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index c084a52..125b491 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -198,6 +198,22 @@
     }
 }
 
+#define WX_BOARD_RADIUS_RESET_ALL(key)\
+do {\
+    if (styles && [styles containsObject:@#key]) {\
+        _borderTopLeftRadius = _borderTopRightRadius = _borderBottomLeftRadius = _borderBottomRightRadius = 0;\
+        [self setNeedsLayout];\
+    }\
+} while(0);
+
+#define WX_BOARD_RADIUS_RESET(key)\
+do {\
+if (styles && [styles containsObject:@#key]) {\
+    _##key = 0;\
+    [self setNeedsLayout];\
+    }\
+} while(0);
+
 -(void)_resetStyles:(NSArray *)styles
 {
     if (styles && [styles containsObject:@"backgroundColor"]) {
@@ -209,14 +225,11 @@
         _boxShadow = nil;
         [self setNeedsDisplay];
     }
-    if (styles && [styles containsObject:@"borderRadius"]) {
-        //reset
-        _borderTopStyle = _borderRightStyle = _borderBottomStyle = _borderLeftStyle = WXBorderStyleSolid;
-        _borderTopColor = _borderLeftColor = _borderRightColor = _borderBottomColor = [UIColor blackColor];
-        _borderTopWidth = _borderLeftWidth = _borderRightWidth = _borderBottomWidth = 0;
-        _borderTopLeftRadius = _borderTopRightRadius = _borderBottomLeftRadius = _borderBottomRightRadius = 0;
-        [self setNeedsDisplay];
-    }
+    WX_BOARD_RADIUS_RESET_ALL(borderRadius);
+    WX_BOARD_RADIUS_RESET(borderTopLeftRadius);
+    WX_BOARD_RADIUS_RESET(borderTopRightRadius);
+    WX_BOARD_RADIUS_RESET(borderBottomLeftRadius);
+    WX_BOARD_RADIUS_RESET(borderBottomRightRadius);
 }
 
 - (void)_unloadViewWithReusing:(BOOL)isReusing


[09/10] incubator-weex git commit: * [ios] log format update

Posted by ac...@apache.org.
* [ios] log format update


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2d7fde05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2d7fde05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2d7fde05

Branch: refs/heads/0.13-dev
Commit: 2d7fde05adcbc013a1123d4dfaaaf5b0d17f2cd3
Parents: 6806fed
Author: acton393 <zh...@gmail.com>
Authored: Tue May 23 12:01:40 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue May 23 12:01:40 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2d7fde05/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index dc23bf4..97b4fd9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -481,7 +481,7 @@
     NSIndexPath *fromIndexPath = [self indexPathForCell:cell sections:_sections];
     NSIndexPath *toIndexPath = [self indexPathForSubIndex:index];
     if (toIndexPath.row > [_sections[toIndexPath.section].rows count] || toIndexPath.row < 0) {
-        WXLogError(@"toIndexPath %@ is out of range as the current is %d",toIndexPath ,[_sections[toIndexPath.section].rows count]);
+        WXLogError(@"toIndexPath %@ is out of range as the current is %lu",toIndexPath ,(unsigned long)[_sections[toIndexPath.section].rows count]);
         return;
     }
     [self removeCellForIndexPath:fromIndexPath withSections:_sections];


[06/10] incubator-weex git commit: + [ios] update display to layout

Posted by ac...@apache.org.
+ [ios] update display to layout


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f597dd60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f597dd60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f597dd60

Branch: refs/heads/0.13-dev
Commit: f597dd60f4f7dfb7e028e703379f00108bd6ac9a
Parents: aafe6a8
Author: 齐山 <su...@163.com>
Authored: Mon May 22 15:23:21 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon May 22 15:23:21 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f597dd60/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index a4b20b8..ff5be04 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -46,7 +46,7 @@ do {\
 do {\
     if (styles && [styles containsObject:@#key]) {\
         _borderTopWidth = _borderLeftWidth = _borderRightWidth = _borderBottomWidth = 0;\
-        [self setNeedsDisplay];\
+        [self setNeedsLayout];\
     }\
 } while(0);
 
@@ -62,7 +62,7 @@ do {\
 do {\
     if (styles && [styles containsObject:@#key]) {\
         _borderTopColor = _borderLeftColor = _borderRightColor = _borderBottomColor = [UIColor blackColor];\
-        [self setNeedsLayout];\
+        [self setNeedsDisplay];\
     }\
 } while(0);