You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:52 UTC
[41/50] [abbrv] incubator-weex git commit: Merge remote-tracking
branch 'upstream/ios-feature-20170118' into ios-jsframework-0.19.7
Merge remote-tracking branch 'upstream/ios-feature-20170118' into ios-jsframework-0.19.7
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ee0f2bbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee0f2bbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee0f2bbb
Branch: refs/heads/master
Commit: ee0f2bbb55d14cd7095eb3d28d6c0db71c27a417
Parents: d0748c2 46332dd
Author: boboning <ni...@163.com>
Authored: Wed Jan 11 16:52:03 2017 +0800
Committer: boboning <ni...@163.com>
Committed: Wed Jan 11 16:52:03 2017 +0800
----------------------------------------------------------------------
examples/module/websocket-demo.we | 2 +-
ios/sdk/WeexSDK.podspec | 10 +-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 25 ++--
.../Sources/Component/WXImageComponent.m | 24 ++--
.../Sources/Component/WXScrollerComponent.m | 2 +-
.../Sources/Component/WXTextAreaComponent.m | 113 ++++++++-----------
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 +
.../Sources/Component/WXTextInputComponent.m | 14 +--
.../Sources/Display/WXComponent+Display.m | 6 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 7 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 14 ++-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 25 +++-
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
.../Sources/Manager/WXComponentManager.m | 17 +++
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 4 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 6 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 50 +++++++-
.../Sources/Model/WXSDKInstance_private.h | 3 +
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 28 +++--
.../Sources/Protocol/WXNavigationProtocol.h | 31 ++++-
21 files changed, 235 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee0f2bbb/ios/sdk/WeexSDK.podspec
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK.podspec
index f240ecd,057c435..17ec318
--- a/ios/sdk/WeexSDK.podspec
+++ b/ios/sdk/WeexSDK.podspec
@@@ -2,7 -2,7 +2,9 @@@
Pod::Spec.new do |s|
s.name = "WeexSDK"
- s.version = "0.10.0"
++
+ s.version = "0.9.5"
++
s.summary = "WeexSDK Source ."
s.description = <<-DESC