You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@weex.apache.org by jo...@apache.org on 2018/11/21 07:54:37 UTC

[incubator-weex] 01/01: Merge pull request #1787 from apache/revert-1786-fix-rc-0.20

This is an automated email from the ASF dual-hosted git repository.

jondong pushed a commit to branch rc-0.20.0
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git

commit 0b6cfecb747bc4eb6f9afd72ad6ba6aae3d270d5
Merge: f060ad8 b79bb7c
Author: Jonathan Dong <jo...@apache.org>
AuthorDate: Wed Nov 21 15:54:31 2018 +0800

    Merge pull request #1787 from apache/revert-1786-fix-rc-0.20
    
    Revert "Fix rc 0.20"

 .../Sources/Component/WXCycleSliderComponent.mm    |  3 -
 .../Sources/Component/WXScrollerComponent.mm       |  2 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h       | 30 +-------
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m       | 17 +----
 .../WeexSDK/Sources/Layout/WXComponent+Layout.h    | 72 +------------------
 .../WeexSDK/Sources/Layout/WXComponent+Layout.mm   | 80 ----------------------
 ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h  |  7 +-
 ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m  | 26 ++-----
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m      | 13 +++-
 ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m |  2 +-
 .../Utility/WXThreadSafeMutableDictionary.m        | 16 +----
 weex_core/Source/core/layout/flex_enum.h           |  8 +--
 weex_core/Source/core/layout/layout.h              |  2 +-
 weex_core/Source/core/render/page/render_page.cpp  |  8 ++-
 14 files changed, 35 insertions(+), 251 deletions(-)