date:20170814

incubator-weex git commit: * [android] move Dom.Transform, Dom.TransformOrigin to Constants.

2017-08-14 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev ee94722cf -> 8a8dfb818


* [android] move Dom.Transform, Dom.TransformOrigin to Constants.


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

Branch: refs/heads/0.16-dev
Commit: 8a8dfb818cf7db2c68570b45f82a947f979a5dda
Parents: ee94722
Author: YorkShen 
Authored: Tue Aug 15 11:33:45 2017 +0800
Committer: YorkShen 
Committed: Tue Aug 15 11:33:45 2017 +0800

--
 .../main/java/com/taobao/weex/common/Constants.java  |  2 ++
 .../main/java/com/taobao/weex/dom/WXDomObject.java   | 15 +--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a8dfb81/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java 
b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index e24ed22..73c3399 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -170,6 +170,8 @@ public class Constants {
 String OFFSET = "offset";
 String ANIMATED = "animated";
 String STABLE = "stable";
+String TRANSFORM = "transform";
+String TRANSFORM_ORIGIN = "transformOrigin";
 
 String INSERT_CELL_ANIMATION = "insertAnimation";
 String DELETE_CELL_ANIMATION = "deleteAnimation";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a8dfb81/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 9643abd..6f8f7fb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -29,6 +29,7 @@ import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.WXSDKManager;
 import com.taobao.weex.bridge.WXValidateProcessor;
 import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.Constants.Name;
 import com.taobao.weex.dom.flex.CSSLayoutContext;
 import com.taobao.weex.dom.flex.CSSNode;
 import com.taobao.weex.dom.flex.Spacing;
@@ -54,8 +55,18 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
   public static final String TYPE = "type";
   public static final String TAG = WXDomObject.class.getSimpleName();
   public static final String ROOT = "_root";
-  public static final String TRANSFORM = "transform";
-  public static final String TRANSFORM_ORIGIN = "transformOrigin";
+
+  /**
+   * Use {@link Name#TRANSFORM} instead.
+   */
+  @Deprecated
+  public static final String TRANSFORM = Name.TRANSFORM;
+
+  /**
+   * Use {@link Name#TRANSFORM_ORIGIN} instead.
+   */
+  @Deprecated
+  public static final String TRANSFORM_ORIGIN = Name.TRANSFORM_ORIGIN;
   static final WXDomObject DESTROYED = new WXDomObject();
   static{
 DESTROYED.mRef = "_destroyed";

[GitHub] incubator-weex pull request #581: + [ios] LayoutAnimation

2017-08-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---
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/7] incubator-weex git commit: * [ios] WXTransition fix bugs about how to deal with property

2017-08-14 Thread acton393

* [ios] WXTransition fix bugs about how to deal with property


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

Branch: refs/heads/0.16-dev
Commit: 02658e32eead9f35e9dbe6b877bc9c8d06c08143
Parents: 741ee20
Author: doumafang 
Authored: Fri Aug 11 10:33:26 2017 +0800
Committer: doumafang 
Committed: Fri Aug 11 10:33:26 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/02658e32/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 b8ae789..669603f 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -460,13 +460,27 @@
 BOOL yesOrNo = false;
 NSString *property = _styles[@"transitionProperty"];
 if (property) {
-if ([property containsString:@"width"]||[property 
containsString:@"height"]||[property containsString:@"top"]||[property 
containsString:@"left"]||[property containsString:@"bottom"]||[property 
containsString:@"transform"]) {
+if ([property containsString:@"width"]||[property 
containsString:@"height"]||[property containsString:@"top"]||[property 
containsString:@"bottom"]||[property containsString:@"right"]||[property 
containsString:@"left"]||[property containsString:@"transform"]||[property 
containsString:@"backgroundColor"]||[property containsString:@"opacity"]) {
 yesOrNo = true;
 }
 }
 return yesOrNo;
 }
 
+
+- (BOOL)_isPropertyAnimation
+{
+BOOL yesOrNo = false;
+NSString *property = _styles[@"transitionProperty"];
+if (property) {
+if ([property containsString:@"transform"]||[property 
containsString:@"backgroundColor"]||[property containsString:@"opacity"]) {
+yesOrNo = true;
+}
+}
+return yesOrNo;
+}
+
+
 - (void)_modifyStyles:(NSDictionary *)styles
 {
 pthread_mutex_lock(&_propertyMutex);
@@ -498,7 +512,9 @@
 - (void)_updateStylesOnMainThread:(NSDictionary *)styles 
resetStyles:(NSMutableArray *)resetStyles
 {
 WXAssertMainThread();
-[self _updateViewStyles:styles];
+if (![self _isPropertyAnimation]) {
+[self _updateViewStyles:styles];
+}
 [self _resetStyles:resetStyles];
 [self _handleBorders:styles isUpdating:YES];

[5/7] incubator-weex git commit: * [ios] fix timingFunction bug

2017-08-14 Thread acton393

* [ios] fix timingFunction bug


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

Branch: refs/heads/0.16-dev
Commit: 75e4cf8707735caa37146fd62b5f17ca6c1f70f7
Parents: 4a3a780
Author: doumafang 
Authored: Sat Aug 12 12:27:36 2017 +0800
Committer: doumafang 
Committed: Sat Aug 12 12:27:36 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75e4cf87/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m 
b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
index 7258790..18892e6 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
@@ -672,7 +672,8 @@ WX_NUMBER_CONVERT(NSUInteger, unsignedIntegerValue)
 @"ease-in":kCAMediaTimingFunctionEaseIn,
 @"ease-out":kCAMediaTimingFunctionEaseOut,
 @"ease-in-out":kCAMediaTimingFunctionEaseInEaseOut,
-@"linear":kCAMediaTimingFunctionLinear
+@"linear":kCAMediaTimingFunctionLinear,
+@"ease":kCAMediaTimingFunctionDefault
 };
 });

[6/7] incubator-weex git commit: * [ios] fix build pbxproj bug

