Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-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/68f279a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68f279a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68f279a5

Branch: refs/heads/0.16-dev
Commit: 68f279a59dba4c8efc29776068fb96702e5344e1
Parents: 48065f9 05c3fc3
Author: acton393 <zhangxing610...@gmail.com>
Authored: Mon Aug 28 17:08:45 2017 +0800
Committer: acton393 <zhangxing610...@gmail.com>
Committed: Mon Aug 28 17:08:45 2017 +0800

----------------------------------------------------------------------
 .../java/com/alibaba/weex/WXPageActivity.java   |   5 +-
 android/sdk/libs/armeabi/libweexjsb.so          | Bin 22556 -> 0 bytes
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 325660 -> 7570392 bytes
 android/sdk/libs/armeabi/libweexjss.so          | Bin 6754012 -> 0 bytes
 .../java/com/taobao/weex/WXSDKInstance.java     |  23 +++--
 .../com/taobao/weex/common/IWXDebugProxy.java   |   2 +
 .../weex/ui/component/AppearanceHelper.java     |   9 +-
 .../taobao/weex/ui/component/WXScroller.java    |   2 +-
 .../ui/component/list/BasicListComponent.java   |  34 +++++--
 dangerfile.js                                   |   2 +-
 doc/_config.yml                                 |   2 +
 doc/_config_cn.yml                              |   2 +
 doc/source/cn/guide/integrate-to-your-app.md    |   6 +-
 doc/source/cn/guide/tools/index.md              |   1 +
 doc/source/cn/guide/tools/plugin.md             |  77 +++++++++++++++
 doc/source/cn/references/common-style.md        |  59 ++++++++++-
 doc/source/cn/references/modules/animation.md   |  37 +++----
 doc/source/guide/integrate-to-your-app.md       |   6 +-
 doc/source/guide/tools/index.md                 |   1 +
 doc/source/guide/tools/plugin.md                |  68 +++++++++++++
 doc/source/references/common-style.md           |  57 +++++++++++
 doc/source/references/modules/animation.md      |  46 ++++-----
 doc/themes/weex/languages/en.yml                |   2 +-
 .../weex/layout/_partial/after-footer.ejs       |  10 ++
 doc/themes/weex/layout/_partial/header.ejs      |   3 +
 doc/themes/weex/layout/_partial/sidebar.ejs     |   3 +
 doc/themes/weex/source/css/index.scss           |  42 ++++++--
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |  12 +--
 test/mocha.opts                                 |   2 -
 test/pages/attributes/dom-operation.vue         |  33 +++++++
 test/pages/components/a-src.vue                 |  19 ++++
 test/pages/components/hyperlink.vue             |  31 ------
 test/pages/components/hyperlink_target.vue      |  23 -----
 test/pages/components/image-onload.vue          |  65 ++++++++++++
 test/pages/components/list-scroll.vue           |  33 +++++++
 test/pages/components/scroller-scroll.vue       |  31 ++++++
 test/pages/components/slider-infinite.vue       |  54 ++++++++++
 test/pages/dom-operation.vue                    |  33 -------
 test/pages/image-onload.vue                     |  31 ------
 test/pages/index.vue                            |  30 ------
 test/pages/list-scroll.vue                      |  33 -------
 test/pages/scroller-scroll.vue                  |  31 ------
 test/pages/slider-infinite.vue                  |  54 ----------
 test/scripts/attributes/compositing.test.js     |   5 +-
 test/scripts/attributes/dom.test.js             |  98 +++++++++++++++++++
 test/scripts/components/a-src.test.js           |  44 ++++++---
 test/scripts/components/hyperlink.test.js       |  44 ---------
 test/scripts/components/iconfont.test.js        |   2 +-
 test/scripts/components/image-onload.test.js    |  32 ++----
 test/scripts/components/input-event.test.js     |   2 +-
 test/scripts/components/recycler.test.js        |  20 +++-
 test/scripts/components/refresh-loading.test.js |  12 +--
 test/scripts/components/scroll-event.test.js    |  11 ++-
 test/scripts/components/scroller-fixed.test.js  |   2 +-
 test/scripts/components/slider-common.test.js   |   4 +-
 test/scripts/components/slider-infinite.test.js |   4 +-
 test/scripts/components/switch-event.test.js    |   2 +-
 test/scripts/components/text.test.js            |   8 +-
 .../components/textarea-maxlength.test.js       |   3 +-
 test/scripts/components/video-property.test.js  |   2 +-
 test/scripts/components/web-event.test.js       |   2 +-
 test/scripts/css/border.test.js                 |   3 +-
 test/scripts/dom.test.js                        |  97 ------------------
 test/scripts/index.test.js                      |  77 ---------------
 .../scripts/modules/animation-translate.test.js |   5 +-
 test/scripts/modules/clipboard-event.test.js    |   5 +-
 test/scripts/modules/gesture-longpress.test.js  |   5 +-
 test/scripts/modules/globalEvent.test.js        |   2 +-
 test/scripts/modules/modal-event.test.js        |   5 +-
 test/scripts/modules/picker-event.test.js       |   5 +-
 test/scripts/modules/timer.test.js              |   5 +-
 test/scripts/util.js                            |  21 ++--
 72 files changed, 880 insertions(+), 661 deletions(-)
----------------------------------------------------------------------


Reply via email to