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/70af2318 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/70af2318 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/70af2318 Branch: refs/heads/0.12-dev Commit: 70af23183dfa910108cfffb5bbbcbd133f992db9 Parents: 5e56f38 8e120a9 Author: tancy <ron...@gmail.com> Authored: Mon Apr 24 11:45:45 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Mon Apr 24 11:45:45 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 7 +- NOTICE | 96 -------------------- POSSIBLE-NOTICES-FOR-BIN-DIST | 96 ++++++++++++++++++++ WeexSDK.podspec | 1 + ios/playground/Podfile | 2 +- .../WeexSDK/Sources/Component/WXListComponent.m | 5 +- .../WeexSDK/Sources/Loader/WXResourceLoader.m | 6 ++ .../Sources/Manager/WXComponentManager.m | 7 +- .../Sources/Network/WXResourceRequestHandler.h | 3 + .../WXResourceRequestHandlerDefaultImpl.m | 6 ++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 +- package.json | 2 +- test/pages/components/textarea-maxlength.vue | 8 +- test/pages/dom-operation.vue | 18 ++-- test/pages/image-onload.vue | 4 +- test/pages/index.vue | 4 +- test/pages/list-scroll.vue | 5 +- test/pages/scroller-scroll.vue | 4 +- test/pages/slider-infinite.vue | 4 +- test/run.sh | 1 - test/scripts/components/scroll-event.test.js | 8 +- test/scripts/components/slider-infinite.test.js | 4 +- test/scripts/components/text.test.js | 2 +- .../components/textarea-maxlength.test.js | 6 +- test/scripts/dom.test.js | 40 ++++---- 25 files changed, 180 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/70af2318/package.json ----------------------------------------------------------------------
