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/06/02 03:04:23 UTC
[1/2] incubator-weex git commit: + [ios] fix bug: when add
IndicatorView lazy . the IndicatorView can not create in slider successfully
Repository: incubator-weex
Updated Branches:
refs/heads/0.14-dev 6c30b4371 -> 08df59707
+ [ios] fix bug: when add IndicatorView lazy . the IndicatorView can not create in slider successfully
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e8d1fd10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e8d1fd10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e8d1fd10
Branch: refs/heads/0.14-dev
Commit: e8d1fd1094230a6f7919e87480586798765b8e12
Parents: 76dd775
Author: 齐山 <su...@163.com>
Authored: Thu Jun 1 21:43:39 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Jun 1 21:43:39 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m | 1 +
ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8d1fd10/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
index 8e3488c..517af72 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
@@ -431,6 +431,7 @@ typedef NS_ENUM(NSInteger, Direction) {
if ([view isKindOfClass:[WXIndicatorView class]]) {
((WXIndicatorComponent *)subcomponent).delegate = self;
[recycleSliderView addSubview:view];
+ [self setIndicatorView:(WXIndicatorView *)view];
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8d1fd10/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
index 1077bc8..f6451cd 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
@@ -449,6 +449,7 @@
if ([view isKindOfClass:[WXIndicatorView class]]) {
((WXIndicatorComponent *)subcomponent).delegate = self;
[sliderView addSubview:view];
+ [self setIndicatorView:(WXIndicatorView *)view];
return;
}
[2/2] incubator-weex git commit: Merge branches '0.14-dev' and
'0.14-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into
wip-us-0.14-dev
Posted by ac...@apache.org.
Merge branches '0.14-dev' and '0.14-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.14-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/08df5970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08df5970
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08df5970
Branch: refs/heads/0.14-dev
Commit: 08df59707905ce0e2750a2d5425a20063df89b41
Parents: e8d1fd1 6c30b43
Author: acton393 <zh...@gmail.com>
Authored: Fri Jun 2 11:04:08 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jun 2 11:04:08 2017 +0800
----------------------------------------------------------------------
android/build.gradle | 8 +-
android/commons/build.gradle | 1 +
.../adapter/DefaultWebSocketAdapter.java | 54 ++++-
.../weex/commons/util/RequestIdGenerator.java | 15 ++
.../weex/commons/util/WSEventReporter.java | 192 ++++++++++++++++
android/playground/app/build.gradle | 2 +-
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../extend/adapter/InterceptWXHttpAdapter.java | 57 +++--
.../com/taobao/weex/bridge/WXBridgeManager.java | 45 ++--
.../com/taobao/weex/common/WXPerformance.java | 9 +-
.../ui/component/AbstractEditComponent.java | 16 +-
.../taobao/weex/ui/component/WXComponent.java | 23 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 3 +-
.../java/com/taobao/weex/WXSDKEngineTest.java | 1 -
test/mocha.opts | 2 +-
test/pages/components/scroller-fixed.vue | 14 +-
test/pages/components/slider-common.vue | 229 +++++++++++++++++++
test/scripts/components/recycler.test.js | 12 +-
test/scripts/components/scroller-fixed.test.js | 5 +-
test/scripts/components/slider-common.test.js | 100 ++++++++
test/scripts/util.js | 24 ++
21 files changed, 729 insertions(+), 85 deletions(-)
----------------------------------------------------------------------