date:20170914

[GitHub] incubator-weex issue #699: * [android] The timer in Android will supports fl...

2017-09-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

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

  

  :warning:
  Potential BREAK CHANGE. Modify public in 
android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java without 
metion it in commit message. You'd better add '@notdanger' in your commit log. 


  




  

  
  Messages

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

  




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




---

[GitHub] incubator-weex pull request #699: * [android] The timer in Android will supp...

2017-09-14 Thread YorkShen

GitHub user YorkShen opened a pull request:

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

* [android] The timer in Android will supports float interval/delay

The timer in Android will supports float interval/delay and transform them 
to int.

As some codes always ignore the docs and pass float value, which is not 
supported, the sdk has no way but to be tolerant with wrong behavior.

Refer 

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

$ git pull https://github.com/YorkShen/incubator-weex android-timer

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

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


commit c0035091b5a7bc0bfb331a53d5e3daf5d692fa2b
Author: YorkShen 
Date:   2017-09-14T07:24:14Z

* [android]The timer in Android will supports float interval/delay and 
transform them to int.

As some codes always ignore the docs and pass float value, which is not 
supported, the sdk has no way but to be tolerant with wrong behavior.




---

[GitHub] incubator-weex issue #698: * [ios] support multi roles for accessibiliity

2017-09-14 Thread gurisxie

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/698
  
review result,not found anything error


---

[GitHub] incubator-weex issue #696: * [ios] clear toast queue when instance disappear...

2017-09-14 Thread gurisxie

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/696
  
has no question


---

[GitHub] incubator-weex pull request #699: * [android] The timer in Android will supp...

2017-09-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---

incubator-weex git commit: * [android]The timer in Android will supports float interval/delay and transform them to int.

2017-09-14 Thread zshshr

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev ed0a8dc1a -> c0035091b


* [android]The timer in Android will supports float interval/delay and 
transform them to int.

As some codes always ignore the docs and pass float value, which is not 
supported, the sdk has no way but to be tolerant with wrong behavior.


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

Branch: refs/heads/0.16-dev
Commit: c0035091b5a7bc0bfb331a53d5e3daf5d692fa2b
Parents: ed0a8dc
Author: YorkShen 
Authored: Thu Sep 14 15:24:14 2017 +0800
Committer: YorkShen 
Committed: Thu Sep 14 15:24:14 2017 +0800

--
 .../taobao/weex/ui/module/WXTimerModule.java|  9 ++--
 .../weex/ui/module/WXTimerModuleTest.java   | 45 ++--
 test/pages/modules/vue_timer.vue| 14 --
 test/pages/modules/we_timer.we  | 14 --
 4 files changed, 69 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c0035091/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
index caa28a6..ae0ed99 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
@@ -27,6 +27,7 @@ import static 
com.taobao.weex.common.WXJSBridgeMsgType.MODULE_TIMEOUT;
 
 import android.os.Handler;
 import android.os.Message;
+import android.support.annotation.FloatRange;
 import android.support.annotation.IntDef;
 import android.support.annotation.IntRange;
 import android.support.annotation.VisibleForTesting;
@@ -63,16 +64,16 @@ public class WXTimerModule extends WXModule implements 
Destroyable, Handler.Call
 
 
   @JSMethod(uiThread = false)
