Merge branch 'ios-demo-0.12-dev' of https://github.com/kfeagle/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/32ae6e47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/32ae6e47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/32ae6e47 Branch: refs/heads/0.12-dev Commit: 32ae6e47e0d2f92b5d71e12d1dad3c1a6c9af252 Parents: ca6a9ff dd047ba Author: cxfeng <cxf...@apache.org> Authored: Tue Apr 18 15:58:36 2017 +0800 Committer: cxfeng <cxf...@apache.org> Committed: Tue Apr 18 15:58:36 2017 +0800 ---------------------------------------------------------------------- WeexSDK.podspec | 45 +++++++++++++++++++ examples/component/input-demo.we | 14 +++--- examples/index.we | 5 ++- examples/vue/components/input.vue | 14 +++--- examples/vue/index.vue | 3 ++ examples/vue/market/gcanvas.vue | 40 +++++++++++++++++ ios/playground/Podfile | 5 ++- .../WeexDemo.xcodeproj/project.pbxproj | 4 +- ios/sdk/WeexSDK.podspec | 47 -------------------- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 2 +- package.json | 4 +- 11 files changed, 116 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/32ae6e47/ios/playground/WeexDemo.xcodeproj/project.pbxproj ----------------------------------------------------------------------