You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/16 03:49:11 UTC

[03/13] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/043bc963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/043bc963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/043bc963

Branch: refs/heads/0.16-dev
Commit: 043bc9631801a6e74e6c4147ab057b6f17b5f27c
Parents: a2e79af 5894ef6
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 10 17:03:43 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 10 17:03:43 2017 +0800

----------------------------------------------------------------------
 .gitignore                                      |     2 +-
 .travis.yml                                     |     8 +-
 android/build.gradle                            |     8 +-
 .../java/com/taobao/weex/bridge/WXBridge.java   |     8 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java |    36 +-
 .../taobao/weex/bridge/WXValidateProcessor.java |     7 +-
 .../java/com/taobao/weex/common/Constants.java  |     1 +
 .../java/com/taobao/weex/dom/WXDomObject.java   |    17 +-
 .../com/taobao/weex/dom/WXTextDomObject.java    |    91 +-
 .../dom/action/AbstractAddElementAction.java    |     2 +-
 .../taobao/weex/dom/action/AnimationAction.java |     1 +
 .../ui/animation/CameraDistanceProperty.java    |    54 +
 .../weex/ui/animation/WXAnimationBean.java      |    86 +-
 .../taobao/weex/ui/component/WXComponent.java   |    16 -
 .../java/com/taobao/weex/utils/WXViewUtils.java |     4 +-
 build/build.js                                  |     1 +
 build/config.js                                 |    17 +-
 html5/frameworks/legacy/core/array.js           |     4 +
 html5/frameworks/legacy/core/object.js          |     6 +
 html5/frameworks/legacy/static/create.js        |     7 +-
 html5/frameworks/legacy/vm/directive.js         |     6 +
 html5/frameworks/vanilla/index.js               |    35 +-
 html5/render/vue/README.md                      |    15 +
 html5/render/vue/components/image.js            |    58 +-
 html5/render/vue/config.js                      |    10 +-
 html5/render/vue/core/node.js                   |    27 +-
 html5/render/vue/lib/gesture.js                 |     6 +
 html5/render/vue/modules/modal/toast.js         |    23 +-
 html5/runtime/callback-manager.js               |    12 +-
 html5/runtime/config.js                         |     5 +-
 html5/runtime/normalize.js                      |   107 +
 html5/runtime/task-center.js                    |    59 +-
 html5/runtime/vdom/document.js                  |     2 +
 html5/runtime/vdom/element.js                   |    15 +-
 html5/test/render/vue/core/node.js              |     2 +
 ios/.gitignore                                  |     1 +
 .../WeexDemo.xcodeproj/project.pbxproj          |    24 +-
 ios/playground/WeexDemo/AppDelegate.m           |     8 +-
 ios/playground/WeexDemo/WXDemoViewController.m  |     2 -
 ios/playground/WeexDemo/WXExtModule.h           |    26 +
 ios/playground/WeexDemo/WXExtModule.m           |    43 +
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |     8 +
 .../Component/Recycler/WXRecyclerComponent.m    |    58 +-
 .../Recycler/WXRecyclerDragController.h         |    52 +
 .../Recycler/WXRecyclerDragController.m         |   208 +
 .../Sources/Component/WXImageComponent.m        |   150 +-
 .../WeexSDK/Sources/Loader/WXResourceLoader.m   |     2 +-
 ios/sdk/WeexSDK/Sources/WeexSDK.h               |     1 +
 package.json                                    |    17 +-
 packages/weex-js-framework/.npmignore           |     4 +
 packages/weex-js-framework/index.js             | 26001 +++++++++++++++++
 packages/weex-js-framework/index.min.js         |     1 +
 packages/weex-js-framework/package.json         |    22 +
 packages/weex-js-runtime/.npmignore             |     4 +
 packages/weex-js-runtime/index.js               |  4088 +++
 packages/weex-js-runtime/index.min.js           |     1 +
 packages/weex-js-runtime/index.min.js.gz        |   Bin 0 -> 13215 bytes
 packages/weex-js-runtime/package.json           |    22 +
 packages/weex-legacy-framework/.npmignore       |     4 +
 packages/weex-legacy-framework/index.js         |  5770 ++++
 packages/weex-legacy-framework/index.min.js     |     1 +
 packages/weex-legacy-framework/package.json     |    22 +
 packages/weex-vue-render/README.md              |    15 +
 packages/weex-vue-render/package.json           |     2 +-
 pre-build/native-bundle-main.js                 |    16 +-
 scripts/commit-msg.sh                           |     2 +-
 test/pages/components/iconfont.vue              |    71 +
 test/pages/components/input-event.vue           |    65 +
 test/pages/components/refresh-loading.vue       |   115 +
 test/pages/components/switch-event.vue          |    60 +
 test/pages/components/web-event.vue             |    56 +
 test/pages/include/button.vue                   |   162 +
 test/pages/include/h1.vue                       |    13 +
 test/pages/include/h2.vue                       |    13 +
 test/pages/include/h3.vue                       |    13 +
 test/pages/include/hn.vue                       |    47 +
 test/pages/include/panel.vue                    |   141 +
 test/pages/include/wxc-desc.vue                 |    66 +
 test/pages/modules/animation-translate.vue      |   129 +
 test/pages/modules/clipboard-event.vue          |    57 +
 test/pages/modules/cover-generate.vue           |    53 +
 test/pages/modules/downgrade-event.vue          |    74 +
 test/pages/modules/gesture-longpress.vue        |    75 +
 test/pages/modules/modal-event.vue              |    61 +
 test/pages/modules/picker-event.vue             |    63 +
 test/pages/modules/storage-event.vue            |    59 +
 test/pages/modules/stream-result.vue            |    85 +
 test/run.sh                                     |    30 +-
 test/screenshot/border-android.png              |   Bin 156247 -> 158634 bytes
 test/scripts/components/iconfont.test.js        |    34 +
 test/scripts/components/input-event.test.js     |    36 +
 test/scripts/components/refresh-loading.test.js |    38 +
 test/scripts/components/switch-event.test.js    |    38 +
 test/scripts/components/web-event.test.js       |    30 +
 .../scripts/modules/animation-translate.test.js |    40 +
 test/scripts/modules/clipboard-event.test.js    |    35 +
 test/scripts/modules/downgrade-event.test.js    |    30 +
 test/scripts/modules/gesture-longpress.test.js  |    37 +
 test/scripts/modules/modal-event.test.js        |    35 +
 test/scripts/modules/picker-event.test.js       |    41 +
 test/scripts/modules/storage-event.test.js      |    36 +
 test/scripts/modules/stream-result.test.js      |    34 +
 test/scripts/util.js                            |    41 +
 test/scripts/zcover-generate.js                 |    32 +
 test/serve.sh                                   |     2 +-
 105 files changed, 39057 insertions(+), 323 deletions(-)
----------------------------------------------------------------------