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/02/20 06:41:25 UTC
[36/50] [abbrv] incubator-weex git commit: Merge branch
'v0.10.0-stable' into dev
Merge branch 'v0.10.0-stable' into dev
# Conflicts:
# doc/advanced/extend-to-android.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f1062d87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f1062d87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f1062d87
Branch: refs/heads/master
Commit: f1062d87b9c38d188c8a329649e851c3de6a8f0b
Parents: 0d244c7 3bab145
Author: sospartan <so...@gmail.com>
Authored: Fri Feb 17 10:25:59 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Fri Feb 17 10:25:59 2017 +0800
----------------------------------------------------------------------
.../commons/adapter/JSExceptionAdapter.java | 222 +
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/module/WXEventModule.java | 8 +-
android/run-ci.sh | 4 +
android/sdk/assets/main.js | 19932 +----------------
android/sdk/build.gradle | 3 +-
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4340864 bytes
.../main/java/com/taobao/weex/InitConfig.java | 13 +
.../main/java/com/taobao/weex/WXSDKEngine.java | 5 +
.../java/com/taobao/weex/WXSDKInstance.java | 14 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 14 +
.../weex/adapter/IWXJSExceptionAdapter.java | 218 +
.../appfram/navigator/WXNavigatorModule.java | 88 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 18 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 31 +-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../taobao/weex/common/WXJSExceptionInfo.java | 331 +
.../java/com/taobao/weex/common/WXModule.java | 12 +-
.../com/taobao/weex/http/WXStreamModule.java | 2 +-
.../taobao/weex/ui/component/Scrollable.java | 8 +
.../java/com/taobao/weex/ui/component/WXA.java | 10 +-
.../taobao/weex/ui/component/WXComponent.java | 42 +-
.../com/taobao/weex/ui/component/WXImage.java | 14 +-
.../com/taobao/weex/ui/component/WXRefresh.java | 8 +-
.../taobao/weex/ui/component/WXScroller.java | 14 +
.../weex/ui/component/WXSliderNeighbor.java | 93 +-
.../ui/component/list/BasicListComponent.java | 26 +-
.../component/list/HorizontalListComponent.java | 2 +-
.../com/taobao/weex/ui/view/WXScrollView.java | 3 +
.../taobao/weex/ui/view/gesture/WXGesture.java | 39 +
.../adapter/WXRecyclerViewOnScrollListener.java | 6 +-
.../refresh/wrapper/BounceRecyclerView.java | 46 +-
.../java/com/taobao/weex/utils/WXUtils.java | 200 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 8 +-
.../java/com/taobao/weex/utils/WXUtilsTest.java | 125 +-
android/sdk/unittest.sh | 3 +-
circle.yml | 6 +-
doc/advanced/extend-to-android.md | 175 +
html5/frameworks/legacy/app/ctrl/init.js | 2 -
html5/frameworks/legacy/app/ctrl/misc.js | 55 +-
html5/frameworks/legacy/app/instance.js | 14 +-
html5/frameworks/legacy/static/create.js | 6 +-
html5/runtime/config.js | 4 +-
html5/runtime/init.js | 4 -
html5/runtime/task-center.js | 57 +
html5/services/amd/index.js | 18 +-
html5/test/case/prepare.js | 6 +-
html5/test/case/tester.js | 48 +-
html5/test/unit/default/app/ctrl.js | 14 +-
html5/test/unit/default/app/index.js | 28 +-
51 files changed, 1715 insertions(+), 20287 deletions(-)
----------------------------------------------------------------------