2017-08-14 Thread acton393

* [ios] fix build pbxproj bug


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

Branch: refs/heads/0.16-dev
Commit: 7a4ee9339f2c27222677eb02bdf3629276af7147
Parents: 75e4cf8
Author: doumafang 
Authored: Mon Aug 14 11:30:37 2017 +0800
Committer: doumafang 
Committed: Mon Aug 14 11:30:37 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7a4ee933/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
--
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj 
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 1f39c41..db577c6 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -37,8 +37,10 @@
2AE5B7561CABA04E0082FDDB /* WXEventModuleProtocol.h in Headers 
*/ = {isa = PBXBuildFile; fileRef = 2AE5B7551CABA04E0082FDDB /* 
WXEventModuleProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
2AFEB17B1C747139000507FA /* WXInstanceWrap.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 2AFEB1791C747139000507FA /* WXInstanceWrap.h */; 
};
2AFEB17C1C747139000507FA /* WXInstanceWrap.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 2AFEB17A1C747139000507FA /* WXInstanceWrap.m */; 
};
-   375A228F1EC440A600BC2086 /* WXAnimationLayout.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 375A228D1EC440A600BC2086 /* WXAnimationLayout.m 
*/; };
-   375A22901EC440A600BC2086 /* WXAnimationLayout.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 375A228E1EC440A600BC2086 /* WXAnimationLayout.h 
*/; };
+   333D9A271F41507A007CED39 /* WXTransition.h in Headers */ = {isa 
= PBXBuildFile; fileRef = 333D9A251F41507A007CED39 /* WXTransition.h */; };
+   333D9A281F41507A007CED39 /* WXTransition.h in Headers */ = {isa 
= PBXBuildFile; fileRef = 333D9A251F41507A007CED39 /* WXTransition.h */; };
+   333D9A291F41507A007CED39 /* WXTransition.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 333D9A261F41507A007CED39 /* WXTransition.m */; };
+   333D9A2A1F41507A007CED39 /* WXTransition.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 333D9A261F41507A007CED39 /* WXTransition.m */; };
37B51EE41E97804D0040A743 /* WXCycleSliderComponent.h in Headers 
*/ = {isa = PBXBuildFile; fileRef = 37B51EE21E97804D0040A743 /* 
WXCycleSliderComponent.h */; };
37B51EE51E97804D0040A743 /* WXCycleSliderComponent.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 37B51EE31E97804D0040A743 /* 
WXCycleSliderComponent.m */; };
591324A31D49B7F1004E89ED /* WXTimerModuleTests.m in Sources */ 
= {isa = PBXBuildFile; fileRef = 591324A21D49B7F1004E89ED /* 
WXTimerModuleTests.m */; };
@@ -340,7 +342,6 @@
DCA445671EFA55B300D0CFA8 /* WXStorageModule.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 59A596211CB6311F0012CD52 /* WXStorageModule.m 
*/; };
DCA445681EFA55B300D0CFA8 /* WXStreamModule.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 74A4BAA51CB4F98300195969 /* WXStreamModule.m */; 
};
DCA445691EFA55B300D0CFA8 /* WXAnimationModule.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 594C28901CF9E61A009793A4 /* WXAnimationModule.m 
*/; };
-   DCA4456A1EFA55B300D0CFA8 /* WXAnimationLayout.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 375A228D1EC440A600BC2086 /* WXAnimationLayout.m 
*/; };
DCA4456B1EFA55B300D0CFA8 /* WXInstanceWrap.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 2AFEB17A1C747139000507FA /* WXInstanceWrap.m */; 
};
DCA4456C1EFA55B300D0CFA8 /* WXDomModule.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 77E659D91C07F594008B8775 /* WXDomModule.m */; };
DCA4456D1EFA55B300D0CFA8 /* WXTimerModule.m in Sources */ = 
{isa = PBXBuildFile; fileRef = D3FC0DF61C508B2A002B9E31 /* WXTimerModule.m */; 
};
@@ -485,7 +486,6 @@
DCA445FB1EFA5A3C00D0CFA8 /* WXStorageModule.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 59A596201CB6311F0012CD52 /* WXStorageModule.h 
*/; };
DCA445FC1EFA5A3E00D0CFA8 /* WXStreamModule.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 74A4BAA41CB4F98300195969 /* WXStreamModule.h */; 
};
DCA445FD1EFA5A4000D0CFA8 /* WXAnimationModule.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 594C28911CF9E61A009793A4 /* WXAnimationModule.h 
*/; };
-

[7/7] incubator-weex git commit: Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into wip-us-0.16-dev

2017-08-14 Thread acton393

Merge branch 'ios-feature-layoutanimation-0.16dev' of 
https://github.com/doumafang/incubator-weex into wip-us-0.16-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/ee94722c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee94722c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee94722c

Branch: refs/heads/0.16-dev
Commit: ee94722cf22a97778011a7dff3d02b16002ff3f1
Parents: 46b98bb 7a4ee93
Author: acton393 
Authored: Tue Aug 15 10:49:12 2017 +0800
Committer: acton393 
Committed: Tue Aug 15 10:49:12 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |  24 +-
 .../Sources/Component/WXComponent_internal.h|  12 +
 .../Sources/Display/WXComponent+Display.m   |  16 +-
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |   3 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |  67 +++-
 .../WeexSDK/Sources/Module/WXAnimationLayout.h  |  49 ---
 .../WeexSDK/Sources/Module/WXAnimationLayout.m  | 115 ---
 .../WeexSDK/Sources/Module/WXAnimationModule.h  |   2 +
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  88 --
 ios/sdk/WeexSDK/Sources/Module/WXTransition.h   |  43 +++
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   | 311 +++
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m |   3 +-
 12 files changed, 516 insertions(+), 217 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee94722c/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