-  public void setTimeout(@IntRange(from = 1) int funcId, @IntRange(from = 0) 
int delay) {
+  public void setTimeout(@IntRange(from = 1) int funcId, @FloatRange(from = 0) 
float delay) {
 if(mWXSDKInstance != null) {
-  postOrHoldMessage(MODULE_TIMEOUT, funcId, delay, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
+  postOrHoldMessage(MODULE_TIMEOUT, funcId, (int) delay, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
 }
   }
 
   @JSMethod(uiThread = false)
-  public void setInterval(@IntRange(from = 1) int funcId, @IntRange(from = 0) 
int interval) {
+  public void setInterval(@IntRange(from = 1) int funcId, @FloatRange(from = 
0) float interval) {
 if(mWXSDKInstance != null) {
-  postOrHoldMessage(MODULE_INTERVAL, funcId, interval, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
+  postOrHoldMessage(MODULE_INTERVAL, funcId, (int) interval, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
 }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c0035091/android/sdk/src/test/java/com/taobao/weex/ui/module/WXTimerModuleTest.java
--
diff --git 
a/android/sdk/src/test/java/com/taobao/weex/ui/module/WXTimerModuleTest.java 
b/android/sdk/src/test/java/com/taobao/weex/ui/module/WXTimerModuleTest.java
index 7fe508c..f4331b0 100644
--- a/android/sdk/src/test/java/com/taobao/weex/ui/module/WXTimerModuleTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/ui/module/WXTimerModuleTest.java
@@ -18,6 +18,8 @@
  */
 package com.taobao.weex.ui.module;
 
+import static android.R.attr.end;
+import static android.R.attr.start;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
@@ -61,6 +63,7 @@ public class WXTimerModuleTest {
   public final static int DELAY = 50;
   public final static int IMMEDIATELY = 0;
   public final static int INVALID_DELAY = -50;
+  public final static float FLOAT_DELAY = 20.6f;
 
   @Rule
   public PowerMockRule rule = new PowerMockRule();
@@ -84,7 +87,26 @@ public class WXTimerModuleTest {
   @Test
   public void testSetTimeoutDelay() throws Exception {
 module.setTimeout(VALID_FUNC_ID, DELAY);
-mLooper.idle(DELAY);
+long start, end, duration;
+start = mLooper.getScheduler().getCurrentTime();
+mLooper.runOneTask();
+end = mLooper.getScheduler().getCurrentTime();
+duration = end - start;
+
+assertThat(duration, is((long) DELAY));
+Mockito.verify(module, times(1)).handleMessage(any(Message.class));
+  }
+
+  @Test
+  public void

[GitHub] incubator-weex issue #700: + [android] Add a new log level.

2017-09-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

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

  





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




---

[GitHub] incubator-weex pull request #702: Fix typo on homepage

2017-09-14 Thread rubenoost

GitHub user rubenoost opened a pull request:

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

Fix typo on homepage



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

$ git pull https://github.com/rubenoost/incubator-weex doc-bugfix-typo

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

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


commit 54c7cd0aa467433dd1264b8aa0548a920bc56ccd
Author: Ruben Oost 
Date:   2017-09-14T12:31:50Z

Fix typo on homepage




---

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

2017-09-14 Thread acton393

Merge branch 'ios-feature-accessibility' of 
https://github.com/acton393/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/f95d20db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f95d20db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f95d20db

Branch: refs/heads/0.16-dev
Commit: f95d20db146aaef28fab15ee9a5863e20a9b4933
Parents: 236b782 72e80f9
Author: acton393 
Authored: Thu Sep 14 19:29:44 2017 +0800
Committer: acton393 
Committed: Thu Sep 14 19:29:44 2017 +0800

--
 .../Sources/Component/WXComponent_internal.h|  2 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 27 +---
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 24 -
 3 files changed, 42 insertions(+), 11 deletions(-)
--

[4/8] incubator-weex git commit: * [ios] clear toast queue when instance disappear

2017-09-14 Thread acton393

* [ios] clear toast queue when instance disappear


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

Branch: refs/heads/0.16-dev
Commit: c8c73cd01fe94a2a0b5068808cc3776e6d6ecb00
Parents: d82509d
Author: acton393 
Authored: Wed Sep 13 16:16:23 2017 +0800
Committer: acton393 
Committed: Wed Sep 13 16:16:23 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m| 4 +++-
 ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h | 6 ++
 ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m | 6 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c73cd0/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m 
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 39645ca..2a87df8 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -45,6 +45,7 @@
 #import "WXTracingManager.h"
 #import "WXJSExceptionProtocol.h"
 #import "WXTracingManager.h"
+#import "WXModalUIModule.h"
 
 NSString *const bundleUrlOptionKey = @"bundleUrl";
 
@@ -378,7 +379,8 @@ typedef enum : NSUInteger {
 if(url.length > 0){
 [WXPrerenderManager addGlobalTask:url callback:nil];
 }
-
+NSMutableArray * toastQueue = [[WXToastManager sharedManager] 
valueForKey:@"toastQueue"];
+[toastQueue removeAllObjects];
 }
 
 - (void)forceGarbageCollection

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c73cd0/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h 
b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
index 41582f2..c1af965 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
@@ -23,3 +23,9 @@
 @interface WXModalUIModule : NSObject 
 
 @end
+
+@interface WXToastManager : NSObject
+
++ (WXToastManager *)sharedManager;
+
+@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c73cd0/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m 
b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
index 0f8445a..c597f71 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
@@ -43,13 +43,9 @@ typedef enum : NSUInteger {
 
 @end
 
-@interface WXToastManager : NSObject
-
+@interface WXToastManager()
 @property (strong, nonatomic) NSMutableArray *toastQueue;
 @property (strong, nonatomic) UIView *toastingView;
-
-+ (WXToastManager *)sharedManager;
-
 @end
 
 @implementation WXToastManager

[GitHub] incubator-weex issue #702: Fix typo on homepage

2017-09-14 Thread rubenoost

Github user rubenoost commented on the issue:

https://github.com/apache/incubator-weex/pull/702
  
The key of the translation should probably also be changed, but i do not 
have enough knowledge of the project to determine where this should happen.


---

[2/8] incubator-weex git commit: * [ios] support multi roles

2017-09-14 Thread acton393

* [ios] support multi roles


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

Branch: refs/heads/0.16-dev
Commit: 70d421b95526fa6835dc0040860d0c815d11135c
Parents: 16fb0d9
Author: acton393 
Authored: Tue Sep 12 23:49:19 2017 +0800
Committer: acton393 
Committed: Tue Sep 12 23:49:19 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/70d421b9/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 685ec07..df61f6f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -64,7 +64,7 @@
 /**
  * accessibility support
  */
-UIAccessibilityTraits _role; //accessibility
+NSString * _role; //accessibility
 NSString * _ariaLabel; //accessibilityLabel
 NSString * _ariaHidden; // accessibilityElementsHidden
 NSString * _accessible; // accessible

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/70d421b9/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 18e7d7c..254a128 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -108,13 +108,13 @@
 }
 }
 
-if (attributes[@"role"]){
-_role = [WXConvert WXUIAccessibilityTraits:attributes[@"role"]];
-}
 if (attributes[@"ariaHidden"]) {
 
 _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];
 }
+if (attributes[@"role"]) {
+_role = attributes[@"role"];
+}
 if (attributes[@"ariaLabel"]) {
 _ariaLabel = [WXConvert NSString:attributes[@"ariaLabel"]];
 }
@@ -140,6 +140,16 @@
 return self;
 }
 
+- 
(UIAccessibilityTraits)_parseAccessibilityTraitsWithTraits:(UIAccessibilityTraits)trait
 role:(NSString*)roleStr
+{
+UIAccessibilityTraits newTrait = trait;
+for (NSString * role in [roleStr componentsSeparatedByString:@" "]) {
+newTrait |= [WXConvert WXUIAccessibilityTraits: role];
+}
+
+return newTrait;
+}
+
 - (void)dealloc
 {
 free_css_node(_cssNode);
@@ -259,7 +269,7 @@
 _layer.wx_component = self;
 
 if (_role) {
-_view.accessibilityTraits |= _role;
+[_view setAccessibilityTraits:[self 
_parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits role:_role]];
 }
 
 if (_testId) {
@@ -610,10 +620,9 @@
 - (void)_configWXComponentA11yWithAttributes:(NSDictionary *)attributes
 {
 WX_CHECK_COMPONENT_TYPE(self.componentType)
-
-if (attributes[@"role"]) {
-_role = [WXConvert WXUIAccessibilityTraits:attributes[@"role"]];
-self.view.accessibilityTraits = _role;
+if (attributes[@"role"]){
+_role = attributes[@"role"];
+[self.view setAccessibilityTraits:[self 
_parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits role:_role]];
 }
 if (attributes[@"ariaHidden"]) {
 _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];

[GitHub] incubator-weex pull request #701: Fix typo on homepage

2017-09-14 Thread rubenoost

Github user rubenoost closed the pull request at:

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


---

[GitHub] incubator-weex issue #701: Fix typo on homepage

2017-09-14 Thread rubenoost

Github user rubenoost commented on the issue:

https://github.com/apache/incubator-weex/pull/701
  
Closing because branch name is not correct.


---

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

2017-09-14 Thread acton393

Merge branch 'ios-feature-modal-toast' of 
https://github.com/acton393/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/236b7828
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/236b7828
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/236b7828

Branch: refs/heads/0.16-dev
Commit: 236b782886fed399b999063614d583fb33907e8c
Parents: c003509 e44104a
Author: acton393 
Authored: Thu Sep 14 19:29:23 2017 +0800
Committer: acton393 
Committed: Thu Sep 14 19:29:23 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[6/8] incubator-weex git commit: * [ios] use weakself to resolve toast still show while the page is popped

2017-09-14 Thread acton393

* [ios] use weakself to resolve toast still show while the page is popped


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

Branch: refs/heads/0.16-dev
Commit: e44104af2703557289601d496175fe207085
Parents: 317b99d
Author: acton393 
Authored: Thu Sep 14 18:46:14 2017 +0800
Committer: acton393 
Committed: Thu Sep 14 18:46:14 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e44104af/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m 
b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
index 0f8445a..d3c547c 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
@@ -215,7 +215,7 @@ static const CGFloat WXToastDefaultPadding = 30.0;
 
 [WXToastManager sharedManager].toastingView = toastView;
 [superView addSubview:toastView];
-
+__weak typeof(self) weakSelf = self;
 [UIView animateWithDuration:0.2 delay:duration 
options:UIViewAnimationOptionCurveEaseInOut animations:^{
 toastView.transform = CGAffineTransformConcat(toastView.transform, 
CGAffineTransformMakeScale(0.8, 0.8)) ;
 } completion:^(BOOL finished) {
@@ -230,7 +230,7 @@ static const CGFloat WXToastDefaultPadding = 30.0;
 [queue removeObjectAtIndex:0];
 if (queue.count > 0) {
 WXToastInfo *info = [queue firstObject];
-[self showToast:info.toastView superView:info.superView 
duration:info.duration];
+[weakSelf showToast:info.toastView 
superView:info.superView duration:info.duration];
 }
 }
 }];

[GitHub] incubator-weex pull request #698: * [ios] support multi roles for accessibil...

2017-09-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---

[GitHub] incubator-weex pull request #701: Fix typo on homepage

2017-09-14 Thread rubenoost

GitHub user rubenoost opened a pull request:

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

Fix typo on homepage



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

$ git pull https://github.com/rubenoost/incubator-weex patch-1

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

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


commit 54c7cd0aa467433dd1264b8aa0548a920bc56ccd
Author: Ruben Oost 
Date:   2017-09-14T12:31:50Z

Fix typo on homepage




---

[5/8] incubator-weex git commit: Revert "* [ios] clear toast queue when instance disappear"

2017-09-14 Thread acton393

Revert "* [ios] clear toast queue when instance disappear"

This reverts commit c8c73cd01fe94a2a0b5068808cc3776e6d6ecb00.


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

Branch: refs/heads/0.16-dev
Commit: 317b99d1aaf626eac618a5210a24614fbaff4caa
Parents: c8c73cd
Author: acton393 
Authored: Thu Sep 14 18:28:49 2017 +0800
Committer: acton393 
Committed: Thu Sep 14 18:28:49 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m| 4 +---
 ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h | 6 --
 ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m | 6 +-
 3 files changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/317b99d1/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m 
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 2a87df8..39645ca 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -45,7 +45,6 @@
 #import "WXTracingManager.h"
 #import "WXJSExceptionProtocol.h"
 #import "WXTracingManager.h"
-#import "WXModalUIModule.h"
 
 NSString *const bundleUrlOptionKey = @"bundleUrl";
 
@@ -379,8 +378,7 @@ typedef enum : NSUInteger {
 if(url.length > 0){
 [WXPrerenderManager addGlobalTask:url callback:nil];
 }
-NSMutableArray * toastQueue = [[WXToastManager sharedManager] 
valueForKey:@"toastQueue"];
-[toastQueue removeAllObjects];
+
 }
 
 - (void)forceGarbageCollection

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/317b99d1/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h 
b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
index c1af965..41582f2 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
@@ -23,9 +23,3 @@
 @interface WXModalUIModule : NSObject 
 
 @end
-
-@interface WXToastManager : NSObject
-
-+ (WXToastManager *)sharedManager;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/317b99d1/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m 
b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
index c597f71..0f8445a 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
@@ -43,9 +43,13 @@ typedef enum : NSUInteger {
 
 @end
 
-@interface WXToastManager()
+@interface WXToastManager : NSObject
+
 @property (strong, nonatomic) NSMutableArray *toastQueue;
 @property (strong, nonatomic) UIView *toastingView;
+
++ (WXToastManager *)sharedManager;
+
 @end
 
 @implementation WXToastManager

[GitHub] incubator-weex pull request #696: * [ios] clear toast queue when instance di...

2017-09-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---

[2/3] incubator-weex git commit: do not let same crash page reload again on short time

2017-09-14 Thread kyork

 do not let same crash page reload again on short time


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

Branch: refs/heads/0.16-dev
Commit: de67bd868673e52342a33605006a6a131d516edd
Parents: 595ded4
Author: å¾¡é 
Authored: Thu Sep 14 00:53:01 2017 +0800
Committer: yuhun-alibaba 
Committed: Thu Sep 14 12:19:03 2017 +0800

--
 .../java/com/taobao/weex/WXSDKInstance.java | 26 ++-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 27 +---
 .../com/taobao/weex/dom/action/Actions.java |  4 +--
 .../weex/dom/action/ReloadPageAction.java   |  6 +++--
 4 files changed, 43 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/de67bd86/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index d1bbd52..f354a25 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -606,21 +606,23 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
 return "";
   }
 
-  public void reloadPage() {
+  public void reloadPage(boolean reloadThis) {
+
 WXSDKEngine.reload();
 
-// å¯ä»¥åéå¹¿æåï¼
-if (mContext != null) {
-  Intent intent = new Intent();
-  intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
-  intent.putExtra("url", mBundleUrl);
-  mContext.sendBroadcast(intent);
+if (reloadThis) {
+  // å¯ä»¥åéå¹¿æåï¼
+  if (mContext != null)  {
+Intent intent = new Intent();
+intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
+intent.putExtra("url", mBundleUrl);
+mContext.sendBroadcast(intent);
+  }
+  // mRendered = false;
+  //destroy();
+  // renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
+  // refreshInstance("{}");
 }
-// mRendered = false;
-//destroy();
-// renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
-// refreshInstance("{}");
-
   }
   /**
* Refresh instance asynchronously.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/de67bd86/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 89b2d3b..3b11387 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -135,6 +135,9 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   private static final int CRASHREINIT = 50;
   private static int reInitCount = 1;
 
+  private static String crashUrl = null;
+  private static long lastCrashTime = 0;
+
 
   /**
* next tick tasks, can set priority
@@ -962,12 +965,15 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 WXLogUtils.e("[WXBridgeManager] callReportCrashReloadPage exception: 
", e);
   }
   try {
+
   if (WXSDKManager.getInstance().getSDKInstance(instanceId) != null) {
-  // JSONObject domObject = JSON.parseObject(tasks);
+  boolean reloadThisInstance = shouReloadCurrentInstance(
+  
WXSDKManager.getInstance().getSDKInstance(instanceId).getBundleUrl());
   WXDomModule domModule = getDomModule(instanceId);
-  Action action = Actions.getReloadPage(instanceId);
-  domModule.postAction((DOMAction)action, true);
+  Action action = Actions.getReloadPage(instanceId, 
reloadThisInstance);
+  domModule.postAction((DOMAction) action, true);
   }
+
   } catch (Exception e) {
   WXLogUtils.e("[WXBridgeManager] callReloadPage exception: ", e);
   commitJSBridgeAlarmMonitor(instanceId, 
WXErrorCode.WX_ERR_RELOAD_PAGE,"[WXBridgeManager] callReloadPage exception 
"+e.getCause());
@@ -975,6 +981,19 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   return IWXBridge.INSTANCE_RENDERING_ERROR;
   }
 
+  public boolean shouReloadCurrentInstance(String aUrl) {
+long time = System.currentTimeMillis();
+if (crashUrl == null ||
+

[1/3] incubator-weex git commit: fix exec js exception on android7.1.1 platform

2017-09-14 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev f95d20db1 -> 84b000d31


fix exec js exception on android7.1.1 platform


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

Branch: refs/heads/0.16-dev
Commit: 595ded47e5ffba84d0f9f3e74bd021d4859da758
Parents: 701c4b9
Author: yuhun-alibaba 
Authored: Wed Sep 13 17:13:07 2017 +0800
Committer: yuhun-alibaba 
Committed: Wed Sep 13 17:53:21 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 6754016 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/595ded47/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index d3fb7e7..b08a455 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/595ded47/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index c0236b6..13e5bc6 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[2/3] incubator-weex git commit: do not let same crash page reload again on short time

2017-09-14 Thread misakuo

 do not let same crash page reload again on short time


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

Branch: refs/heads/0.16-dev
Commit: e095a74117491273125b59380029915acc51eb3c
Parents: f5bc342
Author: å¾¡é 
Authored: Thu Sep 14 00:53:01 2017 +0800
Committer: misakuo 
Committed: Fri Sep 15 11:50:06 2017 +0800

--
 .../java/com/taobao/weex/WXSDKInstance.java | 26 ++-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 27 +---
 .../com/taobao/weex/dom/action/Actions.java |  4 +--
 .../weex/dom/action/ReloadPageAction.java   |  6 +++--
 4 files changed, 43 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e095a741/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 69fc649..537f43a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -614,21 +614,23 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
 return "";
   }
 
-  public void reloadPage() {
+  public void reloadPage(boolean reloadThis) {
+
 WXSDKEngine.reload();
 
-// å¯ä»¥åéå¹¿æåï¼
-if (mContext != null) {
-  Intent intent = new Intent();
-  intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
-  intent.putExtra("url", mBundleUrl);
-  mContext.sendBroadcast(intent);
+if (reloadThis) {
+  // å¯ä»¥åéå¹¿æåï¼
+  if (mContext != null)  {
+Intent intent = new Intent();
+intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
+intent.putExtra("url", mBundleUrl);
+mContext.sendBroadcast(intent);
+  }
+  // mRendered = false;
+  //destroy();
+  // renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
+  // refreshInstance("{}");
 }
-// mRendered = false;
-//destroy();
-// renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
-// refreshInstance("{}");
-
   }
   /**
* Refresh instance asynchronously.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e095a741/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 89b2d3b..3b11387 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -135,6 +135,9 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   private static final int CRASHREINIT = 50;
   private static int reInitCount = 1;
 
+  private static String crashUrl = null;
+  private static long lastCrashTime = 0;
+
 
   /**
* next tick tasks, can set priority
@@ -962,12 +965,15 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 WXLogUtils.e("[WXBridgeManager] callReportCrashReloadPage exception: 
", e);
   }
   try {
+
   if (WXSDKManager.getInstance().getSDKInstance(instanceId) != null) {
-  // JSONObject domObject = JSON.parseObject(tasks);
+  boolean reloadThisInstance = shouReloadCurrentInstance(
+  
WXSDKManager.getInstance().getSDKInstance(instanceId).getBundleUrl());
   WXDomModule domModule = getDomModule(instanceId);
-  Action action = Actions.getReloadPage(instanceId);
-  domModule.postAction((DOMAction)action, true);
+  Action action = Actions.getReloadPage(instanceId, 
reloadThisInstance);
+  domModule.postAction((DOMAction) action, true);
   }
+
   } catch (Exception e) {
   WXLogUtils.e("[WXBridgeManager] callReloadPage exception: ", e);
   commitJSBridgeAlarmMonitor(instanceId, 
WXErrorCode.WX_ERR_RELOAD_PAGE,"[WXBridgeManager] callReloadPage exception 
"+e.getCause());
@@ -975,6 +981,19 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   return IWXBridge.INSTANCE_RENDERING_ERROR;
   }
 
+  public boolean shouReloadCurrentInstance(String aUrl) {
+long time = System.currentTimeMillis();
+if (crashUrl == null ||
+

[1/3] incubator-weex git commit: * [android] fix java doc

2017-09-14 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 84b000d31 -> 55d7c3573


* [android] fix java doc


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

Branch: refs/heads/0.16-dev
Commit: f5bc3421fc2d09c6c7cce383f4a17a04069109c5
Parents: f95d20d
Author: misakuo 
Authored: Fri Sep 15 10:37:10 2017 +0800
Committer: misakuo 
Committed: Fri Sep 15 10:37:10 2017 +0800

--
 .../com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java   | 2 +-
 android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java   | 2 +-
 android/sdk/src/main/java/com/taobao/weex/utils/Trace.java   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5bc3421/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
 
b/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
index 6251399..0f742ae 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
@@ -20,7 +20,7 @@ package com.taobao.weex.appfram.websocket;
 
 /**
  * Created by moxun on 17/1/3.
- * @link {https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent}
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent;>CloseEvent
  */
 
 public enum WebSocketCloseCodes {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5bc3421/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
index ef2f0c9..7c53095 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex.util;
+package com.taobao.weex.utils;
 
 /**
  * Android OS version utilities.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5bc3421/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
index 7506804..cfe307e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
@@ -21,8 +21,6 @@ package com.taobao.weex.utils;
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import com.taobao.weex.util.OsVersion;
-
 /**
  * Hepler class for systrace.
  *
@@ -82,7 +80,7 @@ public class Trace {
 
   /**
* Writes a trace message to indicate that a given section of code has ended.
-   * This call must be preceeded by a corresponding call to {@link 
#beginSection()}
+   * This call must be preceeded by a corresponding call to {@link 
#beginSection(String)}
* on the same thread.
*/
   public static void endSection() {

[3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-dev

2017-09-14 Thread misakuo

Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-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/55d7c357
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/55d7c357
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/55d7c357

Branch: refs/heads/0.16-dev
Commit: 55d7c3573de06fed6ed46a3e1f2a934016478dd2
Parents: e095a74 84b000d
Author: misakuo 
Authored: Fri Sep 15 11:50:39 2017 +0800
Committer: misakuo 
Committed: Fri Sep 15 11:50:39 2017 +0800

--

--

[GitHub] incubator-weex pull request #704: * [android] fix java doc

2017-09-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---

[GitHub] incubator-weex pull request #703: * [doc] bug fix setup about @notdanger

2017-09-14 Thread gurisxie

GitHub user gurisxie opened a pull request:

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

* [doc] bug fix setup about @notdanger

Update about chinese and english docï¼
1ãbugfix `npm run dev` not worked;
2ãupdate all use `npm run dev` to `sh ./start`

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

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

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

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


commit 5cffb4e5c52bffc30c24a461ccf76a2546030635
Author: gurisxie <279483...@qq.com>
Date:   2017-09-15T02:50:30Z

* [doc] bug fix setup about




---

[1/2] incubator-weex git commit: * [doc] bug fix setup about

2017-09-14 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/dev d16ba8d88 -> bdd6f1b5b


* [doc] bug fix setup about


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

Branch: refs/heads/dev
Commit: 5cffb4e5c52bffc30c24a461ccf76a2546030635
Parents: b13b428
Author: gurisxie <279483...@qq.com>
Authored: Fri Sep 15 10:50:30 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Fri Sep 15 10:50:30 2017 +0800

--
 doc/source/cn/guide/set-up-env.md| 2 +-
 doc/source/cn/guide/tools/toolkit.md | 2 +-
 doc/source/guide/set-up-env.md   | 2 +-
 doc/source/guide/tools/toolkit.md| 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/cn/guide/set-up-env.md
--
diff --git a/doc/source/cn/guide/set-up-env.md 
b/doc/source/cn/guide/set-up-env.md
index 139e155..30b77d6 100644
--- a/doc/source/cn/guide/set-up-env.md
+++ b/doc/source/cn/guide/set-up-env.md
@@ -90,7 +90,7 @@ $ weex init awesome-project
 - `serve`: å¼å¯éææå¡å¨
 - `debug`: è°è¯æ¨¡å¼
 
-æä»¬åéè¿ `npm install` å®è£é¡¹ç®ä¾èµãä¹åè¿è¡ `npm run dev` 
å `npm run serve` å¼å¯watch æ¨¡å¼åéææå¡å¨ã
+æä»¬åéè¿ `npm install` å®è£é¡¹ç®ä¾èµãä¹åè¿è¡æ ¹ç®å½ä¸ç 
`sh ./start` å¼å¯  watch æ¨¡å¼åéææå¡å¨ã
 
 ç¶åæä»¬æå¼æµè§å¨ï¼è¿å¥ `http://localhost:8080/index.html` 
å³å¯çå° weex h5 é¡µé¢ã 
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/cn/guide/tools/toolkit.md
--
diff --git a/doc/source/cn/guide/tools/toolkit.md 
b/doc/source/cn/guide/tools/toolkit.md
index 90bfe13..de72f75 100644
--- a/doc/source/cn/guide/tools/toolkit.md
+++ b/doc/source/cn/guide/tools/toolkit.md
@@ -53,7 +53,7 @@ $ weex init awesome-project
 - `serve`: å¼å¯éææå¡å¨
 - `debug`: è°è¯æ¨¡å¼
 
-æä»¬åéè¿ `npm install` å®è£é¡¹ç®ä¾èµãä¹åè¿è¡ `npm run dev` 
å `npm run serve` å¼å¯ `watch` æ¨¡å¼åéææå¡å¨ã
+æä»¬åéè¿ `npm install` å®è£é¡¹ç®ä¾èµãä¹åè¿è¡æ ¹ç®å½ä¸ç 
`sh ./start` å¼å¯ watch æ¨¡å¼åéææå¡å¨ã
 
 ç¶åæä»¬æå¼æµè§å¨ï¼è¿å¥ `http://localhost:8080/index.html` 
å³å¯çå° Weex h5 é¡µé¢ã
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/guide/set-up-env.md
--
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 702c347..b734d08 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -57,7 +57,7 @@ We enter the awesome-project folder and install dependencies 
with the following
 npm install
 ```
 
-Then we run `npm run dev` and `npm run serve` to start watch mode and static 
server.
+Then we run `sh ./start` in root directory to start watch mode and static 
server.
 
 Finally, we can see the Weex page in `http://localhost:8080/index.html`.
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/guide/tools/toolkit.md
--
diff --git a/doc/source/guide/tools/toolkit.md 
b/doc/source/guide/tools/toolkit.md
index 2e19b2d..ff088cb 100644
--- a/doc/source/guide/tools/toolkit.md
+++ b/doc/source/guide/tools/toolkit.md
@@ -37,10 +37,9 @@ There are some useful npm scripts you will use in the future:
 - `serve`: start a web server
 - `debug`: open the debug mode
 
-When all dependences are ready, you can input `npm run dev` and run `npm run 
server` in a command line tab. Now you can visit our web page in :
-
-http://localhost:8080/index.html
+Then we run `sh ./start` in root directory to start watch mode and static 
server. 
 
+Finally, we can see the Weex page in `http://localhost:8080/index.html`.
 
 ### preview Weex page in time

[GitHub] incubator-weex pull request #704: * [android] fix java doc

2017-09-14 Thread misakuo

GitHub user misakuo opened a pull request:

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

* [android] fix java doc

Fix java doc

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

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

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

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


commit f5bc3421fc2d09c6c7cce383f4a17a04069109c5
Author: misakuo 
Date:   2017-09-15T02:37:10Z

* [android] fix java doc




---

[1/2] incubator-weex-site git commit: Site updated: 2017-09-15 12:00:06

2017-09-14 Thread sospartan

Repository: incubator-weex-site
Updated Branches:
  refs/heads/asf-site 6a626c7bf -> 7f9635ca4


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/7f9635ca/content/content.json
--
diff --git a/content/content.json b/content/content.json
index bf572cb..71f4052 100644
--- a/content/content.json
+++ b/content/content.json
@@ -1 +1 @@
-{"meta":{"title":"Weex","subtitle":null,"description":"A framework for 
building Mobile cross-platform UIs. Different from a \"web app\", \"HTML5 
app\", or \"hybrid app\", you can use Weex to build a real mobile app. The code 
that you write is relatively simple, because you can build native applications 
just using HTML, CSS, Javascript. But underneath, the core of the application 
is Objective-C or Java. At the same time, Weex will provide a lot of native 
components or modules for developers to 
use.","author":"Jinjiang","url":"https://weex.apache.org"},"pages":[{"title":"Release
 
Note","path":"releasenote.html","permalink":"https://weex.apache.org/releasenote.html","text":"Release
 Notev0.10.0 New Feature Support Vue.jsThe Vue.js 2.1.8 (runtime-only build) is 
in WeexSDK now. You can use Vue.js to build native app by WeexSDK 0.10.0.We 
reused the original native render engine and developed a new renderer 
(weex-vue-render) for the web platform, which is based on Vue 2.0.The former 
front-en
 d framework (commonly known as .we), which is inspired by Vue 1.0, is 
deprecated. Although it still works well in this release, we suggest to migrate 
it to Vue 2.0. SDK New CSS support text font-weightfont-weight can set to 
[normal|bold] or 100-900. gradientlike CSS3, now you can use gradient in Weex. 
For example: background-image: linear-gradient(to right, blue, white); Read 
more about gradient. Pseudo classCurrently, Weex supports 4 pseudo 
classes:active, focus, disabled, enabled. New BroadcastChannel APIDevelopers 
can use BroadcastChannel API to implement inter-instance communication. const 
Stack = new BroadcastChannel('Avengers')Stack.onmessage = function (event) 
 console.log(event.data) // in this case, it's \"Hulk Smash !!!\"// 
in another instanceconst Hulk = new 
BroadcastChannel('Avengers')Hulk.postMessage(\"Hulk Smash !!!\") Imageâs 
onload event add naturalHeight and naturalWidthimage to get the original size 
of image file. Websocket SupportWebSockets is an adv
 anced technology that makes it possible to open an interactive communication 
session between the userâs h5/iOS/android and a server. With this API, you 
can send messages to a server and receive event-driven responses without having 
to poll the server for a reply.Read more about Weexâs websocket. Support 
synchronous method callBoth module and component method can defined synchronous 
method exposed to JS runtime now. Means native will invoke these method in JS 
thread directly. Support viewport configurationSimilar to W3C specification, 
Weex support set define viewport in script tag: script type=\"config\" 
 \"viewport\":  \"width\": \"device-width\"  
/script Tools Devtools Support Vue 2.0 debugging. Add network 
switch for network inspector. Make application capable to decide which bundle 
is âun-debuggableâ, which means pageâs source code is unreadable in debug 
mode. Weexpack Has full set of commands for developers to setup android/ios a
 pplication with his .we/.vue files. Developers could easily pack/install his 
application with simple command. Has full set of commands for developers to 
manage weex plugins, including create plugin template, add plugin to his 
project etc. Plugin market was formally used for developers to publish/download 
weex plugins. Bugfix * [android] add fixed size property 5191241 * [android] 
bug fix NPE  cache ScreenWidth and ScreenHeight 950e843 * [android] 
bugfix duplicate destroy 25412e0 * [android] bugfix keyboard force hide (#106) 
0ad2f95 * [android] bugfix scroller offset transform twice cd7ad66 * [android] 
change gradle to fix build 1feaadf * [android] ClipPath doesnât work when the 
following conditions met 1. rotation or scale is used 2. API level is 24 As 
border-radius uses clipPath, this will cause views with border-radius using 
rotation or scale on API level 24 doesnât. So far, this is a bug of Android 
N,https://code.google.com/p/android/issues/detail?id=225556sort
 =-idcolspec=ID f69e918 * [android] Fix bug of border width due to 
viewport. Refer 
https://github.com/sospartan/weex/commit/7cfe9752e0c95f3b23bedfa3f51ba3bafb4318f4#diff-42908d45812780fec8606537dffab67dL1054
 9cd6800 * [android] fix cast exception 3136fcf * [android] fix DCL thread 
safely (#48) 62e9b71 * [android] fix duplicate add component child to list 
3fd73d7 * [android] fix find component 45643ab * [android] fix getScreenWidth 
with context parameter (#80) 16377f2 * [android] fix inefficient use of keySet 
iterator instead of entrySet iterator (#47) dac80e2 * [android] fix 
intrinsicSize

[GitHub] incubator-weex pull request #697: fix exec js exception on android7.1.1 plat...

2017-09-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---

[3/3] incubator-weex git commit: Merge branch '0.16-dev-debug' of https://github.com/yuhun-alibaba/incubator-weex into 0.16-dev

2017-09-14 Thread kyork

Merge branch '0.16-dev-debug' of 
https://github.com/yuhun-alibaba/incubator-weex 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/84b000d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/84b000d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/84b000d3

Branch: refs/heads/0.16-dev
Commit: 84b000d31750d5d86e95b0482ca717aa245e7aac
Parents: f95d20d de67bd8
Author: YorkShen 
Authored: Fri Sep 15 10:49:51 2017 +0800
Committer: YorkShen 
Committed: Fri Sep 15 10:49:51 2017 +0800

--
 .../java/com/taobao/weex/WXSDKInstance.java | 26 ++-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 27 +---
 .../com/taobao/weex/dom/action/Actions.java |  4 +--
 .../weex/dom/action/ReloadPageAction.java   |  6 +++--
 4 files changed, 43 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/84b000d3/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--

[2/2] incubator-weex-site git commit: Site updated: 2017-09-15 12:00:06

2017-09-14 Thread sospartan

Site updated: 2017-09-15 12:00:06


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

Branch: refs/heads/asf-site
Commit: 7f9635ca42bdbfe3bb92f81e22b2c13eb76301b6
Parents: 6a626c7
Author: minijenkins 
Authored: Fri Sep 15 12:00:07 2017 +0800
Committer: minijenkins 
Committed: Fri Sep 15 12:00:07 2017 +0800

--
 content/content.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[GitHub] incubator-weex issue #704: * [android] fix java doc

2017-09-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

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

  





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




---

[GitHub] incubator-weex pull request #703: * [doc] bug fix setup about @notdanger

2017-09-14 Thread gurisxie

GitHub user gurisxie reopened a pull request:

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

* [doc] bug fix setup about @notdanger

Update about chinese and english docï¼
1ãbugfix `npm run dev` not worked;
2ãupdate all use `npm run dev` to `sh ./start`

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

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

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

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


commit 5cffb4e5c52bffc30c24a461ccf76a2546030635
Author: gurisxie <279483...@qq.com>
Date:   2017-09-15T02:50:30Z

* [doc] bug fix setup about

commit bdd6f1b5b6a0dc1c2fbd12335b801f687149d29c
Author: gurisxie <279483...@qq.com>
Date:   2017-09-15T02:55:24Z

Merge commit 'd16ba8d888e07d285e3f523ed4010c934b1a4c48' into dev

Conflicts:
doc/source/guide/set-up-env.md




---

[GitHub] incubator-weex pull request #703: * [doc] bug fix setup about @notdanger

2017-09-14 Thread gurisxie

Github user gurisxie closed the pull request at:

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


---

[GitHub] incubator-weex issue #703: * [doc] bug fix setup about @notdanger

2017-09-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  According to the blame info, we recommended @JackPu , @DoranYun 
to be the reviewers.

  




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




---

[GitHub] incubator-weex pull request #705: * [android] gradle update to version 3.3 a...

2017-09-14 Thread atomtong

GitHub user atomtong opened a pull request:

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

* [android] gradle update to version 3.3 and fix javadoc issues

* [android] gradle update to version 3.3 and fix javadoc issues

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

$ git pull https://github.com/atomtong/incubator-weex 
android-feature-gradle-update-release

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

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


commit ecc2166e45a235f3c78eba552c9a3f0651c106fc
Author: atomtong 
Date:   2017-09-15T04:07:27Z

* [android] gradle update to version 3.3 and fix javadoc issues




---

[GitHub] incubator-weex issue #705: * [android] gradle update to version 3.3 and fix ...

2017-09-14 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

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

  





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




---

[2/2] incubator-weex git commit: Merge commit 'd16ba8d888e07d285e3f523ed4010c934b1a4c48' into dev

2017-09-14 Thread kyork

Merge commit 'd16ba8d888e07d285e3f523ed4010c934b1a4c48' into dev

Conflicts:
doc/source/guide/set-up-env.md


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

Branch: refs/heads/dev
Commit: bdd6f1b5b6a0dc1c2fbd12335b801f687149d29c
Parents: 5cffb4e d16ba8d
Author: gurisxie <279483...@qq.com>
Authored: Fri Sep 15 10:55:24 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Fri Sep 15 10:55:24 2017 +0800

--
 .flowconfig |   1 +
 .gitignore  |   4 +
 .travis.yml |  91 ++-
 Dangerfile-ios  |   1 +
 HOW-TO-BUILD.md |  80 +++
 LICENSE |  22 +-
 POSSIBLE-NOTICES-FOR-BIN-DIST   |   3 +
 README.md   |  53 +-
 README_RELEASE.md   |  69 --
 RUN-RAT.md  |  12 +
 WeexSDK.podspec |   6 +-
 android/build.gradle|   7 +-
 android/commons/build.gradle|   1 +
 .../adapter/DefaultWebSocketAdapter.java|  54 +-
 .../weex/commons/util/RequestIdGenerator.java   |  15 +
 .../weex/commons/util/WSEventReporter.java  | 192 ++
 .../gradle/wrapper/gradle-wrapper.properties|   4 +-
 android/playground/app/build.gradle |   4 +-
 .../java/com/alibaba/weex/WXApplication.java|   4 +
 .../java/com/alibaba/weex/WXPageActivity.java   |   3 +-
 .../extend/adapter/InterceptWXHttpAdapter.java  |  57 +-
 .../weex/extend/component/WXParallax.java   | 345 ++
 .../weex/extend/module/WXEventModule.java   |  23 +-
 android/run-ci.sh   |   4 -
 android/sdk/assets/main.js  |   8 -
 android/sdk/build.gradle|  27 +-
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 7558100 -> 7570504 bytes
 android/sdk/libs/x86/libweexjsc.so  | Bin 4545544 -> 12121924 bytes
 .../java/com/taobao/weex/ComponentObserver.java |  50 ++
 .../com/taobao/weex/LayoutFinishListener.java   |  26 +
 .../java/com/taobao/weex/WXEnvironment.java |   5 +
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   6 +
 .../java/com/taobao/weex/WXSDKInstance.java | 102 ++-
 .../main/java/com/taobao/weex/WXSDKManager.java |  15 +-
 .../taobao/weex/adapter/ICrashInfoReporter.java |  27 +
 .../taobao/weex/adapter/IDrawableLoader.java|   3 +-
 .../weex/adapter/IWXUserTrackAdapter.java   |   2 +-
 .../java/com/taobao/weex/bridge/WXBridge.java   | 299 +++-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 425 +++-
 .../com/taobao/weex/bridge/WXModuleManager.java |  44 +-
 .../java/com/taobao/weex/common/Constants.java  |   2 +
 .../weex/common/ICheckBindingScroller.java  |  27 +
 .../java/com/taobao/weex/common/IWXBridge.java  |  21 +
 .../java/com/taobao/weex/common/WXConfig.java   |   1 +
 .../com/taobao/weex/common/WXImageStrategy.java |   9 +-
 .../com/taobao/weex/common/WXPerformance.java   |   9 +-
 .../taobao/weex/dom/DOMActionContextImpl.java   |  15 +-
 .../com/taobao/weex/dom/TextDecorationSpan.java |  55 ++
 .../main/java/com/taobao/weex/dom/WXAttr.java   |  38 +-
 .../java/com/taobao/weex/dom/WXDomHandler.java  |   4 +
 .../java/com/taobao/weex/dom/WXDomManager.java  |  19 +
 .../java/com/taobao/weex/dom/WXDomModule.java   |   2 +-
 .../com/taobao/weex/dom/WXImageQuality.java |   4 +-
 .../taobao/weex/dom/WXRecyclerDomObject.java|   4 +
 .../main/java/com/taobao/weex/dom/WXStyle.java  |  32 +-
 .../com/taobao/weex/dom/WXSwitchDomObject.java  |  29 +-
 .../com/taobao/weex/dom/WXTextDomObject.java|  15 +-
 .../com/taobao/weex/dom/action/Actions.java |  74 +-
 .../taobao/weex/dom/action/AnimationAction.java |  40 +-
 .../weex/dom/action/CreateFinishAction.java |  20 +
 .../weex/dom/action/ExecutableRenderAction.java |  48 ++
 .../weex/dom/action/ModuleInvocationAction.java |  68 ++
 .../weex/dom/action/UpdateStyleAction.java  |   4 +-
 .../taobao/weex/ui/IExternalModuleGetter.java   |  30 +
 .../taobao/weex/ui/IExternalMoudleGetter.java   |  29 -
 .../ui/animation/DimensionUpdateListener.java   |  74 --
 .../weex/ui/animation/HeightProperty.java   |  35 +
 .../weex/ui/animation/LayoutParamsProperty.java |  64 ++
 .../weex/ui/animation/WXAnimationBean.java  |  73 +-
 .../taobao/weex/ui/animation/WidthProperty.java |  35 +
 .../ui/component/AbstractEditComponent.java |  47 +-
 .../com/taobao/weex/ui/component/Textarea.java  |   6 +

[GitHub] incubator-weex pull request #703: * [doc] bug fix setup about @notdanger

2017-09-14 Thread asfgit

Github user asfgit closed the pull request at:

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


---

[1/8] incubator-weex git commit: * [ios] support more role

2017-09-14 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev c0035091b -> f95d20db1


* [ios] support more role


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

Branch: refs/heads/0.16-dev
Commit: 16fb0d95645fc3e08cf5a0af66c6da75b4e28433
Parents: ef63a4d
Author: acton393 
Authored: Tue Sep 12 23:48:08 2017 +0800
Committer: acton393 
Committed: Tue Sep 12 23:48:08 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/16fb0d95/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 c001690..959631a 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
@@ -806,7 +806,7 @@ WX_NUMBER_CONVERT(NSUInteger, unsignedIntegerValue)
 if (![value isKindOfClass:[NSString class]]) {
 return accessibilityTrait;
 }
-NSString * role = [value lowercaseString];
+NSString * role = value;
 if ([role isEqualToString:@"button"]) {
 accessibilityTrait = UIAccessibilityTraitButton;
 } else if ([role isEqualToString:@"link"]) {
@@ -821,6 +821,28 @@ WX_NUMBER_CONVERT(NSUInteger, unsignedIntegerValue)
 accessibilityTrait = UIAccessibilityTraitTabBar;
 }
 #endif
+} else if ([role isEqualToString:@"frequentUpdates"]) {
+accessibilityTrait = UIAccessibilityTraitUpdatesFrequently;
+} else if ([role isEqualToString:@"startsMedia"]) {
+accessibilityTrait = UIAccessibilityTraitStartsMediaSession;
+} else if ([role isEqualToString:@"allowsDirectInteraction"]) {
+accessibilityTrait = UIAccessibilityTraitAllowsDirectInteraction;
+} else if ([role isEqualToString:@"summary"]) {
+accessibilityTrait = UIAccessibilityTraitSummaryElement;
+} else if ([role isEqualToString:@"header"]) {
+accessibilityTrait = UIAccessibilityTraitHeader;
+} else if ([role isEqualToString:@"keyboardKey"]) {
+accessibilityTrait = UIAccessibilityTraitKeyboardKey;
+} else if ([role isEqualToString:@"disabled"]) {
+accessibilityTrait = UIAccessibilityTraitNotEnabled;
+} else if ([role isEqualToString:@"playSound"]) {
+accessibilityTrait = UIAccessibilityTraitPlaysSound;
+} else if ([role isEqualToString:@"selected"]) {
+accessibilityTrait = UIAccessibilityTraitSelected;
+} else if ([role isEqualToString:@"pageTurn"]) {
+accessibilityTrait = UIAccessibilityTraitCausesPageTurn;
+} else if ([role isEqualToString:@"text"]) {
+accessibilityTrait = UIAccessibilityTraitStaticText;
 }
 
 return accessibilityTrait;

[3/8] incubator-weex git commit: * [ios] update roles

2017-09-14 Thread acton393

* [ios] update roles


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

Branch: refs/heads/0.16-dev
Commit: 72e80f92b0d92169298278b0d8de16a1e996e191
Parents: 70d421b
Author: acton393 
Authored: Tue Sep 12 23:54:24 2017 +0800
Committer: acton393 
Committed: Tue Sep 12 23:54:24 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/72e80f92/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 df61f6f..0316321 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -64,7 +64,7 @@
 /**
  * accessibility support
  */
-NSString * _role; //accessibility
+NSString * _roles; //accessibility
 NSString * _ariaLabel; //accessibilityLabel
 NSString * _ariaHidden; // accessibilityElementsHidden
 NSString * _accessible; // accessible

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/72e80f92/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 254a128..7dd7750 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -113,7 +113,7 @@
 _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];
 }
 if (attributes[@"role"]) {
-_role = attributes[@"role"];
+_roles = attributes[@"role"];
 }
 if (attributes[@"ariaLabel"]) {
 _ariaLabel = [WXConvert NSString:attributes[@"ariaLabel"]];
@@ -140,7 +140,7 @@
 return self;
 }
 
-- 
(UIAccessibilityTraits)_parseAccessibilityTraitsWithTraits:(UIAccessibilityTraits)trait
 role:(NSString*)roleStr
+- 
(UIAccessibilityTraits)_parseAccessibilityTraitsWithTraits:(UIAccessibilityTraits)trait
 roles:(NSString*)roleStr
 {
 UIAccessibilityTraits newTrait = trait;
 for (NSString * role in [roleStr componentsSeparatedByString:@" "]) {
@@ -268,8 +268,8 @@
 _view.wx_ref = self.ref;
 _layer.wx_component = self;
 
-if (_role) {
-[_view setAccessibilityTraits:[self 
_parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits role:_role]];
+if (_roles) {
+[_view setAccessibilityTraits:[self 
_parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits 
roles:_roles]];
 }
 
 if (_testId) {
@@ -621,8 +621,8 @@
 {
 WX_CHECK_COMPONENT_TYPE(self.componentType)
 if (attributes[@"role"]){
-_role = attributes[@"role"];
-[self.view setAccessibilityTraits:[self 
_parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits role:_role]];
+_roles = attributes[@"role"];
+[self.view setAccessibilityTraits:[self 
_parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits 
roles:_roles]];
 }
 if (attributes[@"ariaHidden"]) {
 _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];

[GitHub] incubator-weex pull request #697: fix exec js exception on android7.1.1 plat...

2017-09-14 Thread yuhun-alibaba

GitHub user yuhun-alibaba reopened a pull request:

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

fix exec js exception on android7.1.1 platform


fix exec js exception (new Date("2018/12/12")) on android7.1.1 platform
add crash log collect

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

$ git pull https://github.com/yuhun-alibaba/incubator-weex 0.16-dev-debug

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

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


commit 595ded47e5ffba84d0f9f3e74bd021d4859da758
Author: yuhun-alibaba 
Date:   2017-09-13T09:13:07Z

fix exec js exception on android7.1.1 platform

commit de67bd868673e52342a33605006a6a131d516edd
Author: å¾¡é 
Date:   2017-09-13T16:53:01Z

 do not let same crash page reload again on short time




---

[GitHub] incubator-weex pull request #697: fix exec js exception on android7.1.1 plat...

2017-09-14 Thread yuhun-alibaba

Github user yuhun-alibaba closed the pull request at:

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


---

45 matches

Mail list logo