[04/12] incubator-weex git commit: Update project.pbxproj

2017-05-26 Thread kfeagle
Update project.pbxproj

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

Branch: refs/heads/0.13-dev
Commit: d7bd8b947fc2ea738a5223b1917356559723f8df
Parents: 4ba0859
Author: moxun 
Authored: Fri May 26 18:17:42 2017 +0800
Committer: GitHub 
Committed: Fri May 26 18:17:42 2017 +0800

--
 ios/playground/WeexDemo.xcodeproj/project.pbxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d7bd8b94/ios/playground/WeexDemo.xcodeproj/project.pbxproj
--
diff --git a/ios/playground/WeexDemo.xcodeproj/project.pbxproj 
b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
index a9d61fc..feced52 100644
--- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj
+++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
@@ -491,7 +491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
-   shellScript = "diff 
\"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > 
/dev/null\nif [ $? != 0 ] ; then\n# print error to STDERR\necho 
\"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or 
update your CocoaPods installation.\" >&2\nexit 1\nfi\n";
+   shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" 
\"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n# print 
error to STDERR\necho \"error: The sandbox is not in sync with the 
Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n  
  exit 1\nfi\n";
showEnvVarsInLog = 0;
};
84361D6F1CA10F8E00F43825 /* [CP] Copy Pods Resources */ = {
@@ -536,7 +536,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
-   shellScript = "diff 
\"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > 
/dev/null\nif [ $? != 0 ] ; then\n# print error to STDERR\necho 
\"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or 
update your CocoaPods installation.\" >&2\nexit 1\nfi\n";
+   shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" 
\"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n# print 
error to STDERR\necho \"error: The sandbox is not in sync with the 
Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n  
  exit 1\nfi\n";
showEnvVarsInLog = 0;
};
C715566148067A7FFAB7797D /* [CP] Copy Pods Resources */ = {



[06/12] incubator-weex git commit: Update mocha.opts

2017-05-26 Thread kfeagle
Update mocha.opts

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

Branch: refs/heads/0.13-dev
Commit: adf5accfd17b6551bcd109ae4e81548ab757d625
Parents: 6404623
Author: moxun 
Authored: Fri May 26 18:19:19 2017 +0800
Committer: GitHub 
Committed: Fri May 26 18:19:19 2017 +0800

--
 test/mocha.opts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/adf5accf/test/mocha.opts
--
diff --git a/test/mocha.opts b/test/mocha.opts
index 63b406d..2203e43 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1 +1,2 @@
---recursive
\ No newline at end of file
+--recursive
+---bail



[08/12] incubator-weex git commit: Update mocha.opts

2017-05-26 Thread kfeagle
Update mocha.opts

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

Branch: refs/heads/0.13-dev
Commit: ca513c743ef330a5b588c1fa30bcc61a90ebbcfa
Parents: 4cfaa8f
Author: moxun 
Authored: Fri May 26 18:19:53 2017 +0800
Committer: GitHub 
Committed: Fri May 26 18:19:53 2017 +0800

--
 test/mocha.opts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca513c74/test/mocha.opts
--
diff --git a/test/mocha.opts b/test/mocha.opts
index 1197146..f8baf14 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,2 @@
 --recursive
bail 
+--bail



[05/12] incubator-weex git commit: Update WXConfigCenterDefaultImpl.m

2017-05-26 Thread kfeagle
Update WXConfigCenterDefaultImpl.m

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

Branch: refs/heads/0.13-dev
Commit: 64046231845be0bbe5d87541aa80f49d2f0e6a76
Parents: d7bd8b9
Author: moxun 
Authored: Fri May 26 18:18:02 2017 +0800
Committer: GitHub 
Committed: Fri May 26 18:18:02 2017 +0800

--
 ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/64046231/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
--
diff --git a/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m 
b/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
index 7914dc5..946660d 100644
--- a/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
+++ b/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
@@ -28,7 +28,7 @@
 return @YES;
 }
 if ([keys[0] isEqualToString:@"iOS_weex_ext_config"] && [keys[1] 
isEqualToString:@"slider_class_name"]){
-return @"WXSliderComponent";
+return @"WXCycleSliderComponent";
 }
 if ([keys[0] isEqualToString:@"weex_prerender_config"] && [keys[1] 
isEqualToString:@"is_switch_on"]){
 return @YES;



[09/12] incubator-weex git commit: Update mocha.opts

2017-05-26 Thread kfeagle
Update mocha.opts

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

Branch: refs/heads/0.13-dev
Commit: 57f73e9c7d4a12e79ec6dbbcb60118b3d74e23bb
Parents: ca513c7
Author: moxun 
Authored: Fri May 26 18:20:32 2017 +0800
Committer: GitHub 
Committed: Fri May 26 18:20:32 2017 +0800

--
 test/mocha.opts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/57f73e9c/test/mocha.opts
--
diff --git a/test/mocha.opts b/test/mocha.opts
index f8baf14..6fb0959 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,2 @@
 --recursive
---bail
+--bail 



[02/12] incubator-weex git commit: + [test] update testcase

2017-05-26 Thread kfeagle
+ [test] update testcase


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

Branch: refs/heads/0.13-dev
Commit: cce536225f304622b1c52aafad53a1f0f3ff89d3
Parents: ca5c57e
Author: moxun.ljf 
Authored: Fri May 26 17:35:45 2017 +0800
Committer: moxun.ljf 
Committed: Fri May 26 17:35:45 2017 +0800

--
 ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m |  2 +-
 test/pages/components/slider-common.vue |  4 ++--
 test/scripts/components/recycler.test.js|  6 +++---
 test/scripts/components/slider-common.test.js   | 13 -
 test/scripts/util.js| 12 
 5 files changed, 30 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cce53622/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
--
diff --git a/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m 
b/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
index 946660d..7914dc5 100644
--- a/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
+++ b/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m
@@ -28,7 +28,7 @@
 return @YES;
 }
 if ([keys[0] isEqualToString:@"iOS_weex_ext_config"] && [keys[1] 
isEqualToString:@"slider_class_name"]){
-return @"WXCycleSliderComponent";
+return @"WXSliderComponent";
 }
 if ([keys[0] isEqualToString:@"weex_prerender_config"] && [keys[1] 
isEqualToString:@"is_switch_on"]){
 return @YES;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cce53622/test/pages/components/slider-common.vue
--
diff --git a/test/pages/components/slider-common.vue 
b/test/pages/components/slider-common.vue
index 841f5ca..f050b0e 100644
--- a/test/pages/components/slider-common.vue
+++ b/test/pages/components/slider-common.vue
@@ -182,14 +182,14 @@
 }
 this.progress = 233 * this.index + 233 * -ratio;
 this.count++;
