weex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From misa...@apache.org
Subject [2/2] incubator-weex git commit: Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into foo
Date Tue, 04 Jul 2017 09:41:38 GMT
Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into foo


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bda0f674
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bda0f674
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bda0f674

Branch: refs/heads/0.15-dev
Commit: bda0f674a3f3632ba734bb40eb77bd48e2559466
Parents: 040c188 082c43e
Author: misakuo <misakuo@apache.org>
Authored: Tue Jul 4 17:41:18 2017 +0800
Committer: misakuo <misakuo@apache.org>
Committed: Tue Jul 4 17:41:18 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 +-
 .../ui/component/AbstractEditComponent.java     |  14 +-
 .../com/taobao/weex/ui/component/Textarea.java  |   6 +
 .../taobao/weex/ui/component/WXComponent.java   |  28 +-
 .../ui/component/list/BasicListComponent.java   |  73 +-
 .../taobao/weex/ui/component/list/WXCell.java   |   9 +
 .../com/taobao/weex/ui/view/WXEditText.java     |   9 +-
 .../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/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/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/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 +-
 .../components/scrollable/loading-indicator.js  | 145 +++-
 .../render/vue/components/scrollable/loading.js |   4 +-
 .../render/vue/components/scrollable/refresh.js |   4 +-
 .../render/vue/components/slider/slideMixin.js  |  24 +-
 html5/render/vue/core/style.js                  |  51 +-
 html5/render/vue/env/global.js                  |   2 +
 html5/render/vue/env/weex.js                    |   6 +
 html5/render/vue/mixins/scrollable.js           |  38 +-
 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                 |  77 +++
 html5/shared/console.js                         |  10 +-
 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 +++
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |   2 +-
 .../Sources/Component/WXCycleSliderComponent.m  |   7 +
 .../WeexSDK/Sources/Component/WXListComponent.m |   3 +
 .../WeexSDK/Sources/Component/WXTextComponent.m |  78 ++-
 .../WeexSDK/Sources/Events/WXComponent+Events.m |  19 +-
 ios/sdk/WeexSDK/Sources/Module/WXDomModule.m    |  16 +-
 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h      |   2 +-
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.h     |   2 -
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m     |  16 +-
 package.json                                    |   8 +-
 packages/weex-vue-render/package.json           |   2 +-
 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 +-
 91 files changed, 1821 insertions(+), 1649 deletions(-)
----------------------------------------------------------------------



Mime
View raw message