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/07/20 03:33:55 UTC
[1/3] incubator-weex git commit: remove debug log
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev a679aab2d -> da562689a
remove debug log
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a9c7aaf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a9c7aaf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a9c7aaf2
Branch: refs/heads/0.15-dev
Commit: a9c7aaf20f0655459181275564fa0533c0fff3b9
Parents: 4f48356
Author: 御魂 <we...@alibaba-inc.com>
Authored: Fri Jul 14 14:05:22 2017 +0800
Committer: 御魂 <we...@alibaba-inc.com>
Committed: Fri Jul 14 14:05:22 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9c7aaf2/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
index cd9180e..ab80ff2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
@@ -92,7 +92,6 @@ public final class WXDomModule extends WXModule {
if (method == null) {
return null;
}
- WXLogUtils.e("shiwentao callDomMethod:" + method);
//TODO:add pooling
try {
Action action = Actions.get(method,args);
[3/3] incubator-weex git commit: Merge branch '0.15-dev' of
gitlab.alibaba-inc.com:weex/weex into 0.15-dev
Posted by so...@apache.org.
Merge branch '0.15-dev' of gitlab.alibaba-inc.com:weex/weex into 0.15-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/da562689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/da562689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/da562689
Branch: refs/heads/0.15-dev
Commit: da562689aec6678bb8c7217b859d54e363c8e0ff
Parents: a679aab e1df3db
Author: sospartan <so...@apache.org>
Authored: Thu Jul 20 11:16:54 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jul 20 11:16:54 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: Merge branch '0.15-dev-feature-jsfm'
into 0.15-dev
Posted by so...@apache.org.
Merge branch '0.15-dev-feature-jsfm' into 0.15-dev
* 0.15-dev-feature-jsfm:
* [jsfm] js framework version update to 0.21.1
* [android] fix invalid init index
+ [ios] delete ;
+ [ios] update default to cycslider
* [ios] add more note about get component method @nodanger
* [ios] get component rectangle when component view is not ready
+ [ios] update default to cycslider
* [ios] fix text compatible problem
* [doc] Update doc of timer.
* [html5] bind click listener to event tap.
* [ios] add some change note.
*[ios] fix bug in linear-gradient color update
* [android] fix invalid init index
* [android] fix invalid init index
* [android] fix invalid init index
* [android] fix bug that WXText lines cannot be reset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e1df3db3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e1df3db3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e1df3db3
Branch: refs/heads/0.15-dev
Commit: e1df3db3ef12a3459ee1f0a4935d773509db35ad
Parents: a9c7aaf 161f897
Author: atomtong <to...@qq.com>
Authored: Wed Jul 19 15:32:15 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Wed Jul 19 15:32:15 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/WXTextDomObject.java | 4 +-
.../com/taobao/weex/ui/component/WXSlider.java | 10 +-
doc/source/cn/references/modules/timer.md | 47 +++++
doc/source/references/modules/timer.md | 59 +++++++
.../vue/components/scrollable/list/index.js | 3 +-
.../vue/components/scrollable/scroller.js | 3 +-
.../vue/components/scrollable/waterfall.js | 3 +-
.../render/vue/components/slider/slideMixin.js | 17 +-
html5/render/vue/core/node.js | 172 ++++++++++++++-----
html5/render/vue/env/wx-env.js | 2 +-
html5/render/vue/mixins/base.js | 16 +-
html5/render/vue/mixins/scrollable.js | 18 +-
html5/render/vue/utils/style.js | 30 +++-
html5/test/render/vue/core/node.js | 22 ++-
.../WeexSDK/Sources/Component/WXTextComponent.m | 7 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 8 +-
.../Sources/View/WXComponent+ViewManagement.m | 4 +
package.json | 2 +-
packages/weex-vue-render/package.json | 8 +-
pre-build/native-bundle-main.js | 16 +-
22 files changed, 355 insertions(+), 100 deletions(-)
----------------------------------------------------------------------