You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by bo...@apache.org on 2017/04/14 07:23:49 UTC
[1/6] incubator-weex git commit: Merge branch
'iOS-0.12-dev-text-refactor' into 0.12-dev
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 93c532994 -> 413933744
Merge branch 'iOS-0.12-dev-text-refactor' into 0.12-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/c3dff8e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c3dff8e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c3dff8e4
Branch: refs/heads/0.12-dev
Commit: c3dff8e4388d735711da2c850b24568d912ee07d
Parents: 8a7a1ad 41f524f
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 13 19:03:54 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 13 19:03:54 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXTextComponent.h | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 307 +++++++++++++++++--
.../Sources/Display/WXComponent+Display.m | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 55 +++-
5 files changed, 330 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[5/6] incubator-weex git commit: * [ios] protect nil value
Posted by bo...@apache.org.
* [ios] protect nil value
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af14f2a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af14f2a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af14f2a8
Branch: refs/heads/0.12-dev
Commit: af14f2a84e7cbe76ad120f30c407a5329b73d944
Parents: 6b42136
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 14 15:12:00 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 14 15:12:00 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af14f2a8/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 a017011..c90d499 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -491,7 +491,7 @@
if(strongSelf) {
UIColor * startColor = (UIColor*)linearGradient[@"startColor"];
UIColor * endColor = (UIColor*)linearGradient[@"endColor"];
- if ([strongSelf.view.layer.sublayers containsObject:_gradientLayer]) {
+ if (_gradientLayer && [strongSelf.view.layer.sublayers containsObject:_gradientLayer]) {
[_gradientLayer removeFromSuperlayer];
}
_gradientLayer = [WXUtility gradientLayerFromColors:@[startColor, endColor] locations:nil frame:strongSelf.view.bounds gradientType:[linearGradient[@"gradientType"] integerValue]];
[6/6] incubator-weex git commit: * [ios] set nil when view unload
Posted by bo...@apache.org.
* [ios] set nil when view unload
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/41393374
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/41393374
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/41393374
Branch: refs/heads/0.12-dev
Commit: 413933744286995e998cb549b857995f0826bb41
Parents: af14f2a
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 14 15:19:28 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 14 15:19:28 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41393374/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 73296b4..55e76b0 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -236,6 +236,7 @@
_view = nil;
[_layer removeFromSuperlayer];
_layer = nil;
+ _gradientLayer = nil;
[self viewDidUnload];
}
[4/6] incubator-weex git commit: * [ios] bugfix gradient layer
Posted by bo...@apache.org.
* [ios] bugfix gradient layer
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6b421365
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6b421365
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6b421365
Branch: refs/heads/0.12-dev
Commit: 6b4213655dcc0e879997de88e06f7d56a9b37778
Parents: 858cbc8
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 14 15:04:23 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 14 15:04:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h | 1 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6b421365/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index f548ff9..07a1753 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -47,6 +47,7 @@
*/
UIColor *_backgroundColor;
NSString *_backgroundImage;
+ CAGradientLayer * _gradientLayer;
WXClipType _clipToBounds;
UIView *_view;
CGFloat _opacity;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6b421365/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 97125ae..a017011 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -491,8 +491,11 @@
if(strongSelf) {
UIColor * startColor = (UIColor*)linearGradient[@"startColor"];
UIColor * endColor = (UIColor*)linearGradient[@"endColor"];
- CAGradientLayer * gradientLayer = [WXUtility gradientLayerFromColors:@[startColor, endColor] locations:nil frame:strongSelf.view.bounds gradientType:[linearGradient[@"gradientType"] integerValue]];
- [strongSelf.view.layer insertSublayer:gradientLayer atIndex:0];
+ if ([strongSelf.view.layer.sublayers containsObject:_gradientLayer]) {
+ [_gradientLayer removeFromSuperlayer];
+ }
+ _gradientLayer = [WXUtility gradientLayerFromColors:@[startColor, endColor] locations:nil frame:strongSelf.view.bounds gradientType:[linearGradient[@"gradientType"] integerValue]];
+ [strongSelf.view.layer insertSublayer:_gradientLayer atIndex:0];
strongSelf.view.layer.masksToBounds = YES;
}
});
[3/6] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Posted by bo...@apache.org.
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-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/858cbc8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/858cbc8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/858cbc8f
Branch: refs/heads/0.12-dev
Commit: 858cbc8f15e4c8132e189b05506f0611819cf5e7
Parents: 0321a83 93c5329
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 14 15:00:58 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 14 15:00:58 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 16 ++++++++--------
android/sdk/libs/armeabi/libweexv8.so | Bin 3563544 -> 3563544 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4545544 -> 4545544 bytes
.../java/com/taobao/weex/WXSDKInstanceTest.java | 1 -
dangerfile.js | 7 ++++++-
ios/sdk/WeexSDK/Resources/main.js | 16 ++++++++--------
6 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[2/6] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Posted by bo...@apache.org.
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-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/0321a83f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0321a83f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0321a83f
Branch: refs/heads/0.12-dev
Commit: 0321a83fcf24f5c5cd04c5a0d09f15a65225706b
Parents: c3dff8e 8c2814a
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 13 19:36:43 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 13 19:36:43 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexv8.so | Bin 3571752 -> 3563544 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4566088 -> 4545544 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 8 --------
.../java/com/taobao/weex/bridge/WXBridge.java | 8 --------
.../com/taobao/weex/bridge/WXBridgeManager.java | 8 ++------
.../java/com/taobao/weex/common/IWXBridge.java | 2 --
.../taobao/weex/bridge/WXWebsocketBridge.java | 3 ---
7 files changed, 2 insertions(+), 27 deletions(-)
----------------------------------------------------------------------