You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/17 05:49:20 UTC
[16/50] [abbrv] incubator-weex git commit: Merge remote-tracking
branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor
Merge remote-tracking branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e100f8ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e100f8ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e100f8ae
Branch: refs/heads/dev
Commit: e100f8ae87a50e56adc6eb095328e35be119e458
Parents: e2205bf 3774b1b
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 13 17:49:50 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 13 17:49:50 2017 +0800
----------------------------------------------------------------------
.eslintignore | 1 +
.gitignore | 2 +-
.travis.yml | 2 +-
NOTICE | 8 +-
android/sdk/assets/main.js | 15 +-
android/sdk/libs/armeabi/libweexv8.so | Bin 3563544 -> 3571752 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4545544 -> 4566088 bytes
.../main/java/com/taobao/weex/WXSDKEngine.java | 3 +
.../java/com/taobao/weex/WXSDKInstance.java | 10 +-
.../weex/appfram/pickers/WXPickersModule.java | 2 +
.../java/com/taobao/weex/bridge/WXBridge.java | 8 +
.../com/taobao/weex/bridge/WXBridgeManager.java | 8 +-
.../java/com/taobao/weex/common/IWXBridge.java | 2 +
.../com/taobao/weex/dom/WXCellDomObject.java | 57 ++
.../taobao/weex/dom/WXRecyclerDomObject.java | 29 +-
.../taobao/weex/ui/component/WXComponent.java | 13 +-
.../com/taobao/weex/ui/component/WXDiv.java | 4 +-
.../com/taobao/weex/ui/view/IRenderResult.java | 26 +
.../com/taobao/weex/ui/view/WXFrameLayout.java | 19 +-
.../com/taobao/weex/ui/view/WXImageView.java | 9 +-
.../com/taobao/weex/ui/view/WXTextView.java | 9 +-
.../taobao/weex/ui/component/WXTextTest.java | 5 +-
.../taobao/weex/bridge/WXWebsocketBridge.java | 3 +
build/karma.vue.conf.js | 7 +-
build/webpack.examples.web.config.js | 31 +-
build/webpack.test.web.config.js | 81 +++
dangerfile.js | 11 +-
examples/vue/showcase/itemlist.vue | 11 +-
examples/vue/style/index.vue | 2 +-
.../npm/karma-rollup-preprocessor_vx.x.x.js | 53 ++
flow-typed/npm/karma-sinon-chai_vx.x.x.js | 38 ++
html5/render/browser/base/component/lazyload.js | 1 -
html5/render/browser/extend/api/webSocket.js | 1 -
.../browser/extend/components/image/index.js | 1 -
.../extend/components/scrollable/motion.js | 1 -
.../extend/components/scrollable/scrollable.js | 1 -
html5/render/browser/utils/index.js | 1 -
html5/render/vue/README.md | 24 +-
html5/render/vue/components/a.js | 18 +-
html5/render/vue/components/div.js | 18 +-
html5/render/vue/components/image.js | 25 +-
html5/render/vue/components/input.js | 18 +-
.../render/vue/components/scrollable/header.js | 6 +-
.../vue/components/scrollable/list/cell.js | 7 +-
.../vue/components/scrollable/list/index.js | 6 +-
.../vue/components/scrollable/list/style.js | 16 +
.../components/scrollable/loading-indicator.js | 43 +-
.../render/vue/components/scrollable/loading.js | 6 +-
.../render/vue/components/scrollable/refresh.js | 6 +-
.../vue/components/scrollable/scroller.js | 8 +-
html5/render/vue/components/slider/index.js | 37 +-
html5/render/vue/components/slider/indicator.js | 58 +-
html5/render/vue/components/switch.js | 67 ++-
html5/render/vue/components/text.js | 27 +-
html5/render/vue/components/textarea.js | 19 +-
html5/render/vue/components/video.js | 7 +-
html5/render/vue/components/web.js | 19 +-
html5/render/vue/core/index.js | 2 +
html5/render/vue/core/node.js | 28 +
html5/render/vue/core/style.js | 212 ++++++++
html5/render/vue/env/global.js | 11 +
html5/render/vue/env/index.js | 11 +-
html5/render/vue/env/viewport.js | 160 ++++--
html5/render/vue/env/weex.js | 9 +-
html5/render/vue/env/wx-env.js | 76 +--
html5/render/vue/index.js | 13 +-
html5/render/vue/mixins/base.js | 43 --
html5/render/vue/mixins/style.js | 142 +----
html5/render/vue/modules/animation.js | 7 +-
html5/render/vue/modules/dom.js | 5 +-
html5/render/vue/modules/index.js | 2 +-
html5/render/vue/modules/modal/index.js | 10 +-
html5/render/vue/modules/modal/style.js | 146 ++++++
html5/render/vue/styles/base.css | 194 +++++++
html5/render/vue/styles/components.css | 513 ------------------
html5/render/vue/utils/index.js | 36 +-
html5/render/vue/utils/style.js | 110 ++++
html5/test/render/vue/components/image.js | 4 +-
html5/test/render/vue/components/switch.js | 4 -
html5/test/render/vue/components/text.js | 4 -
html5/test/render/vue/components/web.js | 4 -
html5/test/render/vue/core/scope-style-map.js | 76 +++
html5/test/render/vue/core/style.js | 65 +++
.../vue/data/build/dotvue/scoped-style.js | 525 +++++++++++++++++++
html5/test/render/vue/data/css/head1.css | 38 ++
html5/test/render/vue/data/css/head10.css | 14 +
html5/test/render/vue/data/css/head11.css | 2 +
html5/test/render/vue/data/css/head12.css | 2 +
html5/test/render/vue/data/css/head13.css | 25 +
html5/test/render/vue/data/css/head2.css | 11 +
html5/test/render/vue/data/css/head3.css | 25 +
html5/test/render/vue/data/css/head4.css | 56 ++
html5/test/render/vue/data/css/head5.css | 153 ++++++
html5/test/render/vue/data/css/head6.css | 4 +
html5/test/render/vue/data/css/head7.css | 61 +++
html5/test/render/vue/data/css/head8.css | 507 ++++++++++++++++++
html5/test/render/vue/data/css/head9.css | 173 ++++++
.../render/vue/data/dotvue/scoped-style.vue | 13 +
html5/test/render/vue/data/head-css.js | 13 +
html5/test/render/vue/data/head-map.js | 275 ++++++++++
html5/test/render/vue/helper.js | 140 -----
html5/test/render/vue/helper/env.js | 20 +
html5/test/render/vue/helper/index.js | 73 +++
html5/test/render/vue/helper/runtime.js | 74 +++
html5/test/render/vue/helper/utils.js | 8 +
html5/test/render/vue/utils.js | 47 --
html5/test/render/vue/utils/func.js | 49 ++
html5/test/render/vue/utils/style.js | 68 +++
ios/sdk/WeexSDK/Resources/main.js | 15 +-
.../Sources/Component/WXImageComponent.m | 6 +-
.../Sources/Display/WXComponent+Display.m | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 32 +-
package.json | 6 +-
packages/weex-vue-render/README.md | 24 +-
packages/weex-vue-render/package.json | 2 +-
test/ci-funcs.sh | 3 +-
test/pages/components/recycler.vue | 19 +-
test/pages/slider-infinite.vue | 11 +-
test/scripts/components/recycler.test.js | 56 +-
test/scripts/components/slider-infinite.test.js | 15 +-
120 files changed, 4100 insertions(+), 1264 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e100f8ae/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
----------------------------------------------------------------------