-this.flag = this.count / 100 < this.switchCount;
+this.flag = this.count <= 100;
   },
   onchange(e) {
 this.goto(parseInt(e.index));
 this.switchCount++;
+this.count = 0;
   },
   update(index) {
-console.log('update switch count >>>')
 if (index == 1) {
   this.count1++;
 } else if (index == 2) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cce53622/test/scripts/components/recycler.test.js
--
diff --git a/test/scripts/components/recycler.test.js 
b/test/scripts/components/recycler.test.js
index 025fec2..a6eafa8 100644
--- a/test/scripts/components/recycler.test.js
+++ b/test/scripts/components/recycler.test.js
@@ -43,7 +43,7 @@ describe('recycler @ignore-android @ignore-ios', function () {
   });
 
   after(function () {
-  return util.quit(driver); 
+  return util.quit(driver);
   })
 
   let scaleFactor = 0
@@ -361,7 +361,7 @@ describe('recycler @ignore-android @ignore-ios', function 
() {
 .elementById((isAndroid ? 'cell27' : 'cell28'))
 .click()
 .elementById('stickyText1')
-.text() 
+.text()
 .then(text => {
   console.log(text)
   originContentOffset = Number.parseInt(text.replace('Content 
Offset:-',''))
@@ -391,7 +391,7 @@ describe('recycler @ignore-android @ignore-ios', function 
() {
   console.log(text)
   originContentOffset = Number.parseInt(text.replace('Content 
Offset:-',''))
 })
-.touch('drag', {fromX:recyclerWidth / 2, fromY:screenHeight / 5, 
toX:recyclerWidth / 2, toY: screenHeight * 4 / 5})
+.touch('drag', {fromX:recyclerWidth / 2, fromY:screenHeight / 5, 
toX:recyclerWidth / 2, toY: screenHeight * 4 / 5,duration: 2})
 .elementById('stickyText1')
 .text()
 .then(text => {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cce53622/test/scripts/components/slider-common.test.js
--
diff --git a/test/scripts/components/slider-common.test.js 
b/test/scripts/components/slider-common.test.js
index 80855cd..c2a7b0c 100644
--- a/test/scripts/components/slider-common.test.js
+++ b/test/scripts/components/slider-common.test.js
@@ -25,10 +25,21 @@ var path = require('path');
 var os = require('os');
 var util = require("../util.js");
 
+const platform = process.env.platform.toLowerCase() || 'android';
+const isAndroid = platform === 'android';
+var dragOption = {};
+
 

[11/12] incubator-weex git commit: + [test] add swipeRight function

2017-05-26 Thread kfeagle
+ [test] add swipeRight function


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

Branch: refs/heads/0.13-dev
Commit: 4a3eacc209ff6075d625f1f752a6abcecf609eac
Parents: 8b17084
Author: moxun.ljf 
Authored: Sat May 27 09:45:25 2017 +0800
Committer: moxun.ljf 
Committed: Sat May 27 09:45:25 2017 +0800

--
 test/scripts/util.js | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4a3eacc2/test/scripts/util.js
--
diff --git a/test/scripts/util.js b/test/scripts/util.js
index a56c096..775426c 100644
--- a/test/scripts/util.js
+++ b/test/scripts/util.js
@@ -167,6 +167,18 @@ module.exports = {
   .sleep(1000)
   })
   })
+  driverFactory.addPromiseChainMethod('swipeRight', function 
(distanceRatio, yRatio) {
+return this
+  .getWindowSize()
+  .then(size => {
+let y = yRatio * size.height;
+let startX = size.width * 0.2;
+let endX = startX + size.width * distanceRatio;
+return this
+  .touch('drag', {fromX: startX, toX: endX, fromY: y, toY: y, 
duration: 1})
+  .sleep(1000)
+  })
+  })
 driver = driverFactory.initPromiseChain();
 driver.configureHttp({
 timeout: 10



[GitHub] incubator-weex pull request #402: + [test] update testcase

2017-05-26 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/402


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[01/12] incubator-weex git commit: + [test] add testcase

2017-05-26 Thread kfeagle
Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev d7f53c19c -> fc817d80e


+ [test] add testcase


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

Branch: refs/heads/0.13-dev
Commit: ca5c57e58d528cced9db348572fafe4e791b3906
Parents: da396f4
Author: moxun.ljf 
Authored: Fri May 26 11:52:47 2017 +0800
Committer: moxun.ljf 
Committed: Fri May 26 11:52:47 2017 +0800

--
 .../WeexDemo.xcodeproj/project.pbxproj  |   4 +-
 test/mocha.opts |   3 +-
 test/pages/components/scroller-fixed.vue|  14 +-
 test/pages/components/slider-common.vue | 229 +++
 test/screenshot/border-android.png  | Bin 196752 -> 207443 bytes
 test/scripts/components/recycler.test.js|   6 +-
 test/scripts/components/scroller-fixed.test.js  |   5 +-
 test/scripts/components/slider-common.test.js   | 100 
 8 files changed, 346 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca5c57e5/ios/playground/WeexDemo.xcodeproj/project.pbxproj
--
diff --git a/ios/playground/WeexDemo.xcodeproj/project.pbxproj 
b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
index feced52..a9d61fc 100644
--- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj
+++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
@@ -491,7 +491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
-   shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" 
\"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n# print 
error to STDERR\necho \"error: The sandbox is not in sync with the 
Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n  
  exit 1\nfi\n";
+   shellScript = "diff 
\"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > 
/dev/null\nif [ $? != 0 ] ; then\n# print error to STDERR\necho 
\"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or 
update your CocoaPods installation.\" >&2\nexit 1\nfi\n";
showEnvVarsInLog = 0;
};
84361D6F1CA10F8E00F43825 /* [CP] Copy Pods Resources */ = {
@@ -536,7 +536,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
-   shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" 
\"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n# print 
error to STDERR\necho \"error: The sandbox is not in sync with the 
Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n  
  exit 1\nfi\n";
+   shellScript = "diff 
\"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > 
/dev/null\nif [ $? != 0 ] ; then\n# print error to STDERR\necho 
\"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or 
update your CocoaPods installation.\" >&2\nexit 1\nfi\n";
showEnvVarsInLog = 0;
};
C715566148067A7FFAB7797D /* [CP] Copy Pods Resources */ = {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca5c57e5/test/mocha.opts
--
diff --git a/test/mocha.opts b/test/mocha.opts
index 78b2a18..63b406d 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1 @@
---recursive
---bail
\ No newline at end of file
+--recursive
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca5c57e5/test/pages/components/scroller-fixed.vue
--
diff --git a/test/pages/components/scroller-fixed.vue 
b/test/pages/components/scroller-fixed.vue
index 50c7c82..538edcb 100644
--- a/test/pages/components/scroller-fixed.vue
+++ b/test/pages/components/scroller-fixed.vue
@@ -1,10 +1,12 @@
 
-  
-  {{vp}}|{{p1}}|{{p2}}
-row
-
-
-  
+  
+
+  {{vp}}|{{p1}}|{{p2}}
+  row
+  
+  
+
+  
 
 
   .container {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca5c57e5/test/pages/components/slider-common.vue

incubator-weex git commit: * [android] downgrade to api 23 as compiling issues.

2017-05-26 Thread kyork
Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 50947769c -> d7f53c19c


* [android] downgrade to api 23 as compiling issues.


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

Branch: refs/heads/0.13-dev
Commit: d7f53c19c48ad6062fca0f31648878038eba4e32
Parents: 5094776
Author: YorkShen 
Authored: Sat May 27 11:19:06 2017 +0800
Committer: YorkShen 
Committed: Sat May 27 11:19:06 2017 +0800

--
 android/build.gradle | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d7f53c19/android/build.gradle
--
diff --git a/android/build.gradle b/android/build.gradle
index 25d281b..746e508 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -29,12 +29,12 @@ subprojects {
 }
 }
 ext {
-compileSdkVersion=24
-buildToolsVersion="24.0.3"
+compileSdkVersion=23
+buildToolsVersion="23.0.3"
 minSdkVersion=14
 appMinSdkVersion=15
-targetSdkVersion=24
-supportLibVersion="24.2.0"
+targetSdkVersion=23
+supportLibVersion="23.4.0"
 fastjsonLibVersion="1.1.46.android"
 }
 }



incubator-weex git commit: * [android] Update Build.VERSION.SKD_INT to 24

2017-05-26 Thread kyork
Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev da396f4d4 -> 50947769c


* [android] Update Build.VERSION.SKD_INT to 24


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

Branch: refs/heads/0.13-dev
Commit: 50947769c15994a299caffd09d11fc7b7bd26a6b
Parents: da396f4
Author: YorkShen 
Authored: Sat May 27 10:59:17 2017 +0800
Committer: YorkShen 
Committed: Sat May 27 10:59:17 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/50947769/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index cde5de9..c6120d5 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -28,7 +28,6 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Build;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -408,7 +407,7 @@ public class WXViewUtils {
* As the compile version of weex_sdk is 23, so API level 24 has to be 
hard-code.
*/
   private static boolean clipCanvasIfAnimationExist() {
-return Build.VERSION.SDK_INT != VERSION_CODES.N;
+return Build.VERSION.SDK_INT != 24;
   }
 
   /**



[GitHub] incubator-weex issue #401: weex-guangwang

2017-05-26 Thread acton393
Github user acton393 commented on the issue:

https://github.com/apache/incubator-weex/pull/401
  
@zhangweia what's the purpose of this pull request? 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #400: * [ios] add updateTransform interface to W...

2017-05-26 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/400


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[3/3] incubator-weex git commit: * [ios] rename updateTransform to setNativeTransform

2017-05-26 Thread cxfeng
* [ios] rename updateTransform to setNativeTransform


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

Branch: refs/heads/0.14-dev
Commit: 4e4bba8a7b4717f5adb94273df2ff637f3dcc23c
Parents: 3dfbf30
Author: yinfeng 
Authored: Fri May 26 17:52:18 2017 +0800
Committer: yinfeng 
Committed: Fri May 26 17:52:18 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 2 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4e4bba8a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h 
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
index 0edd93d..39385ef 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
@@ -340,7 +340,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * @abstract Update component's transform with native transform struct
  **/
-- (void)updateTransform:(CGAffineTransform)transform;
+- (void)setNativeTransform:(CGAffineTransform)transform;
 
 ///--
 /// @name Display

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4e4bba8a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m 
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index dc664a8..173dd14 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -468,7 +468,7 @@
 WXAssertMainThread();
 }
 
-- (void)updateTransform:(CGAffineTransform)transform
+- (void)setNativeTransform:(CGAffineTransform)transform
 {
 WXAssertMainThread();
 



[2/3] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.14-dev' into 0.14-dev

2017-05-26 Thread cxfeng
Merge remote-tracking branch 'upstream/0.14-dev' into 0.14-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/3dfbf30e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3dfbf30e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3dfbf30e

Branch: refs/heads/0.14-dev
Commit: 3dfbf30ef2217696685776dc443ddaea1f18c779
Parents: 1d22241 afb5d1b
Author: yinfeng 
Authored: Fri May 26 17:31:39 2017 +0800
Committer: yinfeng 
Committed: Fri May 26 17:31:39 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--




[1/3] incubator-weex git commit: * [ios] add updateTransform interface to WXComponent to enable setting native transform directly, instead of updating css styles and parsing them.

2017-05-26 Thread cxfeng
Repository: incubator-weex
Updated Branches:
  refs/heads/0.14-dev afb5d1b99 -> 4e4bba8a7


* [ios] add updateTransform interface to WXComponent to enable setting native 
transform directly,  instead of updating css styles and parsing  them.


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

Branch: refs/heads/0.14-dev
Commit: 1d2224196dcbd7e8f48121bf54051b59f45bfa0c
Parents: 9719521
Author: yinfeng 
Authored: Fri May 26 17:31:19 2017 +0800
Committer: yinfeng 
Committed: Fri May 26 17:31:19 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXTransform.h |  4 
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 23 
 ios/sdk/WeexSDK/Sources/Model/WXComponent.h |  5 +
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 21 +-
 .../Sources/View/WXComponent+ViewManagement.m   | 14 
 5 files changed, 58 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d222419/ios/sdk/WeexSDK/Sources/Component/WXTransform.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.h 
b/ios/sdk/WeexSDK/Sources/Component/WXTransform.h
index ddc0541..e2fcb3e 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.h
@@ -32,6 +32,10 @@
 
 - (instancetype)initWithCSSValue:(NSString *)cssValue origin:(NSString 
*)origin instance:(WXSDKInstance *)instance;
 
+- (instancetype)initWithNativeTransform:(CGAffineTransform)transform 
instance:(WXSDKInstance *)instance;
+
 - (void)applyTransformForView:(UIView *)view;
 
+- (void)setTransformOrigin:(NSString *)transformOriginCSS;
+
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d222419/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m 
b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
index 29c92bc..12f4dbf 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
@@ -38,6 +38,9 @@
 WXLength *_translateY;
 WXLength *_originX;
 WXLength *_originY;
+
+CGAffineTransform _nativeTransform;
+BOOL _useNativeTransform;
 }
 
 - (instancetype)initWithCSSValue:(NSString *)cssValue origin:(NSString 
*)origin instance:(WXSDKInstance *)instance
@@ -55,6 +58,17 @@
 return self;
 }
 
+- (instancetype)initWithNativeTransform:(CGAffineTransform)transform 
instance:(WXSDKInstance *)instance
+{
+if (self = [super init]) {
+_weexInstance = instance;
+_nativeTransform = transform;
+_useNativeTransform = YES;
+}
+
+return self;
+}
+
 - (float)rotateAngle
 {
 return _rotateAngle;
@@ -80,8 +94,17 @@
 return _scaleY;
 }
 
+- (void)setTransformOrigin:(NSString *)transformOriginCSS
+{
+[self parseTransformOrigin:transformOriginCSS];
+}
+
 - (CGAffineTransform)nativeTransformWithView:(UIView *)view
 {
+if (_useNativeTransform) {
+return _nativeTransform;
+}
+
 CGAffineTransform nativeTransform = [self 
nativeTransformWithoutRotateWithView:view];
 
 nativeTransform = CGAffineTransformRotate(nativeTransform, _rotateAngle);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d222419/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h 
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
index ee8d619..0edd93d 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
@@ -337,6 +337,11 @@ NS_ASSUME_NONNULL_BEGIN
  **/
 - (void)removeEvent:(NSString *)eventName;
 
+/**
+ * @abstract Update component's transform with native transform struct
+ **/
+- (void)updateTransform:(CGAffineTransform)transform;
+
 ///--
 /// @name Display
 ///--

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d222419/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m 
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 2e2f5fc..dc664a8 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -463,19 +463,30 @@
 WXAssertMainThread();
 }
 
-- (void)readyToRender
+- 

[GitHub] incubator-weex issue #402: + [test] update testcase

2017-05-26 Thread weex-bot
Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/402
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  According to the blame info, we recommended @sospartan , @zshshr 
to be the reviewers.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #404: + [ios] fixbug: cycle slider

2017-05-26 Thread kfeagle
GitHub user kfeagle opened a pull request:

https://github.com/apache/incubator-weex/pull/404

+ [ios] fixbug: cycle slider

+ [ios] fixbug: cycle slider

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/kfeagle/incubator-weex 
ios-feature-macaca-0.13-dev-2

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/404.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #404


commit 00067c7d9a0cd75a6149af34956f29b4fb8c91a0
Author: 齐山 
Date:   2017-05-26T10:03:48Z

+ [ios] fixbug: cycle slider




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex issue #403: + [android] prevent NPE on init Inspector

2017-05-26 Thread weex-bot
Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/403
  




  

  
  Fails

  
  
  :no_entry_sign:
  Running your Dangerfile has Failed

  





## Danger has errored

Error: TypeError

```sh
TypeError: diff.match is not a function
at Object. (dangerfile.js:109:24)
at Runtime._execModule 
(/home/travis/build/apache/incubator-weex/node_modules/jest-runtime/build/index.js:447:13)
at Runtime.requireModule 
(/home/travis/build/apache/incubator-weex/node_modules/jest-runtime/build/index.js:295:14)
at 
/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:136:33
at ensureCleanDangerfile 
(/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:176:5)
at Object. 
(/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:135:21)
at step 
(/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:32:23)
at Object.next 
(/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:13:53)
at 
/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:7:71
at __awaiter 
(/home/travis/build/apache/incubator-weex/node_modules/danger/distribution/runner/DangerfileRunner.js:3:12)
```



  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #403: + [android] prevent NPE on init Inspector

2017-05-26 Thread misakuo
GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/403

+ [android] prevent NPE on init Inspector



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-inspector-npe

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/403.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #403


commit dbfda762a84a78ea15e93e16141b0abcf02b30e6
Author: moxun.ljf 
Date:   2017-05-26T09:46:26Z

+ [android] prevent NPE on init Inspector




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #402: + [test] update testcase

2017-05-26 Thread misakuo
GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/402

+ [test] update testcase

update testcase to macaca

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
example-feature-testcase

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/402.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #402


commit ca5c57e58d528cced9db348572fafe4e791b3906
Author: moxun.ljf 
Date:   2017-05-26T03:52:47Z

+ [test] add testcase

commit cce536225f304622b1c52aafad53a1f0f3ff89d3
Author: moxun.ljf 
Date:   2017-05-26T09:35:45Z

+ [test] update testcase

commit 4ba08598c8598995b80f00dbb12e59fd7ee66766
Author: moxun.ljf 
Date:   2017-05-26T09:37:15Z

+ [test] remove platform judgement




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #401: weex-guangwang

2017-05-26 Thread zhangweia
GitHub user zhangweia opened a pull request:

https://github.com/apache/incubator-weex/pull/401

weex-guangwang






You can merge this pull request into a Git repository by running:

$ git pull https://github.com/zhangweia/incubator-weex master

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/401.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #401


commit 3c1d8f8e80496dc0946ac6de46f156b782a9a856
Author: zhangweia <775925...@qq.com>
Date:   2017-05-10T12:18:04Z

zw_1.0

commit df1acd71fb66c2c574012e08785f0ee99f7afcc4
Author: zhangweia <775925...@qq.com>
Date:   2017-05-13T14:47:57Z

V1.1




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex issue #400: * [ios] add updateTransform interface to WXCompon...

2017-05-26 Thread weex-bot
Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/400
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  According to the blame info, we recommended @boboning , @acton393 
to be the reviewers.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #400: * [ios] add updateTransform interface to W...

2017-05-26 Thread cxfeng1
GitHub user cxfeng1 opened a pull request:

https://github.com/apache/incubator-weex/pull/400

* [ios] add updateTransform interface to WXComponent

* [ios] add updateTransform interface to WXComponent to enable setting 
native transform directly, instead of updating css styles and parsing them.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/cxfeng1/incubator-weex 0.14-dev

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/400.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #400


commit 1d2224196dcbd7e8f48121bf54051b59f45bfa0c
Author: yinfeng 
Date:   2017-05-26T09:31:19Z

* [ios] add updateTransform interface to WXComponent to enable setting 
native transform directly,  instead of updating css styles and parsing  them.

commit 3dfbf30ef2217696685776dc443ddaea1f18c779
Author: yinfeng 
Date:   2017-05-26T09:31:39Z

Merge remote-tracking branch 'upstream/0.14-dev' into 0.14-dev




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex issue #399: * [ios] bugfix application fore-background Event

2017-05-26 Thread weex-bot
Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/399
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  According to the blame info, we recommended @boboning , @kfeagle 
to be the reviewers.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-weex pull request #399: * [ios] bugfix application fore-background...

2017-05-26 Thread acton393
GitHub user acton393 opened a pull request:

https://github.com/apache/incubator-weex/pull/399

* [ios] bugfix application fore-background Event



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/acton393/incubator-weex 
0.14-dev-fix-forebackgroundEvent

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/399.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #399


commit 45a69d6a211954cc8906e052df1633a1b32ef710
Author: acton393 
Date:   2017-05-26T09:11:57Z

* [ios] bugfix application fore-background Event




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---