Merge remote-tracking branch 'remotes/apache/0.15-dev' into android-bugfix-init-index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0228437f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0228437f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0228437f Branch: refs/heads/apache-0.15-dev Commit: 0228437fd5bea47be72060a419908e87eba02a6a Parents: faa7039 ba53cd4 Author: misakuo <misa...@apache.org> Authored: Fri Jul 14 16:53:19 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Fri Jul 14 16:53:19 2017 +0800 ---------------------------------------------------------------------- doc/source/cn/references/modules/timer.md | 47 ++++++++++++++++ doc/source/references/modules/timer.md | 59 ++++++++++++++++++++ examples/vue/hello.vue | 2 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 33 +++++------ .../WeexSDK/Sources/Component/WXAComponent.m | 2 +- .../WeexSDK/Sources/Component/WXEditComponent.m | 2 +- .../Sources/Component/WXImageComponent.m | 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 55 +++++++++++++----- .../WeexSDK/Sources/Component/WXTextComponent.m | 51 +++++++---------- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 8 +-- .../Sources/Component/WXVideoComponent.m | 2 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 2 +- .../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +- ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +- ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- .../Sources/View/WXComponent+ViewManagement.m | 4 ++ ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 ++++++++++ 18 files changed, 231 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
