You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/07/21 09:01:16 UTC
[14/16] incubator-weex git commit: Merge branch '0.15-dev' into
iOS-dynamic-framework
Merge branch '0.15-dev' into iOS-dynamic-framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4d122d43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4d122d43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4d122d43
Branch: refs/heads/0.15-dev
Commit: 4d122d43e93c4ebf8ffd0c53a4f40f0d9903b209
Parents: 0895a74 10a074f
Author: acton393 <ac...@users.noreply.github.com>
Authored: Wed Jul 19 15:13:55 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Jul 19 15:13:55 2017 +0800
----------------------------------------------------------------------
.travis.yml | 1 -
README.md | 2 +-
WeexSDK.podspec | 2 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 7575352 -> 7570504 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12130116 -> 12121924 bytes
.../java/com/taobao/weex/ComponentObserver.java | 50 ++
.../java/com/taobao/weex/WXEnvironment.java | 4 +
.../java/com/taobao/weex/WXSDKInstance.java | 16 +
.../com/taobao/weex/bridge/WXBridgeManager.java | 12 +-
.../java/com/taobao/weex/common/WXConfig.java | 1 +
.../com/taobao/weex/common/WXImageStrategy.java | 9 +-
.../main/java/com/taobao/weex/dom/WXAttr.java | 38 +-
.../java/com/taobao/weex/dom/WXDomModule.java | 2 +-
.../com/taobao/weex/dom/WXImageQuality.java | 4 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 4 +-
.../com/taobao/weex/dom/action/Actions.java | 4 +-
.../ui/component/AbstractEditComponent.java | 14 +-
.../com/taobao/weex/ui/component/Textarea.java | 6 +
.../taobao/weex/ui/component/WXComponent.java | 28 +-
.../taobao/weex/ui/component/WXScroller.java | 79 ++-
.../com/taobao/weex/ui/component/WXSlider.java | 10 +-
.../ui/component/list/BasicListComponent.java | 73 +-
.../taobao/weex/ui/component/list/WXCell.java | 9 +
.../com/taobao/weex/ui/view/WXEditText.java | 9 +-
.../weex/ui/view/WXHorizontalScrollView.java | 27 +
.../com/taobao/weex/ui/view/WXScrollView.java | 1 -
.../java/com/taobao/weex/dom/WXAttrTest.java | 19 +-
build/karma.vue.conf.js | 9 +-
build/webpack.examples.web.config.js | 1 +
build/webpack.test.web.config.js | 1 +
doc/_config.yml | 7 +
doc/_config_cn.yml | 7 +
doc/source/cn/references/components/text.md | 64 +-
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/cn/references/modules/meta.md | 96 +++
doc/source/cn/references/modules/picker.md | 2 +-
doc/source/cn/references/modules/timer.md | 47 ++
doc/source/cn/references/weex-variable.md | 1 +
doc/source/cn/releasenote.md | 663 ++-----------------
doc/source/faq.md | 6 +-
doc/source/guide/index.md | 26 +-
doc/source/guide/intro/using-vue.md | 6 +-
doc/source/references/components/text.md | 69 +-
doc/source/references/modules/dom.md | 2 +-
doc/source/references/modules/meta.md | 97 +++
doc/source/references/modules/timer.md | 59 ++
doc/source/references/weex-variable.md | 1 +
doc/source/releasenote.md | 663 ++-----------------
doc/themes/weex/layout/_partial/head.ejs | 3 +
doc/themes/weex/layout/layout.ejs | 15 +
doc/themes/weex/layout/post.ejs | 7 -
doc/themes/weex/source/css/common.scss | 14 +-
doc/themes/weex/source/css/docsearch.min.css | 2 +
doc/themes/weex/source/css/media-queries.scss | 2 +-
.../weex/source/css/partial/highlight.scss | 7 +-
.../weex/source/css/partial/search-form.scss | 44 +-
doc/themes/weex/source/css/variable.scss | 4 +-
doc/themes/weex/source/js/docsearch.min.js | 7 +
examples/vue/hello.vue | 2 +-
examples/vue/index.vue | 1 +
examples/vue/market/gcanvas.vue | 36 +-
examples/vue/modules/websocket.vue | 116 ++++
html5/render/vue/README.md | 19 +-
html5/render/vue/components/index.js | 4 +-
html5/render/vue/components/input.js | 52 +-
.../vue/components/scrollable/list/index.js | 3 +-
.../components/scrollable/loading-indicator.js | 145 +++-
.../render/vue/components/scrollable/loading.js | 4 +-
.../render/vue/components/scrollable/refresh.js | 4 +-
.../vue/components/scrollable/scroller.js | 3 +-
.../vue/components/scrollable/waterfall.js | 3 +-
.../render/vue/components/slider/slideMixin.js | 41 +-
html5/render/vue/core/node.js | 172 +++--
html5/render/vue/core/style.js | 51 +-
html5/render/vue/env/global.js | 2 +
html5/render/vue/env/weex.js | 6 +
html5/render/vue/env/wx-env.js | 2 +-
html5/render/vue/mixins/base.js | 16 +-
html5/render/vue/mixins/scrollable.js | 48 +-
html5/render/vue/mixins/style.js | 59 +-
html5/render/vue/modules/index.js | 2 +
html5/render/vue/modules/websocket/index.js | 26 +
html5/render/vue/modules/websocket/websocket.js | 61 ++
html5/render/vue/styles/base.css | 56 --
html5/render/vue/utils/func.js | 30 +
html5/render/vue/utils/style.js | 107 ++-
html5/shared/console.js | 10 +-
html5/test/render/vue/core/node.js | 22 +-
html5/test/render/vue/core/scope-style-map.js | 4 +
html5/test/render/vue/helper/utils.js | 10 +-
html5/test/render/vue/modules/modal.js | 225 +++++++
html5/test/render/vue/modules/websocket.js | 108 +++
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 33 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
.../WeexSDK/Sources/Component/WXAComponent.m | 2 +-
.../Sources/Component/WXCycleSliderComponent.m | 13 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 2 +-
.../Sources/Component/WXImageComponent.m | 4 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 58 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 83 ++-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 24 +-
.../Sources/Component/WXVideoComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 19 +-
.../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 14 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 24 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 +
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +-
.../Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 -
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 16 +-
.../Sources/View/WXComponent+ViewManagement.m | 4 +
ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 +
package.json | 8 +-
packages/weex-vue-render/package.json | 8 +-
test/pages/components/textarea-maxlength.vue | 10 +-
test/screenshot/border-ios.png | Bin 126375 -> 126185 bytes
.../components/textarea-maxlength.test.js | 6 +-
test/scripts/util.js | 2 +-
124 files changed, 2360 insertions(+), 1840 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d122d43/README.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d122d43/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d122d43/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d122d43/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d122d43/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
----------------------------------------------------------------------