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 08:40:14 UTC
[3/4] incubator-weex git commit: Merge branch '0.14-dev' into
0.14-dev-fix-forebackgroundEvent
Merge branch '0.14-dev' into 0.14-dev-fix-forebackgroundEvent
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b5946032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b5946032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b5946032
Branch: refs/heads/0.14-dev
Commit: b5946032eaa7a58bb81563eed00f339a75e69214
Parents: 4f3ee57 98b5b85
Author: acton393 <ac...@users.noreply.github.com>
Authored: Fri Jun 2 16:02:54 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Jun 2 16:02:54 2017 +0800
----------------------------------------------------------------------
.travis.yml | 1 +
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 -
dangerfile.js | 4 +
.../Sources/Component/WXCycleSliderComponent.m | 6 +-
.../Sources/Component/WXSliderComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 27 ++-
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 4 +
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 38 +++
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 5 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 21 +-
.../Sources/View/WXComponent+ViewManagement.m | 14 +-
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 ++
31 files changed, 832 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5946032/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 08a92f1,721ce44..b66e23c
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@@ -139,8 -139,8 +139,9 @@@ CGFloat WXTextDefaultLineThroughWidth
{
self = [super initWithRef:ref type:type styles:styles attributes:attributes events:events weexInstance:weexInstance];
if (self) {
+ _notifyRepaint = NO;
// just for coretext and textkit render replacement
+ _needsRemoveObserver = NO;
if ([attributes objectForKey:@"coretext"]) {
_useCoreTextAttr = [WXConvert NSString:attributes[@"coretext"]];
} else {