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/03/31 06:14:47 UTC
incubator-weex git commit: * [test] update CI
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 65ed28eba -> d8c36f458
* [test] update CI
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d8c36f45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d8c36f45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d8c36f45
Branch: refs/heads/0.12-dev
Commit: d8c36f458711d209b79f04d83f8fa505a5b80125
Parents: 65ed28e
Author: sospartan <so...@apache.org>
Authored: Fri Mar 31 14:14:01 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Mar 31 14:14:01 2017 +0800
----------------------------------------------------------------------
.../app/src/main/java/com/alibaba/weex/WXPageActivity.java | 3 +++
package.json | 2 +-
test/ci-funcs.sh | 2 ++
test/pages/image-onload.vue | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8c36f45/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
index 6490518..7ce282a 100755
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -485,6 +485,9 @@ public class WXPageActivity extends WXBaseActivity implements IWXRenderListener,
* @param map <weexid,viewId>
*/
private static void collectId(WXComponent comp, Map<String,String> map){
+ if(comp == null){
+ return;
+ }
ImmutableDomObject dom;
String id;
View view;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8c36f45/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index f57ef92..83d55cf 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
"weex-components": "^0.2.0",
"weex-loader": "^0.4.0",
"weex-vdom-tester": "^0.2.0",
- "weex-wd": "^1.0.18",
+ "weex-wd": "^1.0.19",
"wwp": "^0.3.5",
"xml2map": "^1.0.2"
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8c36f45/test/ci-funcs.sh
----------------------------------------------------------------------
diff --git a/test/ci-funcs.sh b/test/ci-funcs.sh
index 00135fb..290be25 100644
--- a/test/ci-funcs.sh
+++ b/test/ci-funcs.sh
@@ -1,3 +1,5 @@
+#!/bin/sh -eu
+
function installAndroidSDK {
# brew install android-sdk
# export ANDROID_HOME=/usr/local/opt/android-sdk
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8c36f45/test/pages/image-onload.vue
----------------------------------------------------------------------
diff --git a/test/pages/image-onload.vue b/test/pages/image-onload.vue
index 5291bec..77d6020 100644
--- a/test/pages/image-onload.vue
+++ b/test/pages/image-onload.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <img style="width: 500;height: 500;" src="https://gw.alicdn.com/tps/TB1bEMYKXXXXXaLaXXXXXXXXXXX-360-388.png" @load="onload"></img>
+ <image style="width: 500;height: 500;" src="https://gw.alicdn.com/tps/TB1bEMYKXXXXXaLaXXXXXXXXXXX-360-388.png" @load="onload"></image>
<text style="font-size:30">{{size}}</text>
</div>
</template>