--
diff --cc ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 809c2a6,db577c6..4f9d6fd
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@@ -1662,9 -1632,9 +1662,10 @@@
DCA445B91EFA579D00D0CFA8 /* WXErrorView.h in 
Headers */,
DCA445A01EFA56F400D0CFA8 /* WXType.h in Headers 
*/,
DCA445B21EFA576D00D0CFA8 /* WXListComponent.h 
in Headers */,
+   333D9A281F41507A007CED39 /* WXTransition.h in 
Headers */,
DCA445A51EFA571600D0CFA8 /* WXSDKError.h in 
Headers */,
DCA445AD1EFA575100D0CFA8 /* 
WXNavigationProtocol.h in Headers */,
 +  C42E8FAF1F3C7C4B001EBE9D /* 
WXRecyclerDragController.h in Headers */,
DCA445B01EFA576200D0CFA8 /* WXModalUIModule.h 
in Headers */,
DCA445A61EFA571E00D0CFA8 /* WXSDKEngine.h in 
Headers */,
DCA445AA1EFA573900D0CFA8 /* WXResourceRequest.h 
in Headers */,
@@@ -2211,9 -2173,7 +2211,8 @@@
DCA445661EFA55B300D0CFA8 /* WXNavigatorModule.m 
in Sources */,
DCA445671EFA55B300D0CFA8 /* WXStorageModule.m 
in Sources */,
DCA445681EFA55B300D0CFA8 /* WXStreamModule.m in 
Sources */,
 +  C42E8FAC1F3C7C3B001EBE9D /* 
WXExtendCallNativeManager.m in Sources */,
DCA445691EFA55B300D0CFA8 /* WXAnimationModule.m 
in Sources */,
-   DCA4456A1EFA55B300D0CFA8 /* WXAnimationLayout.m 
in Sources */,
DCA4456B1EFA55B300D0CFA8 /* WXInstanceWrap.m in 
Sources */,
DCA4456C1EFA55B300D0CFA8 /* WXDomModule.m in 
Sources */,
DCA4456D1EFA55B300D0CFA8 /* WXTimerModule.m in 
Sources */,

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee94722c/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
--

[4/7] incubator-weex git commit: * [ios] fix transitionProperty:backgroundColor bug

2017-08-14 Thread acton393

* [ios] fix transitionProperty:backgroundColor bug


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

Branch: refs/heads/0.16-dev
Commit: 4a3a78092756f9229b6840d70db6b602d7fdf1fd
Parents: 02658e3
Author: doumafang 
Authored: Fri Aug 11 18:13:56 2017 +0800
Committer: doumafang 
Committed: Fri Aug 11 18:13:56 2017 +0800

--
 .../Sources/Component/WXComponent_internal.h|  1 -
 .../Sources/Display/WXComponent+Display.m   | 16 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 30 ++-
 .../WeexSDK/Sources/Module/WXAnimationModule.m  | 10 ++--
 ios/sdk/WeexSDK/Sources/Module/WXTransition.h   |  5 ++
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   | 56 
 6 files changed, 77 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4a3a7809/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h 
b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index 49db7a9..1e11f4f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -181,7 +181,6 @@
 
 - (void)_modifyStyles:(NSDictionary *)styles;
 
-
 - (void)_initCSSNodeWithStyles:(NSDictionary *)styles;
 
 - (void)_updateCSSNodeStyles:(NSDictionary *)styles;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4a3a7809/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m 
b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
index 57594de..5d22939 100644
--- a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
+++ b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
@@ -553,9 +553,23 @@ do {\
 [self _resetNativeBorderRadius];
 _layer.borderWidth = _borderTopWidth;
 _layer.borderColor = _borderTopColor.CGColor;
-_layer.backgroundColor = _backgroundColor.CGColor;
+if (![self _isTransitionBackgroundColorStyles:styles]) {
+_layer.backgroundColor = _backgroundColor.CGColor;
+}
+}
+}
+}
+
+- (BOOL)_isTransitionBackgroundColorStyles:(NSDictionary *)styles
+{
+BOOL yesOrNo = false;
+NSString *property = self.styles[kWXTransitionProperty];
+if (property) {
+if (([property containsString:@"backgroundColor"])) {
+yesOrNo = true;
 }
 }
+return yesOrNo;
 }
 
 - (BOOL)_bitmapOpaqueWithSize:(CGSize)size

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4a3a7809/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 669603f..124b769 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -433,10 +433,9 @@
 }
 
 #pragma mark Updating
-
 - (void)_updateStylesOnComponentThread:(NSDictionary *)styles 
