Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/68b2b571 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68b2b571 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68b2b571 Branch: refs/heads/0.12-dev Commit: 68b2b57100569ef5158c49274a50cc8eb6f2291b Parents: acb310f 51ba988 Author: cxfeng <cxf...@apache.org> Authored: Mon Apr 10 13:51:23 2017 +0800 Committer: cxfeng <cxf...@apache.org> Committed: Mon Apr 10 13:51:23 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 + .../Sources/Component/WXCycleSliderComponent.h | 18 + .../Sources/Component/WXCycleSliderComponent.m | 594 +++++++++++++++++++ .../Sources/Component/WXIndicatorComponent.h | 8 + .../Sources/Component/WXIndicatorComponent.m | 16 +- .../Sources/Component/WXSliderComponent.m | 5 +- .../Component/WXSliderNeighborComponent.h | 3 + .../Component/WXSliderNeighborComponent.m | 5 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 + 9 files changed, 646 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
