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/11 06:06:49 UTC
[1/3] incubator-weex git commit: * [android] fix NPE in move fixed
view
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 9d8f242eb -> 8174a3fb4
* [android] fix NPE in move fixed view
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/481b50a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/481b50a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/481b50a4
Branch: refs/heads/0.11-dev
Commit: 481b50a4444f682505dd0fa4cb6d258a538f9e6e
Parents: 6f86194
Author: sospartan <so...@apache.org>
Authored: Thu Apr 6 17:49:40 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Apr 6 17:50:08 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/WXSDKInstance.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/481b50a4/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 284dad3..b0d087f 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -1295,9 +1295,13 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
*/
public void moveFixedView(View fixedChild){
if(mRenderContainer != null) {
- if (fixedChild.getParent() != mRenderContainer) {
- ViewGroup viewGroup = (ViewGroup) fixedChild.getParent();
- viewGroup.removeView(fixedChild);
+ ViewGroup parent;
+ if((parent = (ViewGroup) fixedChild.getParent()) != null){
+ if (parent != mRenderContainer) {
+ parent.removeView(fixedChild);
+ mRenderContainer.addView(fixedChild);
+ }
+ }else{
mRenderContainer.addView(fixedChild);
}
}
[3/3] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-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/8174a3fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8174a3fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8174a3fb
Branch: refs/heads/0.11-dev
Commit: 8174a3fb420c58087b8b3bea4575017326f51b2c
Parents: 073dee7 9d8f242
Author: sospartan <so...@apache.org>
Authored: Tue Apr 11 10:58:59 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue Apr 11 10:58:59 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 4 +-
.../appfram/navigator/WXNavigatorModule.java | 4 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 40 ++++++++++++++++++++
3 files changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8174a3fb/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
[2/3] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-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/073dee7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/073dee7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/073dee7b
Branch: refs/heads/0.11-dev
Commit: 073dee7b47334275795a36d42dfd6e14d362caa9
Parents: 481b50a 9afe27b
Author: sospartan <so...@apache.org>
Authored: Mon Apr 10 14:45:23 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Mon Apr 10 14:45:23 2017 +0800
----------------------------------------------------------------------
examples/vue/components/sliderinfinite.vue | 46 ++++++++++++++++++++
html5/render/vue/components/slider/index.js | 6 ++-
.../render/vue/components/slider/slideMixin.js | 24 +++++++++-
html5/render/vue/modules/dom.js | 4 ++
package.json | 1 +
vue.html | 10 ++---
6 files changed, 83 insertions(+), 8 deletions(-)
----------------------------------------------------------------------