resetStyles:(NSMutableArray *)resetStyles isUpdateStyles:(BOOL)isUpdateStyles
 {
-if ([self _isPropertyTransition]) {
+if ([self _isPropertyTransitionStyles:styles]) {
 if (!_transition) {
 _transition = [WXTransition new];
 }
@@ -455,32 +454,40 @@
 [self _resetCSSNodeStyles:resetStyles];
 }
 
-- (BOOL)_isPropertyTransition
+- (BOOL)_isPropertyTransitionStyles:(NSDictionary *)styles
 {
 BOOL yesOrNo = false;
-NSString *property = _styles[@"transitionProperty"];
+NSString *property = _styles[kWXTransitionProperty];
 if (property) {
-if ([property containsString:@"width"]||[property 
containsString:@"height"]||[property containsString:@"top"]||[property 
containsString:@"bottom"]||[property containsString:@"right"]||[property 
containsString:@"left"]||[property containsString:@"transform"]||[property 
containsString:@"backgroundColor"]||[property containsString:@"opacity"]) {
+if (([property containsString:@"width"]&[@"width"])
+||([property containsString:@"height"]&[@"height"])
+||([property containsString:@"right"]&[@"right"])
+||([property containsString:@"left"]&[@"left"])
+||([property containsString:@"bottom"]&[@"bottom"])
+||([property containsString:@"top"]&[@"top"])
+||([property

[2/7] incubator-weex git commit: * [ios] WXTransition

2017-08-14 Thread acton393

* [ios] WXTransition


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

Branch: refs/heads/0.16-dev
Commit: 741ee207ec66508d9124cb99a88e530a1458733f
Parents: 6bd86e5
Author: doumafang 
Authored: Thu Aug 10 21:34:48 2017 +0800
Committer: doumafang 
Committed: Thu Aug 10 21:34:48 2017 +0800

--
 .../Sources/Component/WXComponent_internal.h|  38 +--
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 280 -
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |  34 ++-
 .../WeexSDK/Sources/Module/WXAnimationLayout.h  |  49 ---
 .../WeexSDK/Sources/Module/WXAnimationLayout.m  | 115 ---
 .../WeexSDK/Sources/Module/WXAnimationModule.h  |   2 +
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  46 ++-
 ios/sdk/WeexSDK/Sources/Module/WXTransition.h   |  38 +++
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   | 299 +++
 9 files changed, 380 insertions(+), 521 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/741ee207/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h 
b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index d2b7d54..49db7a9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -21,9 +21,9 @@
 #import "WXComponent.h"
 #import "WXConvert.h"
 #import "WXTransform.h"
+#import "WXTransition.h"
 @class WXTouchGestureRecognizer;
 @class WXThreadSafeCounter;
-@class WXLayoutAnimationInfo;
 
 
 /**
@@ -45,34 +45,8 @@
 WXPositionType _positionType;
 
 
-
-//LayoutAnimation
-WXLayoutAnimationInfo *_heightInfo;
-WXLayoutAnimationInfo *_widthInfo;
-WXLayoutAnimationInfo *_topInfo;
-WXLayoutAnimationInfo *_rightInfo;
-WXLayoutAnimationInfo *_leftInfo;
-WXLayoutAnimationInfo *_bottomInfo;
-double ax;
-double bx;
-double cx;
-
-double ay;
-double by;
-double cy;
-
-
-float _layoutAnimationDuration;
-float _layoutAnimationDelay;
-CAMediaTimingFunction *_layoutAnimationTimingFunction;
-NSUInteger _layoutAnimationCount;
-
-NSMutableDictionary *_toStyles;
-NSMutableDictionary *_fromStyles;
-NSMutableDictionary *_addStyles;
-CADisplayLink *_layoutAnimationDisplayLink;
-
-
+//Transition
+WXTransition *_transition;
 
 /**
  *  View
@@ -252,10 +226,4 @@
 
 @end
 
-@interface WXLayoutAnimationInfo : NSObject
-@property (nonatomic, strong) id fromValue;
-@property (nonatomic, strong) id toValue;
-@property (nonatomic, strong) id perValue;
-@property (nonatomic, assign) BOOL isAnimated;
-@end
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/741ee207/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m 
b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
index 14034a6..4eb57f5 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
+++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#define SOLVE_EPS(dur) (1. / (1000. * (dur)))
-
 
 #import "WXComponent+Layout.h"
 #import "WXComponent_internal.h"
@@ -116,210 +114,6 @@
 }
 
 
-#pragma mark LayoutAnimationDisplayLink
-- (void)_startLayoutAnimationDisplayLink
-{
-WXAssertComponentThread();
-if (!_layoutAnimationDisplayLink) {
-_layoutAnimationDisplayLink = [CADisplayLink 
displayLinkWithTarget:self 
selector:@selector(_handleLayoutAnimationDisplayLink)];
-[_layoutAnimationDisplayLink addToRunLoop:[NSRunLoop currentRunLoop] 
forMode:NSDefaultRunLoopMode];
-}
-else{
-[self _awakeLayoutAnimationDisplayLink];
-}
-
-}
-
-- (void)_stopLayoutAnimationDisplayLink
-{
-WXAssertComponentThread();
-if (_layoutAnimationDisplayLink) {
-[_layoutAnimationDisplayLink invalidate];
-_layoutAnimationDisplayLink = nil;
-}
-}
-
-- (void)_suspendLayoutAnimationDisplayLink
-{
-WXAssertComponentThread();
-if(_layoutAnimationDisplayLink && !_layoutAnimationDisplayLink.paused)
-{
-_layoutAnimationDisplayLink.paused = YES;
-}
-}
-
-
-- (void)_awakeLayoutAnimationDisplayLink
-{
-WXAssertComponentThread();
-if (_layoutAnimationDisplayLink && _layoutAnimationDisplayLink.paused) {
-_layoutAnimationDisplayLink.paused = NO;
-}
-}
-
--

[1/7] incubator-weex git commit: + [ios] LayoutAnimation

2017-08-14 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 46b98bba9 -> ee94722cf


+ [ios] LayoutAnimation


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

Branch: refs/heads/0.16-dev
Commit: 6bd86e5625bff1310a48244fd2c74db307b9314e
Parents: 1ebd484
Author: doumafang 
Authored: Tue Aug 8 20:31:03 2017 +0800
Committer: doumafang 
Committed: Tue Aug 8 20:31:03 2017 +0800

--
 .../Sources/Component/WXComponent_internal.h|  45 +++
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 281 +++
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |  33 ++-
 .../WeexSDK/Sources/Module/WXAnimationLayout.h  |  98 +++
 .../WeexSDK/Sources/Module/WXAnimationLayout.m  | 230 +++
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  94 +--
 6 files changed, 584 insertions(+), 197 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6bd86e56/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h 
b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index 7226ced..d2b7d54 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -23,6 +23,8 @@
 #import "WXTransform.h"
 @class WXTouchGestureRecognizer;
 @class WXThreadSafeCounter;
+@class WXLayoutAnimationInfo;
+
 
 /**
  * The following variables and methods are used in Weex INTERNAL logic.
@@ -42,6 +44,36 @@
 CGPoint _absolutePosition;
 WXPositionType _positionType;
 
+
+
+//LayoutAnimation
+WXLayoutAnimationInfo *_heightInfo;
+WXLayoutAnimationInfo *_widthInfo;
+WXLayoutAnimationInfo *_topInfo;
+WXLayoutAnimationInfo *_rightInfo;
+WXLayoutAnimationInfo *_leftInfo;
+WXLayoutAnimationInfo *_bottomInfo;
+double ax;
+double bx;
+double cx;
+
+double ay;
+double by;
+double cy;
+
+
+float _layoutAnimationDuration;
+float _layoutAnimationDelay;
+CAMediaTimingFunction *_layoutAnimationTimingFunction;
+NSUInteger _layoutAnimationCount;
+
+NSMutableDictionary *_toStyles;
+NSMutableDictionary *_fromStyles;
+NSMutableDictionary *_addStyles;
+CADisplayLink *_layoutAnimationDisplayLink;
+
+
+
 /**
  *  View
  */
@@ -171,6 +203,11 @@
 /// @name Private Methods
 ///--
 
+- (void)_handleLayoutAnimationWithStyles:(NSDictionary *)styles;
+
+- (void)_modifyStyles:(NSDictionary *)styles;
+
+
 - (void)_initCSSNodeWithStyles:(NSDictionary *)styles;
 
 - (void)_updateCSSNodeStyles:(NSDictionary *)styles;
@@ -214,3 +251,11 @@
 - (void)setGradientLayer;
 
 @end
+
+@interface WXLayoutAnimationInfo : NSObject
+@property (nonatomic, strong) id fromValue;
+@property (nonatomic, strong) id toValue;
+@property (nonatomic, strong) id perValue;
+@property (nonatomic, assign) BOOL isAnimated;
+@end
+

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6bd86e56/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m 
b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
index 58e76bf..14034a6 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
+++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -17,6 +17,9 @@
  * under the License.
  */
 
+#define SOLVE_EPS(dur) (1. / (1000. * (dur)))
+
+
 #import "WXComponent+Layout.h"
 #import "WXComponent_internal.h"
 #import "WXTransform.h"
@@ -112,6 +115,211 @@
 return (int)(count);
 }
 
+
+#pragma mark LayoutAnimationDisplayLink
+- (void)_startLayoutAnimationDisplayLink
+{
+WXAssertComponentThread();
+if (!_layoutAnimationDisplayLink) {
+_layoutAnimationDisplayLink = [CADisplayLink 
displayLinkWithTarget:self 
selector:@selector(_handleLayoutAnimationDisplayLink)];
+[_layoutAnimationDisplayLink addToRunLoop:[NSRunLoop currentRunLoop] 
forMode:NSDefaultRunLoopMode];
+}
+else{
+[self _awakeLayoutAnimationDisplayLink];
+}
+
+}
+
+- (void)_stopLayoutAnimationDisplayLink
+{
+WXAssertComponentThread();
+if (_layoutAnimationDisplayLink) {
+[_layoutAnimationDisplayLink invalidate];
+_layoutAnimationDisplayLink = nil;
+}
+}
+
+- (void)_suspendLayoutAnimationDisplayLink
+{
+WXAssertComponentThread();
+if(_layoutAnimationDisplayLink &&

[GitHub] incubator-weex issue #599: fix: gcanvas 组件� �容 h5 写法

2017-08-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  





  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 #599: fix: gcanvas 组件� �容 h5 写法

2017-08-14 Thread hacke2

GitHub user hacke2 opened a pull request:

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

fix: gcanvas ç»ä»¶å¼å®¹ h5 åæ³

1. h5 ä¸, `weex-gcanvas` ä¸è½è¯å« gcanvas æ ç¾ï¼å ä¸º 
`weex-gcanvas` åºæ æ³å vue è¦åï¼æä»¥ä¸è½æ³¨å gcanvas æ 
ç¾ãéè¦èªè¡å¤æã
2. éè¦è®¾å® canvas æ ç¾ç `width` å `height` 
å±æ§ï¼å¦åæ¾ç¤ºä¸æ£ç¡®

> weex-gcanvas çæ¬åºè¯¥ä¸º ^0.5.2






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

$ git pull https://github.com/hacke2/incubator-weex 0.16-dev

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

https://github.com/apache/incubator-weex/pull/599.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 #599


commit bf58572eca1a7cf0f75e8fa8bae984ce801a094e
Author: hacke2 
Date:   2017-08-15T02:01:57Z

fix: gcanvas ç»ä»¶å¼å®¹ h5 åæ³

1. h5 ä¸, `weex-gcanvas` ä¸è½è¯å« gcanvas æ ç¾ï¼å ä¸º 
`weex-gcanvas` åºæ æ³å vue è¦åï¼æä»¥ä¸è½æ³¨å gcanvas æ 
ç¾ãéè¦èªè¡å¤æã
2. éè¦è®¾å® canvas æ ç¾ç `width` å `height` 
å±æ§ï¼å¦åæ¾ç¤ºä¸æ£ç¡®

> weex-gcanvas çæ¬åºè¯¥ä¸º ^0.5.2




---
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 #581: + [ios] LayoutAnimation

2017-08-14 Thread kernelj

Github user kernelj commented on the issue:

https://github.com/apache/incubator-weex/pull/581
  
è¿æ¯å¢å iosé¡µé¢è·³è½¬çå è½½å¨ç»çå


---
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 #598: * [doc] remove extra colon before `ref`

2017-08-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  





  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 #598: * [doc] remove extra colon before `ref`

2017-08-14 Thread oMaten

GitHub user oMaten opened a pull request:

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

* [doc] remove extra colon before `ref`



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

$ git pull https://github.com/oMaten/incubator-weex doc-bugfix-scroller

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

https://github.com/apache/incubator-weex/pull/598.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 #598


commit 6113b1849da9cbef97a5165f879d5a2abea08a2c
Author: wangfei 
Date:   2017-08-14T16:51:29Z

* [doc] remove extra colon before `ref`




---
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.
---

[1/3] incubator-weex git commit: * [test] drop coverage to support

2017-08-14 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 096c59b80 -> 46b98bba9


* [test] drop coverage to support


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

Branch: refs/heads/0.16-dev
Commit: a0d01c357c620a84da91240ac192db04058a5eba
Parents: ffe4951
Author: gurisxie <279483...@qq.com>
Authored: Fri Aug 11 10:46:04 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Fri Aug 11 10:46:04 2017 +0800

--
 test/run.sh | 12 
 1 file changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0d01c35/test/run.sh
--
diff --git a/test/run.sh b/test/run.sh
index b2d5018..4c3a2c0 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -49,15 +49,6 @@ function buildiOS {
 
 }
 
-function coverageGenerate {
-current_dir=$PWD
-xcodeCover="${current_dir}/ios/playground/XcodeCoverage"
-if [ -d $xcodeCover ]; then
-cd $xcodeCover
-./getcov -o . -p WeexSDK -x
-fi
-}
-
 function runiOS {
 echo 'Run in iOS...'
 echo $1
@@ -68,9 +59,6 @@ function runiOS {
 startMacacaServer
 startWeexServer
 platform=ios ./node_modules/mocha/bin/mocha  $1 -f '@ignore-ios' -i 
--recursive --bail --verbose
-if [ $needCoverage = "cover" ]; then
-coverageGenerate
-fi
 }
 
 function runWeb {

[3/3] incubator-weex git commit: Merge commit '096c59b80aca8399f146639ede15a952757f495c' into 0.16-dev

2017-08-14 Thread acton393

Merge commit '096c59b80aca8399f146639ede15a952757f495c' into 0.16-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/46b98bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/46b98bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/46b98bba

Branch: refs/heads/0.16-dev
Commit: 46b98bba98340527af92803c5064fcdb84527f34
Parents: 36ddf32 096c59b
Author: gurisxie <279483...@qq.com>
Authored: Mon Aug 14 12:48:04 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Aug 14 12:48:04 2017 +0800

--
 android/sdk/libs/x86/libweexjsc.so  | Bin 7570392 -> 12121924 bytes
 doc/source/_posts/arkit.md  | 112 +++
 doc/source/_posts/cn/hello.md   |   6 -
 doc/source/_posts/hello_world.md|   7 --
 doc/source/_posts/test.md   |  14 ---
 doc/source/cn/blog/index.md |   4 -
 .../cn/references/advanced/extend-to-ios.md |   4 +-
 .../advanced/integrate-devtool-to-android.md|  86 +-
 doc/source/cn/references/common-style.md|   2 +
 doc/source/cn/references/components/text.md |   4 +-
 doc/source/cn/references/modules/animation.md   |   2 +-
 doc/source/references/advanced/extend-to-ios.md |   5 +-
 doc/source/references/common-style.md   |   2 +
 doc/source/references/components/text.md|   4 +-
 doc/source/references/modules/animation.md  |   2 +-
 doc/themes/weex/layout/_partial/header.ejs  |   1 +
 .../weex/layout/_partial/post/summary.ejs   |   1 +
 doc/themes/weex/source/css/blog.scss|   3 +
 doc/themes/weex/source/css/media-queries.scss   |   1 +
 doc/themes/weex/source/css/partial/header.scss  |   6 +-
 html5/runtime/normalize.js  |  13 +--
 .../WeexSDK/Sources/Component/WXListComponent.m |   4 +-
 package.json|   3 +-
 pre-build/native-bundle-main.js |  10 +-
 24 files changed, 231 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/46b98bba/package.json
--

[2/3] incubator-weex git commit: * [test] test reporter

2017-08-14 Thread acton393

* [test] test reporter


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

Branch: refs/heads/0.16-dev
Commit: 36ddf32548da28f7fb69657d9e27463d34e4eb9c
Parents: a0d01c3
Author: gurisxie <279483...@qq.com>
Authored: Fri Aug 11 11:38:04 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Fri Aug 11 11:38:04 2017 +0800

--
 package.json | 1 +
 test/run.sh  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/36ddf325/package.json
--
diff --git a/package.json b/package.json
index 70c4015..4138a72 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,7 @@
 "karma-webpack": "^1.8.0",
 "macaca-utils": "^0.1.9",
 "mocha": "^2.5.3",
+"mocha-simple-html-reporter": "^1.0.1",
 "nightwatch": "^0.9.4",
 "parse-diff": "^0.4.0",
 "phantomjs-prebuilt": "^2.1.7",

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/36ddf325/test/run.sh
--
diff --git a/test/run.sh b/test/run.sh
index 4c3a2c0..9926555 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -25,7 +25,7 @@ function runAndroid {
 buildAndroid
 startMacacaServer
 startWeexServer
-platform=android ./node_modules/mocha/bin/mocha  $1 -f '@ignore-android' 
-i --recursive --bail
+platform=android ./node_modules/mocha/bin/mocha  $1 --reporter 
mocha-simple-html-reporter --reporter-options output=report.html -f 
'@ignore-android' -i --recursive --bail
 }
 
 function buildiOS {
@@ -58,14 +58,14 @@ function runiOS {
 # ps -ef
 startMacacaServer
 startWeexServer
-platform=ios ./node_modules/mocha/bin/mocha  $1 -f '@ignore-ios' -i 
--recursive --bail --verbose
+platform=ios ./node_modules/mocha/bin/mocha  $1 --reporter 
mocha-simple-html-reporter --reporter-options output=report.html -f 
'@ignore-ios' -i --recursive --bail --verbose
 }
 
 function runWeb {
 echo 'run web'
 startMacacaServer
 startWeexServer
-browser=chrome ./node_modules/mocha/bin/mocha  $1 -f '@ignore-web' -i 
--recursive --bail
+browser=chrome ./node_modules/mocha/bin/mocha  $1 --reporter 
mocha-simple-html-reporter --reporter-options output=report.html -f 
'@ignore-web' -i --recursive --bail
 }
 
 function killserver {

[GitHub] incubator-weex pull request #595: test reporter

2017-08-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---
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.
---

incubator-weex git commit: *[doc] add ga

2017-08-14 Thread tancy

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 778c0f6ad -> a52c861e1


*[doc] add ga


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

Branch: refs/heads/dev
Commit: a52c861e11b6f89cce78ae172f3578efa5e98ac2
Parents: 778c0f6
Author: tancy 
Authored: Mon Aug 14 16:39:41 2017 +0800
Committer: tancy 
Committed: Mon Aug 14 16:39:41 2017 +0800

--
 doc/themes/weex/layout/_partial/after-footer.ejs | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a52c861e/doc/themes/weex/layout/_partial/after-footer.ejs
--
diff --git a/doc/themes/weex/layout/_partial/after-footer.ejs 
b/doc/themes/weex/layout/_partial/after-footer.ejs
index babfb3c..b945034 100644
--- a/doc/themes/weex/layout/_partial/after-footer.ejs
+++ b/doc/themes/weex/layout/_partial/after-footer.ejs
@@ -1,3 +1,13 @@
 
   
+  
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-104559823-1', 'auto');
+  ga('send', 'pageview');
+
+

[GitHub] incubator-weex issue #597: Bugfix js storage

2017-08-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

  :warning:
  This PR modify SDK code without add/modify testcases.

  

  :warning:
  This PR should update related documents as well. 

  




  

  
  Messages

  
  
  :book:
  According to the blame info, we recommended @MrRaindrop 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 #597: Bugfix js storage

2017-08-14 Thread wispy316

GitHub user wispy316 opened a pull request:

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

Bugfix js storage

html fix storage module setItem not support value = 0

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

$ git pull https://github.com/wispy316/incubator-weex bugfix-js-storage2

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

https://github.com/apache/incubator-weex/pull/597.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 #597


commit 594d8302cf14c65aa951ee15c5f916cab10bff33
Author: è¡ä¹ 
Date:   2017-08-11T05:55:13Z

[html5] fix setItem cannot set value to 0 bug.  
https://aone.alibaba-inc.com/issue/12020693

commit c1ae868bd055de2f1f25515cf1e0e79a335fe10a
Author: è¡ä¹ 
Date:   2017-08-11T06:33:30Z

[html5] !== lint

commit c01f87d130770f08b48361317a73b885fdfb030b
Author: è¡ä¹ 
Date:   2017-08-14T06:20:48Z

[html5] commit update. and fire CI run again. @notdanger

commit 1c3b169cf02ba97630c6b3d34323b16393af50de
Author: è¡ä¹ 
Date:   2017-08-14T07:35:28Z

[html5]  fix storage setItem can`t support 0 bug.   @notdanger




---
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 #596: [jsfm] Refactor the file structure of weex runtim...

2017-08-14 Thread weex-bot

Github user weex-bot commented on the issue:

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




  

  
  Fails

  
  
  :no_entry_sign:
  Code file html5/runtime/bridge/normalize.js does not have the 
copyright header.

  

  :no_entry_sign:
  Code file packages/weex-js-framework/index.min.js does not have 
the copyright header.

  

  :no_entry_sign:
  Code file packages/weex-js-runtime/index.min.js does not have the 
copyright header.

  

  :no_entry_sign:
  Code file packages/weex-legacy-framework/index.min.js does not 
have the copyright header.

  

  :no_entry_sign:
  Code file html5/runtime/utils.js does not have the copyright 
header.

  

  :no_entry_sign:
  Code file html5/runtime/vdom/directive.js does not have the 
copyright header.

  

  :no_entry_sign:
  Code file html5/test/unit/runtime/runner/helper.js does not have 
the copyright header.

  

  :no_entry_sign:
  Code file html5/test/unit/runtime/runner/vanilla.js does not have 
the copyright header.

  

  :no_entry_sign:
  Code file html5/test/unit/runtime/runner/vue.js does not have the 
copyright header.

  

  :no_entry_sign:
  Code file html5/test/unit/runtime/vdom/directive.js does not have 
the copyright header.

  

  :no_entry_sign:
  Code file packages/weex-html5/index.min.js does not have the 
copyright header.

  

  :no_entry_sign:
  Code file packages/weex-vanilla-framework/index.min.js does not 
have the copyright header.

  




  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

  :warning:
  These new JS files do not have Flow enabled: 
html5/runtime/utils.js, html5/runtime/vdom/directive.js, 
html5/test/unit/runtime/runner/helper.js, 
html5/test/unit/runtime/runner/vanilla.js, 
html5/test/unit/runtime/runner/vue.js, 
html5/test/unit/runtime/vdom/directive.js, packages/weex-html5/index.js, 
packages/weex-html5/index.min.js, packages/weex-vanilla-framework/index.js, 
packages/weex-vanilla-framework/index.min.js

  

  :warning:
  This PR should update related documents as well. 

  




  

  
  Messages

  
  
  :book:
  According to the blame info, we recommended @luics , @Jinjiang 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 #596: [jsfm] Refactor the file structure of weex...

2017-08-14 Thread Hanks10100

GitHub user Hanks10100 opened a pull request:

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

[jsfm] Refactor the file structure of weex runtime

+ [x] Add type check in the method of `TaskCenter`.
+ [x] Add directive filter for Element attributes.
+ [x] Convert `Element`, `Document`, `Node`, `Comment` into ES6 class.
+ [x] Use `WeexElement` instead of `element-types` to create new type of 
Weex component.
+ [x] Fix the wrong build path in `build_from_source.sh` to make the CI 
pass.


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

$ git pull https://github.com/Hanks10100/incubator-weex jsfm-feature-0.22

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

https://github.com/apache/incubator-weex/pull/596.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 #596


commit 6ecd723f053b1885a2afaaea3ad918fff71807ce
Author: Hanks 
Date:   2017-07-29T16:12:07Z

* [jsfm] update vanilla framework

commit 2ecf8565f8da844caea3069f551aba6c5a79a54b
Author: Hanks 
Date:   2017-08-03T03:28:42Z

+ [jsfm] add directive filter in runtime

commit d8bcbf242693c93757322533ec1612b03c680a18
Author: Hanks 
Date:   2017-08-03T03:45:27Z

* [jsfm] filter directives in attrs

commit 6fed87d488e5eaa7718b0cda5ddead6aa09a8238
Author: Hanks 
Date:   2017-08-03T03:47:36Z

Merge branch 'jsfm-feature-buffer' into jsfm-feature-beta

commit 66804f2eae0ba411f68e5086d8621eb91e293419
Author: Hanks 
Date:   2017-08-03T03:50:48Z

* [build] build weex-js-framework and weex-js-runtime

commit 25b0101dff7635932718d8d5feee2ad9e9a2f1dc
Author: Hanks 
Date:   2017-08-07T07:27:33Z

* [jsfm] use ES6 class in vdom

commit 0729ac590a7e69aa279de973273fa228507f77f1
Author: Hanks 
Date:   2017-08-07T07:49:36Z

* [jsfm] refactor the file structure in runtime

commit 2f7921ece78bdf60ff419b7c0973b359599f16cb
Author: Hanks 
Date:   2017-08-07T07:58:39Z

* [jsfm] modify the file path in test

commit e9ad371a3ce8eb5c7c4175b9d4fe117b2bdfecdc
Author: Hanks 
Date:   2017-08-07T08:37:30Z

* [jsfm] refactor element-types

commit 9510e8b896cac47fd84016b43ff171c82a1ee072
Author: Hanks 
Date:   2017-08-08T03:08:36Z

Merge branch 'jsfm-feature-vanilla' into jsfm-feature-es6

commit f3ebd620b93d2af1528018cd3567e201d3c90a6f
Author: Hanks 
Date:   2017-08-08T03:31:13Z

+ [build] add build script for vanilla framework

commit 479d770121f39be80e49e50974fd04e3c1e2a0a7
Author: Hanks 
Date:   2017-08-08T03:47:58Z

- [jsfm] remove useless apis in vanilla framework

commit 41c787747aeedae52a08e761172b280bc814f67d
Author: Hanks 
Date:   2017-08-08T04:11:38Z

* [jsfm] publish js runtime / legacy / vanilla frameworks

commit 229740a583b540e01e50fccfc3273bfc9415921f
Author: Hanks 
Date:   2017-08-08T09:01:41Z

Merge branch '0.16-dev' into jsfm-feature-0.22

commit 8294acfc2c5a5268edf1bd048981a578e5a9c253
Author: Hanks 
Date:   2017-08-08T09:11:20Z

* [jsfm] change the file name case in vdom

commit bade95514eb57eaf0dec7a4bf42f07b33f9c9aa6
Author: Hanks 
Date:   2017-08-08T16:26:17Z

* [jsfm] refactor the logic in runtime init

commit 9e13c86051e4e8e615ea0be0ae86e7237b546494
Author: Hanks 
Date:   2017-08-10T08:27:05Z

* [test] refactor the unit test cases of runtime

commit 500cfe8fd151c5a7cf0abeaa0552c55b65d14cbf
Author: Hanks 
Date:   2017-08-10T12:02:39Z

+ [test] add test cases for render real instance

commit 65c1af51e7ce144119220ca04ee719e99059baf6
Author: Hanks 
Date:   2017-08-10T12:06:15Z

* [jsfm] add type check in the  method of TaskCenter

commit 8d6c0d2803c83866398832763d935a5e412c76ba
Author: Hanks 
Date:   2017-08-14T03:44:37Z

Merge branch '0.16-dev' into jsfm-feature-0.22

commit c8e9cdb6c2fd6c904b0fa99ef6d6be5a4f0b1e3e
Author: Hanks 
Date:   2017-08-14T06:04:01Z

* [build] update build scripts to copy the right path

commit e9f9df58ad899aecd339614d97c465d392ac097a
Author: Hanks 
Date:   2017-08-14T06:11:16Z

* [build] build weex-js-framework@0.21.9




---
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.
---

incubator-weex git commit: * [android] move Dom.Transform, Dom.TransformOrigin to Constants.

[GitHub] incubator-weex pull request #581: + [ios] LayoutAnimation

[3/7] incubator-weex git commit: * [ios] WXTransition fix bugs about how to deal with property

[5/7] incubator-weex git commit: * [ios] fix timingFunction bug

[6/7] incubator-weex git commit: * [ios] fix build pbxproj bug

[7/7] incubator-weex git commit: Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into wip-us-0.16-dev

[4/7] incubator-weex git commit: * [ios] fix transitionProperty:backgroundColor bug

[2/7] incubator-weex git commit: * [ios] WXTransition

[1/7] incubator-weex git commit: + [ios] LayoutAnimation

[GitHub] incubator-weex issue #599: fix: gcanvas 组件� �容 h5 写法

[GitHub] incubator-weex pull request #599: fix: gcanvas 组件� �容 h5 写法

[GitHub] incubator-weex issue #581: + [ios] LayoutAnimation

[GitHub] incubator-weex issue #598: * [doc] remove extra colon before `ref`

[GitHub] incubator-weex pull request #598: * [doc] remove extra colon before `ref`

[1/3] incubator-weex git commit: * [test] drop coverage to support

[3/3] incubator-weex git commit: Merge commit '096c59b80aca8399f146639ede15a952757f495c' into 0.16-dev

[2/3] incubator-weex git commit: * [test] test reporter

[GitHub] incubator-weex pull request #595: test reporter

incubator-weex git commit: *[doc] add ga

[GitHub] incubator-weex issue #597: Bugfix js storage

[GitHub] incubator-weex pull request #597: Bugfix js storage

[GitHub] incubator-weex issue #596: [jsfm] Refactor the file structure of weex runtim...

[GitHub] incubator-weex pull request #596: [jsfm] Refactor the file structure of weex...

23 matches

Site Navigation

Mail list logo

Footer information