[GitHub] incubator-weex issue #361: + [ios] fix bug:IndicatorView will hide when show...

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

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

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 56.409 (56.478) seconds

  



  Generated by :no_entry_sign: http://danger.systems/";>danger




---
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 #360: +[ios]fix bug:IndicatorView will hide when show a...

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

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

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 49.156 (49.269) seconds

  



  Generated by :no_entry_sign: http://danger.systems/";>danger




---
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 #361: + [ios] fix bug:IndicatorView will hide when show...

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

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





  

  
  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 #361: + [ios] fix bug:IndicatorView will hide wh...

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

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

+ [ios] fix bug:IndicatorView will hide when show again

+ [ios] fix bug:IndicatorView will hide when show again

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

$ git pull https://github.com/kfeagle/incubator-weex 
ios-bugfix-slider-0.13-dev-1

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

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


commit ff77442a658b953b6c966967e2a36fec273b8256
Author: 齐山 
Date:   2017-05-18T05:22:08Z

+ [ios] fix bug:IndicatorView will hide when show again




---
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 #360: +[ios]fix bug:IndicatorView will hide when...

2017-05-17 Thread kfeagle
Github user kfeagle closed the pull request at:

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


---
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 #360: +[ios]fix bug:IndicatorView will hide when show a...

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

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





  

  
  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 #360: +[ios]fix bug:IndicatorView will hide when...

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

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

+[ios]fix bug:IndicatorView will hide when show again

+[ios]fix bug:IndicatorView will hide when show again

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

$ git pull https://github.com/kfeagle/incubator-weex 
ios-bugfix-slider-noIndicator-0.13-dev

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

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


commit 7a676ef1e03e2e6e52a62a2a59292461587e7d86
Author: sospartan 
Date:   2017-05-17T03:40:58Z

* [android] fix NPE in sticky header

commit 38d375f13c3d2e0b64a157d0748ed1d92eaa269c
Author: zshshr 
Date:   2017-05-17T03:59:33Z

* [android] force set pageName param

commit 89152a36e381fc18d5de98cffc56d2250f62091a
Author: zshshr 
Date:   2017-05-17T03:59:49Z

Merge branch '0.13-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.13-dev

* '0.13-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex: (26 
commits)
  * [android] fix NPE in sticky header
  * [ios] fix nsurl to nsstring value
  * [ios] update iconfont demo for vue version
  * [ios] update iconfont for vue
  * [ios] add iconfont to for index
  * [ios] update iconfont case
  * [ios] use resource handler download iconfont
  * [ios] add config settings for WeexDemo
  + [ios] update wxprerendermanager
  + [ios] update wxprerendermanager.h
  * [test] update gitignore in screenshot
  * [test] update screenshot
  + [ios] add comment for function and move prerender module
  + [ios] update config
  + [ios] format (
  + [ios] update weexsdk compile error
  + [ios] change to class method
  * [test] Update border case for android.
  + [ios] update pretender manager
  + [ios] update pretender
  ...

commit 5038dac73ccf85ae6c746a997e98d0c0b7cfb935
Author: 齐山 
Date:   2017-05-18T05:18:48Z

Merge branch '0.13-dev' of https://github.com/apache/incubator-weex into 
0.13-dev




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


[GitHub] incubator-weex pull request #359: * [android] Fix mixing background-color an...

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

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


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


[2/2] incubator-weex git commit: Merge branch 'android-bugfix-background-image' of github.com:YorkShen/incubator-weex into 0.13-dev

2017-05-17 Thread sospartan
Merge branch 'android-bugfix-background-image' of 
github.com:YorkShen/incubator-weex into 0.13-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/3aa2847b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3aa2847b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3aa2847b

Branch: refs/heads/0.13-dev
Commit: 3aa2847b1250fb7e65e04afdb7fa6957031d0a49
Parents: 54d077d f5e80a4
Author: sospartan 
Authored: Thu May 18 12:10:45 2017 +0800
Committer: sospartan 
Committed: Thu May 18 12:10:45 2017 +0800

--
 .../main/java/com/taobao/weex/ui/view/border/BorderDrawable.java   | 2 ++
 1 file changed, 2 insertions(+)
--




[1/2] incubator-weex git commit: * [android] Fix mixing background-color and border-color(rgba) When combining border-color(rgba) and background-image together, the alpha in border-color also has an u

2017-05-17 Thread sospartan
Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 54d077d41 -> 3aa2847b1


* [android] Fix mixing background-color and border-color(rgba)
When combining border-color(rgba) and background-image together, the alpha in 
border-color also has an unexpected influence on background-image due to border 
and background-image share the same paint.
Refer http://dotwe.org/vue/d97477731dd85fedb3970fb106953fb9 to see a demo


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

Branch: refs/heads/0.13-dev
Commit: f5e80a464f7db962dee7b03d0ff2f45590e9d300
Parents: 62d1d3f
Author: YorkShen 
Authored: Thu May 18 11:35:48 2017 +0800
Committer: YorkShen 
Committed: Thu May 18 11:35:48 2017 +0800

--
 .../main/java/com/taobao/weex/ui/view/border/BorderDrawable.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5e80a46/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
index 42d518a..71d538b 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
@@ -104,6 +104,8 @@ public class BorderDrawable extends Drawable {
   public void draw(@NonNull Canvas canvas) {
 canvas.save();
 updateBorderOutline();
+//Shader uses alpha as well.
+mPaint.setAlpha(255);
 if (mPathForBorderOutline != null) {
   int useColor = WXViewUtils.multiplyColorAlpha(mColor, mAlpha);
   if (mShader != null) {



incubator-weex git commit: * [test] fix textcase with new version of macaca

2017-05-17 Thread sospartan
Repository: incubator-weex
Updated Branches:
  refs/heads/dev 41c14455a -> 230ddb729


* [test] fix textcase with new version of macaca


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

Branch: refs/heads/dev
Commit: 230ddb729f9e0cd0936e27cc2d1752f824d815a5
Parents: 41c1445
Author: sospartan 
Authored: Thu May 18 12:09:36 2017 +0800
Committer: sospartan 
Committed: Thu May 18 12:09:50 2017 +0800

--
 test/scripts/components/scroll-event.test.js| 27 +--
 test/scripts/components/scroller-fixed.test.js  |  5 +---
 test/scripts/components/text.test.js| 24 ++---
 .../components/textarea-maxlength.test.js   |  2 +-
 test/scripts/util.js| 28 ++--
 5 files changed, 42 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/230ddb72/test/scripts/components/scroll-event.test.js
--
diff --git a/test/scripts/components/scroll-event.test.js 
b/test/scripts/components/scroll-event.test.js
index 1ad1cdb..5df6f75 100644
--- a/test/scripts/components/scroll-event.test.js
+++ b/test/scripts/components/scroll-event.test.js
@@ -42,22 +42,8 @@ describe('list scroll event', function () {
 
   it('#1 Drag list', () => {
 return driver
-.touch('drag', {
-fromX: 200,
-fromY: 500,
-toX: 200,
-toY: 200,
-duration: 0.5
-})
-.sleep(2000)
-.touch('drag', {
-  fromX:200, 
-  fromY:600, 
-  toX:100, 
-  toY:200,
-  duration: 0.5
-})
-.sleep(2000)
+.dragUp(200)
+.dragUp(200)
 .elementById('status')
 .text()
 .then((text)=>{
@@ -78,20 +64,19 @@ describe('scroller scroll event', function () {
   });
 
   after(function () {
-  return util.quit(driver)
+  // return util.quit(driver)
   })
 
 
   it('#1 Drag scroller', () => {
 return driver
-.touch('drag', {fromX:200, fromY:500, toX:200, toY: 200})
-.sleep(2000)
-.touch('drag', {fromX:200, fromY:500, toX:100, toY:200})
-.sleep(2000)
+.dragUp(200)
+.dragUp(200)
 .elementById('status')
 .text()
 .then((text)=>{
   var y = Math.abs(parseInt(text))
+  console.log(`y=${y}`)
   assert.equal(y > 200,true)
 })
   })

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/230ddb72/test/scripts/components/scroller-fixed.test.js
--
diff --git a/test/scripts/components/scroller-fixed.test.js 
b/test/scripts/components/scroller-fixed.test.js
index 7add2a5..3902be3 100644
--- a/test/scripts/components/scroller-fixed.test.js
+++ b/test/scripts/components/scroller-fixed.test.js
@@ -42,10 +42,7 @@ describe('scroller fixed position item ', function () {
 
   it('#1 position:fixed items', () => {
 return driver
-.touch('drag', {fromX:200, fromY:500, toX:200, toY: 400})
-.sleep(2000)
-.touch('drag', {fromX:200, fromY:400, toX:200, toY: 500})
-.sleep(2000)
+.dragUpAndDown()
 .elementByXPath('//scroller[1]/div[1]/text[1]')
 .text()
 .then((text)=>{

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/230ddb72/test/scripts/components/text.test.js
--
diff --git a/test/scripts/components/text.test.js 
b/test/scripts/components/text.test.js
index 0c867cf..23028b2 100644
--- a/test/scripts/components/text.test.js
+++ b/test/scripts/components/text.test.js
@@ -49,7 +49,7 @@ describe('weex text @ignore-ios', function () {
   .then(rect => {
 assert.equal(rect.width, screenWidth)
 assert.closeTo(rect.height, 32 * scaleFactor * 2, 2)
-scroll(rect.height)
+return driver.dragUp(rect.height)
   })
   })
 
@@ -60,7 +60,7 @@ describe('weex text @ignore-ios', function () {
   .then(rect => {
 assert.equal(rect.width, screenWidth)
 assert.isAtLeast(rect.height, Math.floor(2 * 48 * scaleFactor))
-scroll(rect.height)
+return driver.dragUp(rect.height)
   })
   })
 
@@ -71,7 +71,7 @@ describe('weex text @ignore-ios', function () {
   .then(rect => {
 assert.equal(rect.width, Math.floor(300 * scaleFactor))
 assert.equal(rect.height, Math.floor(100 * scaleFactor))
-scroll(rect.height)
+return driver.dragUp(rect.height)
   })
   })
 
@@ -82,7 +82,7 @@ describe('weex text @ignore-ios', function () {
   .then(rect => {
 assert.equal(rect.width, Math.floor(500 * scaleFactor))
 asse

[GitHub] incubator-weex issue #359: * [android] Fix mixing background-color and borde...

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

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

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 40.918 (40.972) seconds

  



  Generated by :no_entry_sign: http://danger.systems/";>danger




---
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/2] incubator-weex git commit: Module monitor info

2017-05-17 Thread kyork
Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 62d1d3f83 -> 54d077d41


Module monitor info


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

Branch: refs/heads/0.13-dev
Commit: 1581e3c35a48096973bcd2d2aef9a2e048b054b5
Parents: 834191e
Author: yilingwj 
Authored: Wed May 17 11:36:55 2017 +0800
Committer: yilingwj 
Committed: Wed May 17 11:36:55 2017 +0800

--
 .../taobao/weex/adapter/IWXUserTrackAdapter.java   |  2 +-
 .../com/taobao/weex/bridge/WXModuleManager.java| 17 +
 2 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1581e3c3/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java 
b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
index a5201c2..604b461 100644
--- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
+++ b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
@@ -41,7 +41,7 @@ public interface IWXUserTrackAdapter {
   String DOM_MODULE = "domModule";
   String JS_BRIDGE = "jsBridge";
   String STREAM_MODULE = "streamModule";
-
+  String INVOKE_MODULE = "invokeModule";
 
   void commit(Context context, String eventId, String type, WXPerformance 
perf, Map params);
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1581e3c3/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
index 2b5ee4a..9ec961b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
@@ -26,6 +26,7 @@ import android.view.Menu;
 import com.alibaba.fastjson.JSONArray;
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.WXSDKManager;
+import com.taobao.weex.adapter.IWXUserTrackAdapter;
 import com.taobao.weex.common.Destroyable;
 import com.taobao.weex.common.WXException;
 import com.taobao.weex.common.WXModule;
@@ -35,6 +36,7 @@ import com.taobao.weex.dom.action.Actions;
 import com.taobao.weex.ui.module.WXTimerModule;
 import com.taobao.weex.utils.WXLogUtils;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -56,6 +58,13 @@ public class WXModuleManager {
   private static Map sDomModuleMap = new HashMap<>();
 
   /**
+   * monitor keys
+   */
+  private static String MONITOR_ERROR_CODE = "errCode";
+  private static String MONITOR_ARG = "arg";
+  private static String MONITOR_ERROR_MSG = "errMsg";
+
+  /**
* module object dictionary
* K : instanceId, V : Modules
*/
@@ -144,6 +153,14 @@ public class WXModuleManager {
 final Invoker invoker = factory.getMethodInvoker(methodStr);
 try {
   if(instance != null) {
+IWXUserTrackAdapter userTrackAdapter = 
WXSDKManager.getInstance().getIWXUserTrackAdapter();
+if(userTrackAdapter != null) {
+  HashMap data = new HashMap();
+  data.put(MONITOR_ERROR_CODE, "101");
+  data.put(MONITOR_ARG, moduleStr + "." + methodStr);
+  data.put(MONITOR_ERROR_MSG, instance.getBundleUrl());
+  userTrackAdapter.commit(instance.getContext(), null, 
IWXUserTrackAdapter.INVOKE_MODULE, null, data);
+}
 return dispatchCallModuleMethod(instance,wxModule,args,invoker);
   } else {
 WXLogUtils.e("callModuleMethod >>> instance is null");



[2/2] incubator-weex git commit: Merge branch '0.13-dev' into 0.13-yiling

2017-05-17 Thread kyork
Merge branch '0.13-dev' into 0.13-yiling


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

Branch: refs/heads/0.13-dev
Commit: 54d077d41f578451e8306ec23dd97acbfb4893e2
Parents: 1581e3c 62d1d3f
Author: yilingwj 
Authored: Wed May 17 17:43:16 2017 +0800
Committer: yilingwj 
Committed: Wed May 17 17:43:16 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 9 ++---
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m  | 1 +
 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h   | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)
--




[GitHub] incubator-weex pull request #357: add module monitor info

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

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


---
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 #359: * [android] Fix mixing background-color and borde...

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

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





  

  
  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 #359: * [android] Fix mixing background-color an...

2017-05-17 Thread YorkShen
GitHub user YorkShen opened a pull request:

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

* [android] Fix mixing background-color and border-color(rgba)

When combining border-color(rgba) and background-image together, the alpha 
in border-color also has an unexpected influence on background-image due to 
border and background-image share the same paint.

Refer http://dotwe.org/vue/d97477731dd85fedb3970fb106953fb9 to see a demo.

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

$ git pull https://github.com/YorkShen/incubator-weex 
android-bugfix-background-image

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

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


commit f5e80a464f7db962dee7b03d0ff2f45590e9d300
Author: YorkShen 
Date:   2017-05-18T03:35:48Z

* [android] Fix mixing background-color and border-color(rgba)
When combining border-color(rgba) and background-image together, the alpha 
in border-color also has an unexpected influence on background-image due to 
border and background-image share the same paint.
Refer http://dotwe.org/vue/d97477731dd85fedb3970fb106953fb9 to see a demo




---
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 #358: + [android] fix the wrong behavior on mask

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

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

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 46.428 (46.497) seconds

  



  Generated by :no_entry_sign: http://danger.systems/";>danger




---
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 #358: + [android] fix the wrong behavior on mask

2017-05-17 Thread misakuo
Github user misakuo closed the pull request at:

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


---
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 #358: + [android] fix the wrong behavior on mask

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

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





  

  
  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 #358: + [android] fix the wrong behavior on mask

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

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

+ [android] fix the wrong behavior on mask

- fix the incorrect y location on mask
- fix the input component can not be edit in mask

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

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

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

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


commit e0f93627b0828e1a7bb83c9a1ae9c8b11fa5702d
Author: moxun.ljf 
Date:   2017-05-18T02:49:05Z

+ [android] fix the wrong behavior with mask




---
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] update doc

2017-05-17 Thread acton393
Repository: incubator-weex
Updated Branches:
  refs/heads/dev 7c9401a92 -> 41c14455a


* [doc] update 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/41c14455
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/41c14455
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/41c14455

Branch: refs/heads/dev
Commit: 41c14455a81699e33601a12bc675d0fa2301479c
Parents: 7c9401a
Author: acton393 
Authored: Wed May 17 19:01:47 2017 +0800
Committer: acton393 
Committed: Wed May 17 19:01:47 2017 +0800

--
 doc/source/cn/references/modules/dom.md | 4 ++--
 doc/source/references/modules/dom.md| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41c14455/doc/source/cn/references/modules/dom.md
--
diff --git a/doc/source/cn/references/modules/dom.md 
b/doc/source/cn/references/modules/dom.md
index 71a4bd9..d689606 100644
--- a/doc/source/cn/references/modules/dom.md
+++ b/doc/source/cn/references/modules/dom.md
@@ -259,9 +259,9 @@ version: 2.1
 
 
 ### addRule
-0.12.0
+`支持版本:v0.12.0`
 
-addRule是可以为dom 添加
一条规则,目前支持自定义字体fontFace规则,构建自定义的font-family,可以在[text](../components/text.html#iconfont)
+addRule是可以为dom 添加
一条规则,目前支持自定义字体fontFace规则,构建自定义的font-family,可以在[text](../components/text.html#iconfont)使用
 
  fontFace
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41c14455/doc/source/references/modules/dom.md
--
diff --git a/doc/source/references/modules/dom.md 
b/doc/source/references/modules/dom.md
index 2ce50fa..fe39bc1 100644
--- a/doc/source/references/modules/dom.md
+++ b/doc/source/references/modules/dom.md
@@ -257,7 +257,7 @@ Example Useage:
 
 
 ### addRule
-0.12.0
+`support:v0.12.0`
 
 you can add your rule for dom by this, now we support `fontFace` only for 
building your custom `font-family`, use it on 
[text](../components/text.html#iconfont) directly.
 



[GitHub] incubator-weex pull request #349: * [android] fixed issues #35. when a tag h...

2017-05-17 Thread IskenHuang
Github user IskenHuang closed the pull request at:

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


---
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 #357: add module monitor info

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

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

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 62.559 (62.641) seconds

  



  Generated by :no_entry_sign: http://danger.systems/";>danger




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


[8/8] incubator-weex git commit: Merge branch 'bugfix/fix_integrate_to_your_app_md' of https://github.com/w11p3333/incubator-weex into apache-dev

2017-05-17 Thread acton393
Merge branch 'bugfix/fix_integrate_to_your_app_md' of 
https://github.com/w11p/incubator-weex into apache-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/7c9401a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7c9401a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7c9401a9

Branch: refs/heads/dev
Commit: 7c9401a927ad4b510deb0807e140580e6f32c475
Parents: 78363c8 061178c
Author: acton393 
Authored: Wed May 17 18:11:44 2017 +0800
Committer: acton393 
Committed: Wed May 17 18:11:44 2017 +0800

--
 doc/source/cn/guide/integrate-to-your-app.md | 1 +
 doc/source/guide/integrate-to-your-app.md| 1 +
 2 files changed, 2 insertions(+)
--




[7/8] incubator-weex git commit: Update EN integrate-to-your-app section 渲染 weex 实例

2017-05-17 Thread acton393
Update EN integrate-to-your-app section 渲染 weex 实例


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

Branch: refs/heads/dev
Commit: 061178cc447765f121726ba37ca9a3c280a98a79
Parents: 4f91f1a
Author: w11p 
Authored: Tue May 16 09:32:08 2017 +0800
Committer: w11p 
Committed: Tue May 16 09:32:08 2017 +0800

--
 doc/source/guide/integrate-to-your-app.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/061178cc/doc/source/guide/integrate-to-your-app.md
--
diff --git a/doc/source/guide/integrate-to-your-app.md 
b/doc/source/guide/integrate-to-your-app.md
index 55cbc64..402ebe3 100644
--- a/doc/source/guide/integrate-to-your-app.md
+++ b/doc/source/guide/integrate-to-your-app.md
@@ -250,6 +250,7 @@ Weex supports both full page rendering and partial 
rendering. What you need to d
 __weak typeof(self) weakSelf = self;
 _instance.onCreate = ^(UIView *view) {
 [weakSelf.weexView removeFromSuperview];
+weakSelf.weexView = view;
 [weakSelf.view addSubview:weakSelf.weexView];
 };
 _instance.onFailed = ^(NSError *error) {



[GitHub] incubator-weex issue #347: * [doc] update `integrate-to-your-app.md`

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

https://github.com/apache/incubator-weex/pull/347
  
hi @w11p  thx for your contribution


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


[2/8] incubator-weex git commit: Merge branch 'patch-1' of https://github.com/niclash/incubator-weex

2017-05-17 Thread acton393
Merge branch 'patch-1' of https://github.com/niclash/incubator-weex


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

Branch: refs/heads/dev
Commit: 21fbbfdb9bc72aedfb3b735d984df075ad6f4808
Parents: 77ac091 d1df088
Author: sospartan 
Authored: Fri Apr 28 11:02:48 2017 +0800
Committer: sospartan 
Committed: Fri Apr 28 11:02:48 2017 +0800

--

--




[5/8] incubator-weex git commit: Merge branch 'dev' Release 0.12.0-rc4

2017-05-17 Thread acton393
Merge branch 'dev'
Release 0.12.0-rc4


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

Branch: refs/heads/dev
Commit: 10254ecff81f5d398836ce8df62d193f5430897f
Parents: 2faa83f e19ef8a
Author: sospartan 
Authored: Fri May 12 16:24:18 2017 +0800
Committer: sospartan 
Committed: Fri May 12 16:24:18 2017 +0800

--
 LICENSE |  87 ++-
 POSSIBLE-NOTICES-FOR-BIN-DIST   |  25 +++---
 README_RELEASE.md   |  28 +++---
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 7652256 -> 7558100 bytes
 .../com/taobao/weex/bridge/WXBridgeManager.java |   6 +-
 .../ui/component/list/BasicListComponent.java   |   8 +-
 .../ui/component/list/StickyHeaderHelper.java   |  29 ---
 .../ExtendedStaggeredGridLayoutManager.java |  31 +++
 .../weex/ui/view/listview/WXRecyclerView.java   |   2 +-
 html5/frameworks/legacy/core/array.js   |  41 -
 html5/frameworks/legacy/core/dep.js |  41 -
 html5/frameworks/legacy/core/object.js  |  41 -
 html5/frameworks/legacy/core/observer.js|  41 -
 html5/frameworks/legacy/core/state.js   |  41 -
 html5/frameworks/legacy/core/watcher.js |  41 -
 .../WeexSDK/Sources/Layout/WXComponent+Layout.h |  23 +++--
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |  23 +++--
 ios/sdk/WeexSDK/Sources/Layout/WXLayoutDefine.h |  23 +++--
 package.json|   5 +-
 scripts/build_from_source.sh|  44 ++
 scripts/rat-ant-build.xml   |   2 +-
 scripts/release_files.rules |   1 +
 scripts/repackage_android.sh|  20 +
 23 files changed, 293 insertions(+), 310 deletions(-)
--




[GitHub] incubator-weex pull request #347: * [doc] update `integrate-to-your-app.md`

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

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


---
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/8] incubator-weex git commit: * [all] add NOTICE for apache

2017-05-17 Thread acton393
* [all] add NOTICE for apache

This file contains only the Apache lcense notice
The NOTICES-FOR-BIN-DISTRO contains the full list of what ends up in a final 
binary
build.


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

Branch: refs/heads/dev
Commit: 702d04c4922105069f537afdb4688f808530994d
Parents: 21fbbfd
Author: sospartan 
Authored: Fri Apr 28 11:28:44 2017 +0800
Committer: sospartan 
Committed: Fri Apr 28 11:34:12 2017 +0800

--
 NOTICE | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/702d04c4/NOTICE
--
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000..8d2f40e
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Weex
+Copyright 2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file



[6/8] incubator-weex git commit: Update CN integrate-to-your-app section Render weex Instance

2017-05-17 Thread acton393
Update CN integrate-to-your-app section Render weex Instance


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

Branch: refs/heads/dev
Commit: 4f91f1ac6db95ad1a54ce3035f25b134d198f19d
Parents: 10254ec
Author: w11p 
Authored: Tue May 16 09:31:32 2017 +0800
Committer: w11p 
Committed: Tue May 16 09:31:32 2017 +0800

--
 doc/source/cn/guide/integrate-to-your-app.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4f91f1ac/doc/source/cn/guide/integrate-to-your-app.md
--
diff --git a/doc/source/cn/guide/integrate-to-your-app.md 
b/doc/source/cn/guide/integrate-to-your-app.md
index fcb6430..22f632a 100644
--- a/doc/source/cn/guide/integrate-to-your-app.md
+++ b/doc/source/cn/guide/integrate-to-your-app.md
@@ -287,6 +287,7 @@ Weex 
支持整体页面渲染和部分渲染两种模式,你需要做的事情
 __weak typeof(self) weakSelf = self;
 _instance.onCreate = ^(UIView *view) {
 [weakSelf.weexView removeFromSuperview];
+weakSelf.weexView = view;
 [weakSelf.view addSubview:weakSelf.weexView];
 };
 



[4/8] incubator-weex git commit: Merge branch 'dev'

2017-05-17 Thread acton393
Merge branch '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/2faa83f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2faa83f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2faa83f4

Branch: refs/heads/dev
Commit: 2faa83f4cb3102bf22274f97c77733c19fc049da
Parents: 702d04c b401806
Author: sospartan 
Authored: Tue May 9 16:34:28 2017 +0800
Committer: sospartan 
Committed: Tue May 9 16:34:28 2017 +0800

--
 .travis.yml |   1 +
 .wwprc  |   3 -
 README_RELEASE.md   |  61 +++
 android/.gitignore  |   4 +-
 android/README.md   |   6 +
 android/build.gradle|  49 +++
 android/codeStyleSettings.xml   | 393 +++
 android/commons/build.gradle|  38 +-
 android/gradle.properties   |  16 +
 android/gradle/wrapper/gradle-wrapper.jar   | Bin 0 -> 52266 bytes
 .../gradle/wrapper/gradle-wrapper.properties|   6 +
 android/gradlew | 164 
 android/gradlew.bat |  90 +
 android/license/LICENSE |  16 +
 android/playground/LICENSE  | 202 --
 android/playground/NOTICE   |   7 -
 android/playground/README.md|   5 -
 android/playground/app/build.gradle |  25 +-
 android/playground/build.gradle |  22 --
 android/playground/codeStyleSettings.xml| 393 ---
 android/playground/gradle.properties|  16 -
 .../gradle/wrapper/gradle-wrapper.jar   | Bin 51018 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties|   8 -
 android/playground/gradlew  | 164 
 android/playground/gradlew.bat  |  90 -
 android/playground/settings.gradle  |  10 -
 android/run-ci.sh   |   6 +-
 android/sdk/.gitignore  |   3 +-
 android/sdk/NOTICE  |  13 -
 android/sdk/build.gradle|  64 +--
 android/sdk/gradle/wrapper/gradle-wrapper.jar   | Bin 53637 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties|   7 -
 android/sdk/gradlew | 160 
 android/sdk/gradlew.bat |  90 -
 android/sdk/license/LICENSE |  16 -
 .../license/license-gradle-plugin-0.12.1.jar| Bin 329739 -> 0 bytes
 .../license/maven-license-plugin-1.10.b1.jar| Bin 57954 -> 0 bytes
 android/sdk/license/plexus-utils-3.0.24.jar | Bin 247351 -> 0 bytes
 .../taobao/weex/dom/WXRecyclerDomObject.java|   2 +-
 android/sdk/unittest.sh |   3 -
 android/settings.gradle |   9 +
 android/weex_debug/build.gradle |  25 +-
 .../gradle/wrapper/gradle-wrapper.jar   | Bin 51018 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties|   6 -
 android/weex_debug/gradlew  | 164 
 android/weex_debug/gradlew.bat  |  90 -
 bin/commit-msg.sh   |  16 +
 bin/dist-browser.sh |  16 +
 bin/dist-js-framework.sh|  16 +
 bin/dist-vue.sh |  17 +-
 bin/install-hooks.sh|  16 +
 bin/pre-commit.sh   |  16 +
 bin/pre-push.sh |  16 +
 bin/release.sh  |  16 +
 bin/welcome.sh  |  16 +
 doc/source/cn/references/components/list.md |   9 +
 doc/source/cn/references/components/scroller.md |   6 +
 doc/source/cn/references/components/slider.md   |  10 +-
 doc/source/references/components/list.md|   5 +
 doc/source/references/components/scroller.md|   3 +
 doc/source/references/components/slider.md  |   4 +-
 html5/frameworks/legacy/core/array.js   |  23 ++
 html5/frameworks/legacy/core/dep.js |  23 ++
 html5/frameworks/legacy/core/object.js  |  23 ++
 html5/frameworks/legacy/core/observer.js|  23 ++
 html5/frameworks/legacy/core/state.js   |  23 ++
 html5/frameworks/legacy/core/watcher.js |  23 ++
 .../vue/components/slider/slider-neighbor.js|  18 +
 .../WeexDemo/Scanner/WXScannerHistoryVC.m   |  25 +-
 ios/sdk/LICENSE | 202 --
 ios/sdk/NOTICE  |  13 -
 .../Sources/Component/WXEmbedComponent.m|   6 +
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |   1 +
 i

[1/8] incubator-weex git commit: Added Apache notice in NOTICE file

2017-05-17 Thread acton393
Repository: incubator-weex
Updated Branches:
  refs/heads/dev 78363c89d -> 7c9401a92


Added Apache notice in NOTICE file

This is mainly to test the change in the notification system.

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

Branch: refs/heads/dev
Commit: d1df0882866aa13ec2e56d7b08ce5c4ae64f1b70
Parents: f2ee9e8
Author: Niclas Hedhman 
Authored: Sun Apr 23 11:19:42 2017 +0800
Committer: GitHub 
Committed: Sun Apr 23 11:19:42 2017 +0800

--
 NOTICE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1df0882/NOTICE
--
diff --git a/NOTICE b/NOTICE
index c4d3e93..0d8fded 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-Weex 
-Copyright 2016 Alibaba Group
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
 
 This product includes software developed at Alibaba Group. 
(http://www.alibabagroup.com)
 
@@ -13,4 +13,4 @@ This product contains software 
vuejs(https://github.com/vuejs/vue) developed
 by Yuxi Evan You , licensed under the MIT License.
 
 This product contains software (https://github.com/component/scroll-to) 
developed
-by TooTallNate , licensed under the MIT License.
\ No newline at end of file
+by TooTallNate , licensed under the MIT License.



[GitHub] incubator-weex issue #357: add module monitor info

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

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





  

  
  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 #357: add module monitor info

2017-05-17 Thread yilingwj
GitHub user yilingwj opened a pull request:

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

add module monitor info






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

$ git pull https://github.com/yilingwj/incubator-weex 0.13-yiling

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

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


commit 1581e3c35a48096973bcd2d2aef9a2e048b054b5
Author: yilingwj 
Date:   2017-05-17T03:36:55Z

Module monitor info

commit 54d077d41f578451e8306ec23dd97acbfb4893e2
Author: yilingwj 
Date:   2017-05-17T09:43:16Z

Merge branch '0.13-dev' into 0.13-yiling




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


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

2017-05-17 Thread acton393
Merge branch '0.13-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-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/834191e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/834191e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/834191e0

Branch: refs/heads/0.13-dev
Commit: 834191e0de49a627da0235b3b5d3eee74edb5f6b
Parents: 3202304 b2672dc
Author: acton393 
Authored: Wed May 17 10:40:04 2017 +0800
Committer: acton393 
Committed: Wed May 17 10:40:04 2017 +0800

--
 .../weex/extend/module/WXEventModule.java   | 18 ++
 .../WeexDemo/extend/module/WXEventModule.m  | 16 ++
 test/pages/modules/globalEvent.vue  | 48 
 test/scripts/modules/globalEvent.test.js| 60 
 4 files changed, 142 insertions(+)
--




[1/7] incubator-weex git commit: * [ios] add fireEvent js method

2017-05-17 Thread acton393
Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 2615aa529 -> 62d1d3f83


* [ios] add fireEvent js method


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

Branch: refs/heads/0.13-dev
Commit: e7e93c09632a13ef0abdb106e82c404343a6e59b
Parents: 507cd7c
Author: acton393 
Authored: Wed Apr 26 19:03:46 2017 +0800
Committer: acton393 
Committed: Wed Apr 26 19:03:46 2017 +0800

--
 .../alibaba/weex/extend/module/WXEventModule.java | 18 ++
 .../WeexDemo/extend/module/WXEventModule.m| 16 
 2 files changed, 34 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7e93c09/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
--
diff --git 
a/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
 
b/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
index 098681d..06c5326 100644
--- 
a/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
+++ 
b/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
@@ -23,9 +23,11 @@ import android.net.Uri;
 import android.text.TextUtils;
 
 import com.taobao.weex.annotation.JSMethod;
+import com.taobao.weex.bridge.JSCallback;
 import com.taobao.weex.common.WXModule;
 
 import java.util.HashMap;
+import java.util.Map;
 
 
 public class WXEventModule extends WXModule {
@@ -61,4 +63,20 @@ public class WXEventModule extends WXModule {
   mWXSDKInstance.fireModuleEvent("event", this, params);
 }
   }
+  /*
+   * a test method for macaca case, you can fire globalEvent when download 
finish、device shaked and so on.
+   * @param event event name
+  * */
+  @JSMethod(uiThread = true)
+  public void fireNativeGlobalEvent(String event, JSCallback callback) {
+Map params=new HashMap();
+params.put("eventParam","value");
+
+mWXSDKInstance.fireGlobalEventCallback(event, params);
+if (null != callback) {
+  Map result = new HashMap();
+  result.put("ok",true);
+  callback.invoke(result);
+}
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7e93c09/ios/playground/WeexDemo/extend/module/WXEventModule.m
--
diff --git a/ios/playground/WeexDemo/extend/module/WXEventModule.m 
b/ios/playground/WeexDemo/extend/module/WXEventModule.m
index b3b1cfb..9f58090 100644
--- a/ios/playground/WeexDemo/extend/module/WXEventModule.m
+++ b/ios/playground/WeexDemo/extend/module/WXEventModule.m
@@ -27,6 +27,8 @@
 
 WX_EXPORT_METHOD(@selector(openURL:))
 
+WX_EXPORT_METHOD(@selector(fireNativeGlobalEvent:callback:))
+
 - (void)openURL:(NSString *)url
 {
 NSString *newURL = url;
@@ -43,5 +45,19 @@ WX_EXPORT_METHOD(@selector(openURL:))
 [[weexInstance.viewController navigationController] 
pushViewController:controller animated:YES];
 }
 
+
+/**
+ a test method for macaca case, you can fire globalEvent when download 
finish、device shaked and so on.
+ @param event event name
+ */
+- (void)fireNativeGlobalEvent:(NSString *)event 
callback:(WXModuleCallback)callback
+{
+[weexInstance fireGlobalEvent:event params:@{@"eventParam":@"eventValue"}];
+if (callback) {
+NSDictionary * result = @{@"ok": @true};
+callback(result);
+}
+}
+
 @end
 



[3/7] incubator-weex git commit: Merge branch 'globalEvent-macaca-case' of github.com:acton393/incubator-weex into 0.13-dev

2017-05-17 Thread acton393
Merge branch 'globalEvent-macaca-case' of github.com:acton393/incubator-weex 
into 0.13-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/b2672dc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b2672dc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b2672dc4

Branch: refs/heads/0.13-dev
Commit: b2672dc493429c585a01bc12942e1ae8aef2fa69
Parents: 6566fc2 391ce4c
Author: sospartan 
Authored: Tue May 16 14:59:18 2017 +0800
Committer: sospartan 
Committed: Tue May 16 14:59:18 2017 +0800

--
 .../weex/extend/module/WXEventModule.java   | 18 ++
 .../WeexDemo/extend/module/WXEventModule.m  | 16 ++
 test/pages/modules/globalEvent.vue  | 48 
 test/scripts/modules/globalEvent.test.js| 60 
 4 files changed, 142 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2672dc4/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
--
diff --cc 
android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
index 10a51cd,06c5326..e417f0f
--- 
a/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
+++ 
b/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
@@@ -22,8 -22,8 +22,9 @@@ import android.content.Intent
  import android.net.Uri;
  import android.text.TextUtils;
  
 +import com.alibaba.weex.WXPageActivity;
  import com.taobao.weex.annotation.JSMethod;
+ import com.taobao.weex.bridge.JSCallback;
  import com.taobao.weex.common.WXModule;
  
  import java.util.HashMap;



[2/7] incubator-weex git commit: * [ios] add macaca case and js

2017-05-17 Thread acton393
* [ios] add macaca case and js


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

Branch: refs/heads/0.13-dev
Commit: 391ce4c275387ee934948640c60058a759f9dc30
Parents: e7e93c0
Author: acton393 
Authored: Wed Apr 26 19:07:58 2017 +0800
Committer: acton393 
Committed: Wed Apr 26 19:07:58 2017 +0800

--
 test/pages/modules/globalEvent.vue   | 48 +
 test/scripts/modules/globalEvent.test.js | 60 +++
 2 files changed, 108 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/391ce4c2/test/pages/modules/globalEvent.vue
--
diff --git a/test/pages/modules/globalEvent.vue 
b/test/pages/modules/globalEvent.vue
new file mode 100644
index 000..bb5d631
--- /dev/null
+++ b/test/pages/modules/globalEvent.vue
@@ -0,0 +1,48 @@
+
+  
+{{content}}
+{{btnTitle}}
+  
+
+
+
+  module.exports = {
+data() {
+  return {
+content:"I received event",
+show:false,
+btnTitle:"click me to fire globalEvent"
+  }
+},
+mounted(){
+  var self = this;
+  weex.requireModule("globalEvent").addEventListener("showText", 
function(e){
+  console.log("Hello")
+  self.show = true;
+  });
+},
+methods:{
+  handleOnclick:function(e) {
+var self = this;
+
weex.requireModule("event").fireNativeGlobalEvent("showText",function(e){
+if(Boolean(e.ok)) {
+  self.btnTitle = "posted"
+}
+})
+
+  }
+}
+  }
+
+
+
+.btn {
+  margin-top:100;
+  margin-left:100;
+  border-width:3;
+  height:50;
+  border-color:red;
+  border-radius:10;
+  background-color:rgba(23,145,245,1)
+}
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/391ce4c2/test/scripts/modules/globalEvent.test.js
--
diff --git a/test/scripts/modules/globalEvent.test.js 
b/test/scripts/modules/globalEvent.test.js
new file mode 100644
index 000..2934fa7
--- /dev/null
+++ b/test/scripts/modules/globalEvent.test.js
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+'use strict';
+
+var _ = require('macaca-utils');
+var assert = require('chai').assert
+var wd = require('weex-wd')
+var path = require('path');
+var os = require('os');
+var util = require("../util.js");
+
+describe('weex mobile index', function () {
+  this.timeout(util.getTimeoutMills());
+  var driver = util.createDriver(wd);
+  before(function () {
+return util.init(driver)
+  .get(util.getPage('/modules/globalEvent.js'))
+  .waitForElementById('button',util.getGETActionWaitTimeMills(),1000)
+  });
+
+  after(function () {
+  return util.quit(driver)
+  })
+
+  it('#0 fireEvent',()=>{
+  return driver
+  .elementById("button")
+  .click()
+  .sleep(2000)
+  .text()
+  .then((elem)=>{
+assert.equal(elem, "posted")
+})
+  })
+
+  it('#1 received event', ()=>{
+return driver
+.elementById("content")
+.text()
+.then((elem)=>{
+assert.equal(elem, "I received event")
+})
+  })
+});



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

2017-05-17 Thread acton393
Merge branch '0.13-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-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/ace3da04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ace3da04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ace3da04

Branch: refs/heads/0.13-dev
Commit: ace3da045fc99c719824c4410dac4d07acd01d42
Parents: 2615aa5
Author: acton393 
Authored: Wed May 17 10:40:04 2017 +0800
Committer: acton393 
Committed: Wed May 17 17:25:24 2017 +0800

--
 .../weex/extend/module/WXEventModule.java   | 18 ++
 .../WeexDemo/extend/module/WXEventModule.m  | 16 ++
 test/pages/modules/globalEvent.vue  | 48 
 test/scripts/modules/globalEvent.test.js| 60 
 4 files changed, 142 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ace3da04/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
--
diff --git 
a/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
 
b/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
index 10a51cd..e417f0f 100644
--- 
a/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
+++ 
b/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
@@ -24,9 +24,11 @@ import android.text.TextUtils;
 
 import com.alibaba.weex.WXPageActivity;
 import com.taobao.weex.annotation.JSMethod;
+import com.taobao.weex.bridge.JSCallback;
 import com.taobao.weex.common.WXModule;
 
 import java.util.HashMap;
+import java.util.Map;
 
 
 public class WXEventModule extends WXModule {
@@ -64,4 +66,20 @@ public class WXEventModule extends WXModule {
   mWXSDKInstance.fireModuleEvent("event", this, params);
 }
   }
+  /*
+   * a test method for macaca case, you can fire globalEvent when download 
finish、device shaked and so on.
+   * @param event event name
+  * */
+  @JSMethod(uiThread = true)
+  public void fireNativeGlobalEvent(String event, JSCallback callback) {
+Map params=new HashMap();
+params.put("eventParam","value");
+
+mWXSDKInstance.fireGlobalEventCallback(event, params);
+if (null != callback) {
+  Map result = new HashMap();
+  result.put("ok",true);
+  callback.invoke(result);
+}
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ace3da04/ios/playground/WeexDemo/extend/module/WXEventModule.m
--
diff --git a/ios/playground/WeexDemo/extend/module/WXEventModule.m 
b/ios/playground/WeexDemo/extend/module/WXEventModule.m
index b3b1cfb..9f58090 100644
--- a/ios/playground/WeexDemo/extend/module/WXEventModule.m
+++ b/ios/playground/WeexDemo/extend/module/WXEventModule.m
@@ -27,6 +27,8 @@
 
 WX_EXPORT_METHOD(@selector(openURL:))
 
+WX_EXPORT_METHOD(@selector(fireNativeGlobalEvent:callback:))
+
 - (void)openURL:(NSString *)url
 {
 NSString *newURL = url;
@@ -43,5 +45,19 @@ WX_EXPORT_METHOD(@selector(openURL:))
 [[weexInstance.viewController navigationController] 
pushViewController:controller animated:YES];
 }
 
+
+/**
+ a test method for macaca case, you can fire globalEvent when download 
finish、device shaked and so on.
+ @param event event name
+ */
+- (void)fireNativeGlobalEvent:(NSString *)event 
callback:(WXModuleCallback)callback
+{
+[weexInstance fireGlobalEvent:event params:@{@"eventParam":@"eventValue"}];
+if (callback) {
+NSDictionary * result = @{@"ok": @true};
+callback(result);
+}
+}
+
 @end
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ace3da04/test/pages/modules/globalEvent.vue
--
diff --git a/test/pages/modules/globalEvent.vue 
b/test/pages/modules/globalEvent.vue
new file mode 100644
index 000..bb5d631
--- /dev/null
+++ b/test/pages/modules/globalEvent.vue
@@ -0,0 +1,48 @@
+
+  
+{{content}}
+{{btnTitle}}
+  
+
+
+
+  module.exports = {
+data() {
+  return {
+content:"I received event",
+show:false,
+btnTitle:"click me to fire globalEvent"
+  }
+},
+mounted(){
+  var self = this;
+  weex.requireModule("globalEvent").addEventListener("showText", 
function(e){
+  console.log("Hello")
+  self.show = true;
+  });
+},
+methods:{
+  handleOnclick:function(e) {
+var self = this;
+
weex.requireModule("event").fireNativeGlobalEvent("showText",function(e){
+if(Boolean(e.ok)) {
+  self.btnTitle = "posted"
+   

[7/7] incubator-weex git commit: Merge branch '0.13-dev-test' of https://github.com/acton393/incubator-weex into apache-0.13-dev

2017-05-17 Thread acton393
Merge branch '0.13-dev-test' of https://github.com/acton393/incubator-weex into 
apache-0.13-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/62d1d3f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/62d1d3f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/62d1d3f8

Branch: refs/heads/0.13-dev
Commit: 62d1d3f83f26afda56c692bc11530e980351839b
Parents: 6694e98 ace3da0
Author: acton393 
Authored: Wed May 17 17:39:02 2017 +0800
Committer: acton393 
Committed: Wed May 17 17:39:02 2017 +0800

--

--




[GitHub] incubator-weex pull request #356: Merge branch '0.13-dev' of https://git-wip...

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

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


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


[5/7] incubator-weex git commit: Merge branch '0.13-dev' of https://github.com/acton393/incubator-weex into apache-0.13-dev

2017-05-17 Thread acton393
Merge branch '0.13-dev' of https://github.com/acton393/incubator-weex into 
apache-0.13-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/6694e982
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6694e982
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6694e982

Branch: refs/heads/0.13-dev
Commit: 6694e982afd6fdd892d06a5980cd21629c840bda
Parents: 834191e 2615aa5
Author: acton393 
Authored: Wed May 17 14:31:06 2017 +0800
Committer: acton393 
Committed: Wed May 17 14:31:06 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 9 ++---
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m  | 1 +
 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h   | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)
--




[GitHub] incubator-weex pull request #356: Merge branch '0.13-dev' of https://git-wip...

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

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

Merge branch '0.13-dev' of https://git-wip-us.apache.org/repos/asf/in…



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

$ git pull https://github.com/acton393/incubator-weex 0.13-dev-test

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

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


commit ace3da045fc99c719824c4410dac4d07acd01d42
Author: acton393 
Date:   2017-05-17T02:40:04Z

Merge branch '0.13-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-dev




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


[GitHub] incubator-weex pull request #354: add Monitor Info

2017-05-17 Thread yilingwj
Github user yilingwj closed the pull request at:

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


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


[2/2] incubator-weex git commit: Merge branch 'doc-feature-dev' of github.com:kfeagle/incubator-weex into dev

2017-05-17 Thread tancy
Merge branch 'doc-feature-dev' of github.com:kfeagle/incubator-weex into 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/78363c89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/78363c89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/78363c89

Branch: refs/heads/dev
Commit: 78363c89ddbeacf984c1b742ec68a67b87b91b86
Parents: 437ed26 feb6cca
Author: tancy 
Authored: Wed May 17 17:02:52 2017 +0800
Committer: tancy 
Committed: Wed May 17 17:02:52 2017 +0800

--
 doc/source/cn/references/modules/websocket.md | 128 +++--
 doc/source/references/modules/websocket.md| 128 +++--
 2 files changed, 132 insertions(+), 124 deletions(-)
--




[GitHub] incubator-weex pull request #299: + [doc] feature: update websocket doc

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

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


---
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 #349: * [android] fixed issues #35. when a tag href is ...

2017-05-17 Thread sospartan
Github user sospartan commented on the issue:

https://github.com/apache/incubator-weex/pull/349
  
@IskenHuang execute js with `href` is not possible in native currently.
I suggest you to discuss about this in dev@ mail list. 


---
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/2] incubator-weex git commit: + [doc] feature: update websocket doc

2017-05-17 Thread tancy
Repository: incubator-weex
Updated Branches:
  refs/heads/dev 437ed268c -> 78363c89d


+ [doc] feature: update websocket 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/feb6cca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/feb6cca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/feb6cca1

Branch: refs/heads/dev
Commit: feb6cca1bc0ef42f79ab0d6f3b766b90c512f700
Parents: 7a8eac8
Author: 齐山 
Authored: Fri Apr 28 13:59:14 2017 +0800
Committer: 齐山 
Committed: Fri Apr 28 13:59:14 2017 +0800

--
 doc/source/cn/references/modules/websocket.md | 128 +++--
 doc/source/references/modules/websocket.md| 128 +++--
 2 files changed, 132 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/feb6cca1/doc/source/cn/references/modules/websocket.md
--
diff --git a/doc/source/cn/references/modules/websocket.md 
b/doc/source/cn/references/modules/websocket.md
index de99ad3..e83c15f 100644
--- a/doc/source/cn/references/modules/websocket.md
+++ b/doc/source/cn/references/modules/websocket.md
@@ -90,87 +90,91 @@ WebSockets 是一种先进的技术, 这使得在用户的 
H5/iOS/Android 和一
   
 
   
-websocket
+websocket
   
-  
+  
   
-connect
-send
-close
+connect
+send
+close
   
-  
-method = send
+
+  
+method = send
   
-  {{sendinfo}}
-  
-method = onopen
+  {{sendinfo}}
+
+
+  
+method = onopen
   
-  {{onopeninfo}}
-  
-method = onmessage
+  {{onopeninfo}}
+
+  
+method = onmessage
   
-  {{onmessage}}
-  
-method = onclose
+  {{onmessage}}
+
+  
+method = onclose
   
-  {{oncloseinfo}}
-  
-method = onerror
+  {{oncloseinfo}}
+
+  
+method = onerror
   
-  {{onerrorinfo}}
-  
-method = close
+  {{onerrorinfo}}
+
+  
+method = close
   
-  {{closeinfo}}
-
+  {{closeinfo}}
+
 
+
   
 
-
+
+  var websocket = require('@weex-module/webSocket');  module.exports = { 

[9/9] incubator-weex-site git commit: Site updated: 2017-05-17 17:04:00

Site updated: 2017-05-17 17:04:00


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/88192870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/88192870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/88192870

Branch: refs/heads/asf-site
Commit: 88192870d34d526771abba1fb3ba377bd0633a9e
Parents: 41aa574
Author: tancy 
Authored: Wed May 17 17:04:01 2017 +0800
Committer: tancy 
Committed: Wed May 17 17:04:01 2017 +0800

--
 content/cn/references/advanced/extend-jsfm.html |  8 ++---
 .../references/advanced/extend-to-android.html  |  8 ++---
 .../cn/references/advanced/extend-to-html5.html |  8 ++---
 .../cn/references/advanced/extend-to-ios.html   |  8 ++---
 content/cn/references/advanced/index.html   |  8 ++---
 .../advanced/integrate-devtool-to-android.html  |  8 ++---
 .../advanced/integrate-devtool-to-ios.html  |  8 ++---
 content/cn/references/android-apis.html |  8 ++---
 content/cn/references/color-names.html  |  8 ++---
 content/cn/references/common-event.html |  8 ++---
 content/cn/references/common-style.html |  8 ++---
 content/cn/references/components/a.html |  8 ++---
 content/cn/references/components/cell.html  |  8 ++---
 content/cn/references/components/div.html   |  8 ++---
 content/cn/references/components/image.html |  8 ++---
 content/cn/references/components/index.html |  8 ++---
 content/cn/references/components/indicator.html |  8 ++---
 content/cn/references/components/input.html |  8 ++---
 content/cn/references/components/list.html  |  8 ++---
 content/cn/references/components/loading.html   |  8 ++---
 content/cn/references/components/refresh.html   |  8 ++---
 content/cn/references/components/scroller.html  |  8 ++---
 content/cn/references/components/slider.html|  8 ++---
 content/cn/references/components/switch.html|  8 ++---
 content/cn/references/components/text.html  |  8 ++---
 content/cn/references/components/textarea.html  |  8 ++---
 content/cn/references/components/video.html |  8 ++---
 content/cn/references/components/waterfall.html |  8 ++---
 content/cn/references/components/web.html   |  8 ++---
 content/cn/references/gesture.html  |  8 ++---
 content/cn/references/html5-apis.html   |  8 ++---
 content/cn/references/index.html|  8 ++---
 content/cn/references/ios-apis.html |  8 ++---
 content/cn/references/js-service/index.html |  8 ++---
 content/cn/references/jsfm-apis.html|  8 ++---
 content/cn/references/migration/difference.html |  8 ++---
 content/cn/references/migration/index.html  |  8 ++---
 .../migration/migration-from-weex.html  |  8 ++---
 content/cn/references/modules/animation.html|  8 ++---
 content/cn/references/modules/clipboard.html|  8 ++---
 content/cn/references/modules/dom.html  |  8 ++---
 content/cn/references/modules/globalevent.html  |  8 ++---
 content/cn/references/modules/index.html|  8 ++---
 content/cn/references/modules/modal.html|  8 ++---
 content/cn/references/modules/navigator.html|  8 ++---
 content/cn/references/modules/picker.html   |  8 ++---
 content/cn/references/modules/storage.html  |  8 ++---
 content/cn/references/modules/stream.html   |  8 ++---
 content/cn/references/modules/websocket.html| 16 +-
 content/cn/references/modules/webview.html  |  8 ++---
 content/cn/references/native-dom-api.html   |  8 ++---
 content/cn/references/path.html |  8 ++---
 content/cn/references/platform-difference.html  |  8 ++---
 content/cn/references/text-style.html   |  8 ++---
 content/cn/references/unit.html |  8 ++---
 .../cn/references/vue/difference-of-vuex.html   |  8 ++---
 .../cn/references/vue/difference-with-web.html  |  8 ++---
 content/cn/references/vue/index.html|  8 ++---
 content/cn/references/web-standards.html|  8 ++---
 content/cn/references/weex-variable.html|  8 ++---
 content/cn/v-0.10/references/api.html   |  8 ++---
 content/cn/v-0.10/references/cheatsheet.html|  8 ++---
 content/cn/v-0.10/references/color-names.html   |  8 ++---
 content/cn/v-0.10/references/common-attrs.html  |  8 ++---
 content/cn/v-0.10/references/common-event.html  |  8 ++---
 content/cn/v-0.10/references/common-style.html  |  8 ++---
 .../cn/v-0.10/references/component-defs.html|  8 ++---
 content/cn/v-0.10/references/components/a.html  |  8 ++---
 .../cn/v-0.10/references/components/cell.html   |  8 ++---
 .../cn/v-0.10/references/components/div.html|  8 ++---
 .../cn/v-0.10/references/components/image.html  |  8 ++---
 .../cn/v-0.10/references/components/index.html  |  8 ++---
 .../v-0.10/references/components/indica

[3/9] incubator-weex-site git commit: Site updated: 2017-05-17 17:04:00

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/references/modules/modal.html
--
diff --git a/content/references/modules/modal.html 
b/content/references/modules/modal.html
index 9f4e24f..28d4cc0 100644
--- a/content/references/modules/modal.html
+++ b/content/references/modules/modal.html
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -566,11 +566,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1166,11 +1166,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/references/modules/navigator.html
--
diff --git a/content/references/modules/navigator.html 
b/content/references/modules/navigator.html
index e71a24d..dc94128 100644
--- a/content/references/modules/navigator.html
+++ b/content/references/modules/navigator.html
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -566,11 +566,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1166,11 +1166,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/references/modules/picker.html
--
diff --git a/content/references/modules/picker.html 
b/content/references/modules/picker.html
index 7ab1307..13939ca 100644
--- a/content/references/modules/picker.html
+++ b/content/references/modules/picker.html
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -566,11 +566,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-ani

[7/9] incubator-weex-site git commit: Site updated: 2017-05-17 17:04:00

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/cn/v-0.10/references/components/text.html
--
diff --git a/content/cn/v-0.10/references/components/text.html 
b/content/cn/v-0.10/references/components/text.html
index 90d4431..a99eb37 100644
--- a/content/cn/v-0.10/references/components/text.html
+++ b/content/cn/v-0.10/references/components/text.html
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/cn/v-0.10/references/components/textarea.html
--
diff --git a/content/cn/v-0.10/references/components/textarea.html 
b/content/cn/v-0.10/references/components/textarea.html
index 994d5ce..79b683a 100644
--- a/content/cn/v-0.10/references/components/textarea.html
+++ b/content/cn/v-0.10/references/components/textarea.html
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/cn/v-0.10/references/components/video.html
--
diff --git a/content/cn/v-0.10/references/components/video.html 
b/content/cn/v-0.10/references/components/video.html
index 3ad2397..f7bfbdf 100644
--- a/content/cn/v-0.10/references/components/video.html
+++ b/content/cn/v-0.10/references/components/video.html
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/cn/v-0.10/references/components/web.html
--
diff --git a/content/cn/v-0.10/references/components/web.html 
b/content/cn/v-0.10/references/components/web.html
index 3d6d69e..7d083dd 100644
--- a/content/cn/v-0.10/references/components/web.html
+++ b/content/cn/v-0.10/references/components/web.html
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/cn/v-0.10/references/gesture.html
--
diff --git a/content/cn/v-0.10/references/gesture.html 
b/content/cn/v-0.10/references/gesture.html
index d6fe280..0e5e7f7 100644
--- a/content/cn/v-0.10/references/gesture.html
+++ b/content/cn/v-0.10/references/gesture.html
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/cn/v-0.10/references/index.html
-

[1/9] incubator-weex-site git commit: Site updated: 2017-05-17 17:04:00

Repository: incubator-weex-site
Updated Branches:
  refs/heads/asf-site 41aa574bb -> 88192870d


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/v-0.10/references/gesture.html
--
diff --git a/content/v-0.10/references/gesture.html 
b/content/v-0.10/references/gesture.html
index d548665..e24fb57 100644
--- a/content/v-0.10/references/gesture.html
+++ b/content/v-0.10/references/gesture.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/v-0.10/references/index.html
--
diff --git a/content/v-0.10/references/index.html 
b/content/v-0.10/references/index.html
index ebbb077..3c2a656 100644
--- a/content/v-0.10/references/index.html
+++ b/content/v-0.10/references/index.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/v-0.10/references/modules/animation.html
--
diff --git a/content/v-0.10/references/modules/animation.html 
b/content/v-0.10/references/modules/animation.html
index 4007902..0861305 100644
--- a/content/v-0.10/references/modules/animation.html
+++ b/content/v-0.10/references/modules/animation.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/v-0.10/references/modules/clipboard.html
--
diff --git a/content/v-0.10/references/modules/clipboard.html 
b/content/v-0.10/references/modules/clipboard.html
index b373f9d..8a352aa 100644
--- a/content/v-0.10/references/modules/clipboard.html
+++ b/content/v-0.10/references/modules/clipboard.html
@@ -413,11 +413,11 @@
   
 
   
-

[2/9] incubator-weex-site git commit: Site updated: 2017-05-17 17:04:00

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/references/vue/difference-with-web.html
--
diff --git a/content/references/vue/difference-with-web.html 
b/content/references/vue/difference-with-web.html
index 496e29c..54a82e3 100644
--- a/content/references/vue/difference-with-web.html
+++ b/content/references/vue/difference-with-web.html
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -566,11 +566,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1166,11 +1166,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/references/vue/index.html
--
diff --git a/content/references/vue/index.html 
b/content/references/vue/index.html
index 57730a8..df7fd8a 100644
--- a/content/references/vue/index.html
+++ b/content/references/vue/index.html
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -566,11 +566,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1166,11 +1166,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/88192870/content/references/web-standards.html
--
diff --git a/content/references/web-standards.html 
b/content/references/web-standards.html
index cfaeb63..eef30a1 100644
--- a/content/references/web-standards.html
+++ b/content/references/web-standards.html
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -566,11 +566,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-  

[2/2] incubator-weex git commit: Merge branch 'dev' of github.com:cxfeng1/incubator-weex into dev

Merge branch 'dev' of github.com:cxfeng1/incubator-weex into 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/437ed268
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/437ed268
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/437ed268

Branch: refs/heads/dev
Commit: 437ed268c173557d8497bb8ffb3baf0f17e439b3
Parents: 5675ef7 a8cb20f
Author: tancy 
Authored: Wed May 17 16:56:54 2017 +0800
Committer: tancy 
Committed: Wed May 17 16:56:54 2017 +0800

--
 doc/source/cn/references/components/waterfall.md | 13 -
 doc/source/references/components/waterfall.md| 13 -
 2 files changed, 8 insertions(+), 18 deletions(-)
--




[GitHub] incubator-weex pull request #355: * [doc] update water fall doc format

Github user asfgit closed the pull request at:

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


---
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/2] incubator-weex git commit: * [doc] update water fall doc format

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 5675ef71f -> 437ed268c


* [doc] update water fall doc format


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

Branch: refs/heads/dev
Commit: a8cb20f4fe74c5ef56da19bcd3a1b8bec70d5df6
Parents: 703cc99
Author: yinfeng 
Authored: Wed May 17 14:38:31 2017 +0800
Committer: yinfeng 
Committed: Wed May 17 14:38:31 2017 +0800

--
 doc/source/cn/references/components/waterfall.md | 13 -
 doc/source/references/components/waterfall.md| 13 -
 2 files changed, 8 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8cb20f4/doc/source/cn/references/components/waterfall.md
--
diff --git a/doc/source/cn/references/components/waterfall.md 
b/doc/source/cn/references/components/waterfall.md
index 08b01ac..169ec89 100644
--- a/doc/source/cn/references/components/waterfall.md
+++ b/doc/source/cn/references/components/waterfall.md
@@ -1,14 +1,9 @@
-\---
-
+---
 title: 
-
 type: references
-
 order: 2.5
-
 version: 2.1
-
-\---
+---
 
 # waterfall
 
@@ -18,7 +13,7 @@ version: 2.1
 
 ### 子组件
 
-注意:  和list一样, waterfall 只支持特定类型的组件: cell, 
header, refresh, loading 和 fixed-position 组件. 
+注意:  和list一样, waterfall 只支持特定类型的组件: cell, 
header, refresh, loading 和 fixed-position 组件.
 
 - `cell`: 瀑布流中的每个元素
 - `header`: 主要用于表示横跨多列的元素
,可以通过css的position属性设置为sticky
@@ -33,7 +28,7 @@ version: 2.1
   - ``: 最佳列数,column-width 和  column-count 
都指定非0值, 则 column-count 代表最大列数。
 - **column-gap**: 列与列的间隙. 如果指定了 `normal` ,则对应 
`32`.
 
-其他支持的属性参见 [List Component Attributes](./list.html) 
+其他支持的属性参见 [List Component Attributes](./list.html)
 
 ### 样式
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8cb20f4/doc/source/references/components/waterfall.md
--
diff --git a/doc/source/references/components/waterfall.md 
b/doc/source/references/components/waterfall.md
index 5c035d0..57e1306 100644
--- a/doc/source/references/components/waterfall.md
+++ b/doc/source/references/components/waterfall.md
@@ -1,14 +1,9 @@
-\---
-
+---
 title: 
-
 type: references
-
 order: 2.5
-
 version: 2.1
-
-\---
+---
 
 # waterfall
 
@@ -18,7 +13,7 @@ A component providing waterfall layout.
 
 ### Child Components
 
-Notes: The waterfall now supports the following child components: cell, 
header, refresh, loading and fixed-position components. Other kinds of 
components will not be guaranteed to be displayed correctly. 
+Notes: The waterfall now supports the following child components: cell, 
header, refresh, loading and fixed-position components. Other kinds of 
components will not be guaranteed to be displayed correctly.
 
 * cell: presents the content for a single data item in waterfall
 * header: components that need to stretch across multiple columns. It can be 
sticky by using css position.
@@ -33,7 +28,7 @@ Notes: The waterfall now supports the following child 
components: cell, header,
   * ``: describes the optimal number of columns into which the 
content of the element will be flowed. Values must be greater than 0. If both 
column-width and column-count have non-auto values, the integer value describes 
the maximum number of columns.
 * **column-gap**:sets the gap between columns. if `normal` is specified,  the 
gap will be `32`.
 
-To see other attributes,  please checkout [List Component 
Attributes](./list.html) 
+To see other attributes,  please checkout [List Component 
Attributes](./list.html)
 
 ### Styles
 



[02/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/v-0.10/references/components/input.html
--
diff --git a/content/v-0.10/references/components/input.html 
b/content/v-0.10/references/components/input.html
index 4c94a5a..6b256e1 100644
--- a/content/v-0.10/references/components/input.html
+++ b/content/v-0.10/references/components/input.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/v-0.10/references/components/list.html
--
diff --git a/content/v-0.10/references/components/list.html 
b/content/v-0.10/references/components/list.html
index e8fdcd4..2a5aedc 100644
--- a/content/v-0.10/references/components/list.html
+++ b/content/v-0.10/references/components/list.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/v-0.10/references/components/refresh-loading.html
--
diff --git a/content/v-0.10/references/components/refresh-loading.html 
b/content/v-0.10/references/components/refresh-loading.html
index 06208c6..66aa321 100644
--- a/content/v-0.10/references/components/refresh-loading.html
+++ b/content/v-0.10/references/components/refresh-loading.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/v-0.10/references/components/scroller.html
--
diff --git a/content/v-0.10/references/components/scroller.html 
b/content/v-0.10/references/components/scroller.html
index 996c109..5dec42e 100644
--- a/content/v-0.10/references/components/scroller.html
+++ b/content/v-0.10/references/components/scroller.html
@@ -413,11 +413,11 @@
  

[11/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

Site updated: 2017-05-17 16:58:12


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/41aa574b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/41aa574b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/41aa574b

Branch: refs/heads/asf-site
Commit: 41aa574bb91c685abe5382cba6b88a621aa03e69
Parents: cefd3b3
Author: tancy 
Authored: Wed May 17 16:58:13 2017 +0800
Committer: tancy 
Committed: Wed May 17 16:58:13 2017 +0800

--
 content/cn/references/advanced/extend-jsfm.html |   26 +-
 .../references/advanced/extend-to-android.html  |   26 +-
 .../cn/references/advanced/extend-to-html5.html |   26 +-
 .../cn/references/advanced/extend-to-ios.html   |   26 +-
 content/cn/references/advanced/index.html   |   26 +-
 .../advanced/integrate-devtool-to-android.html  |   26 +-
 .../advanced/integrate-devtool-to-ios.html  |   26 +-
 content/cn/references/android-apis.html |   26 +-
 content/cn/references/color-names.html  |   26 +-
 content/cn/references/common-event.html |   26 +-
 content/cn/references/common-style.html |   26 +-
 content/cn/references/components/a.html |   26 +-
 content/cn/references/components/cell.html  |   26 +-
 content/cn/references/components/div.html   |   26 +-
 content/cn/references/components/image.html |   26 +-
 content/cn/references/components/index.html |   26 +-
 content/cn/references/components/indicator.html |   26 +-
 content/cn/references/components/input.html |   26 +-
 content/cn/references/components/list.html  |   26 +-
 content/cn/references/components/loading.html   |   26 +-
 content/cn/references/components/refresh.html   |   26 +-
 content/cn/references/components/scroller.html  |   26 +-
 content/cn/references/components/slider.html|   26 +-
 content/cn/references/components/switch.html|   26 +-
 content/cn/references/components/text.html  |   26 +-
 content/cn/references/components/textarea.html  |   26 +-
 content/cn/references/components/video.html |   26 +-
 content/cn/references/components/waterfall.html | 1247 +-
 content/cn/references/components/web.html   |   26 +-
 content/cn/references/gesture.html  |   26 +-
 content/cn/references/html5-apis.html   |   26 +-
 content/cn/references/index.html|   26 +-
 content/cn/references/ios-apis.html |   26 +-
 content/cn/references/js-service/index.html |   26 +-
 content/cn/references/jsfm-apis.html|   26 +-
 content/cn/references/migration/difference.html |   26 +-
 content/cn/references/migration/index.html  |   26 +-
 .../migration/migration-from-weex.html  |   26 +-
 content/cn/references/modules/animation.html|   26 +-
 content/cn/references/modules/clipboard.html|   26 +-
 content/cn/references/modules/dom.html  |   26 +-
 content/cn/references/modules/globalevent.html  |   26 +-
 content/cn/references/modules/index.html|   26 +-
 content/cn/references/modules/modal.html|   26 +-
 content/cn/references/modules/navigator.html|   26 +-
 content/cn/references/modules/picker.html   |   26 +-
 content/cn/references/modules/storage.html  |   26 +-
 content/cn/references/modules/stream.html   |   26 +-
 content/cn/references/modules/websocket.html|   26 +-
 content/cn/references/modules/webview.html  |   26 +-
 content/cn/references/native-dom-api.html   |   26 +-
 content/cn/references/path.html |   26 +-
 content/cn/references/platform-difference.html  |   26 +-
 content/cn/references/text-style.html   |   26 +-
 content/cn/references/unit.html |   26 +-
 .../cn/references/vue/difference-of-vuex.html   |   26 +-
 .../cn/references/vue/difference-with-web.html  |   26 +-
 content/cn/references/vue/index.html|   26 +-
 content/cn/references/web-standards.html|   26 +-
 content/cn/references/weex-variable.html|   26 +-
 content/cn/v-0.10/references/api.html   |8 +-
 content/cn/v-0.10/references/cheatsheet.html|8 +-
 content/cn/v-0.10/references/color-names.html   |8 +-
 content/cn/v-0.10/references/common-attrs.html  |8 +-
 content/cn/v-0.10/references/common-event.html  |8 +-
 content/cn/v-0.10/references/common-style.html  |8 +-
 .../cn/v-0.10/references/component-defs.html|8 +-
 content/cn/v-0.10/references/components/a.html  |8 +-
 .../cn/v-0.10/references/components/cell.html   |8 +-
 .../cn/v-0.10/references/components/div.html|8 +-
 .../cn/v-0.10/references/components/image.html  |8 +-
 .../cn/v-0.10/references/components/index.html  |8 +-
 .../v-0.10/references/components/indicator.html |8 +-
 .../cn/v-0.10/references/components/input

[GitHub] incubator-weex issue #349: * [android] fixed issues #35. when a tag href is ...

Github user IskenHuang commented on the issue:

https://github.com/apache/incubator-weex/pull/349
  
@sospartan deprecated is ok. When href is empty string jump to current page 
logic the same with web. But web support href execute javascript. For example 
``. In this case when click on a component 
will to do nothing on web. But on iOS/Android will open a new page 
'javascript:void(0);'. It would be 404 page. When we want to get the same 
effect should be to do as below sample:

```
New page
New page

// or


export default {
methods: {
myAction() {
if(isGotoNewPage) 
weex.requireModule('navigator').push(this.myURL)
}
}
}
```

The a component's purpose is reduce js/native interactive times. But this 
changes it's not enough for real case.


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


[03/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/modules/webview.html
--
diff --git a/content/references/modules/webview.html 
b/content/references/modules/webview.html
index e8fad15..96b029f 100644
--- a/content/references/modules/webview.html
+++ b/content/references/modules/webview.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/native-dom-api.html
--
diff --git a/content/references/native-dom-api.html 
b/content/references/native-dom-api.html
index 773e078..ab0c78a 100644
--- a/content/references/native-dom-api.html
+++ b/content/references/native-dom-api.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+   

[07/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/content.json
--
diff --git a/content/content.json b/content/content.json
index 3e9e7a3..30ce0eb 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:  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=225556&sort
 =-id&colspec=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 when img.resize=contain b6272a2 * [android] fix npe in 
onScrollerListener (#138) 8

[01/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

Repository: incubator-weex-site
Updated Branches:
  refs/heads/asf-site cefd3b3ff -> 41aa574bb


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/v-0.10/references/text-style.html
--
diff --git a/content/v-0.10/references/text-style.html 
b/content/v-0.10/references/text-style.html
index a334ff0..dc0aaca 100644
--- a/content/v-0.10/references/text-style.html
+++ b/content/v-0.10/references/text-style.html
@@ -413,11 +413,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -853,11 +853,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   



[06/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/advanced/extend-jsfm.html
--
diff --git a/content/references/advanced/extend-jsfm.html 
b/content/references/advanced/extend-jsfm.html
index 81780d4..d977acc 100644
--- a/content/references/advanced/extend-jsfm.html
+++ b/content/references/advanced/extend-jsfm.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/advanced/extend-to-android.html
--
diff --git a/content/references/advanced/extend-to-android.html 
b/content/references/advanced/extend-to-android.html
index 66e6c17..86c89a0 100644
--- a/content/references/advanced/extend-to-android.html
+++ b/content/references/advanced/extend-to-android.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
  

[05/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/components/list.html
--
diff --git a/content/references/components/list.html 
b/content/references/components/list.html
index c126dd6..6847dda 100644
--- a/content/references/components/list.html
+++ b/content/references/components/list.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/components/refresh.html
--
diff --git a/content/references/components/refresh.html 
b/content/references/components/refresh.html
index 06f502d..5ed6198 100644
--- a/content/references/components/refresh.html
+++ b/content/references/components/refresh.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex 

[09/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/references/native-dom-api.html
--
diff --git a/content/cn/references/native-dom-api.html 
b/content/cn/references/native-dom-api.html
index 607ab74..d369671 100644
--- a/content/cn/references/native-dom-api.html
+++ b/content/cn/references/native-dom-api.html
@@ -440,6 +440,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -541,6 +546,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -570,11 +579,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1040,6 +1049,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1141,6 +1155,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1170,11 +1188,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/references/path.html
--
diff --git a/content/cn/references/path.html b/content/cn/references/path.html
index 244ec48..2f54d36 100644
--- a/content/cn/references/path.html
+++ b/content/cn/references/path.html
@@ -440,6 +440,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -541,6 +546,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -570,11 +579,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1040,6 +1049,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1141,6 +1155,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1170,11 +1188,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/references/platform-difference.html
--
diff --git a/content/cn/references/platform-difference.html 
b/content/cn/references/platform-difference.html
index 43202e1..d94fd23 100644
--- a/content/cn/references/platform-difference.html
+++ b/content/cn/references/platform-difference.html
@@ -440,6 +440,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -541,6 +546,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -570,11 +579,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1040,6 +1049,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1141,6 +1155,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1170,11 +1188,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/references/text-style.html
--
diff --git a/content/cn/references/text-style.html 
b/content/cn/references/text-style.html
index 239cbf7..bfa46c1 100644
--- a/content/cn/references/text-style.html
+++ b/content/cn/references/text-style.html
@@ -

[08/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/v-0.10/references/special-element.html
--
diff --git a/content/cn/v-0.10/references/special-element.html 
b/content/cn/v-0.10/references/special-element.html
index 6d92900..15393ca 100644
--- a/content/cn/v-0.10/references/special-element.html
+++ b/content/cn/v-0.10/references/special-element.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/v-0.10/references/specs/index.html
--
diff --git a/content/cn/v-0.10/references/specs/index.html 
b/content/cn/v-0.10/references/specs/index.html
index 2a7e207..2ca3b50 100644
--- a/content/cn/v-0.10/references/specs/index.html
+++ b/content/cn/v-0.10/references/specs/index.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/v-0.10/references/specs/js-framework-apis.html
--
diff --git a/content/cn/v-0.10/references/specs/js-framework-apis.html 
b/content/cn/v-0.10/references/specs/js-framework-apis.html
index af616d7..4c7aa5e 100644
--- a/content/cn/v-0.10/references/specs/js-framework-apis.html
+++ b/content/cn/v-0.10/references/specs/js-framework-apis.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/v-0.10/references/specs/virtual-dom-apis.html
--
diff --git a/content/cn/v-0.10/references/specs/virtual-dom-apis.html 
b/content/cn/v-0.10/references/specs/virtual-dom-apis.html
index 5b6f89d..e7bfe8a 100644
--- a/content/cn/v-0.10/references/specs/virtual-dom-apis.html
+++ b/content/cn/v-0.10/references/specs/virtual-dom-apis.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/v-0.10/references/text-style.html
--
diff --git a/content/cn/v-0.10/references/text-style.html 
b/content/cn/v-0.10/references/text-style.html
index 7bde480..d242caa 100644
--- a/content/cn/v-0.10/references/text-style.html
+++ b/content/cn/v-0.10/references/text-style.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/v-0.10/references/units.html
---

[04/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/index.html
--
diff --git a/content/references/index.html b/content/references/index.html
index 6eed8f5..86e36e3 100644
--- a/content/references/index.html
+++ b/content/references/index.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/references/ios-apis.html
--
diff --git a/content/references/ios-apis.html b/content/references/ios-apis.html
index ce95b87..066ef4f 100644
--- a/content/references/ios-apis.html
+++ b/content/references/ios-apis.html
@@ -435,6 +435,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -532,6 +537,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -557,19 +566,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -685,12 +694,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   
@@ -1026,6 +1035,11 @@
 
   
 
+  
+  
+
+  
+

 
   
@@ -1123,6 +1137,10 @@
   
 
   
+
+  
+
+  
 
   
 
@@ -1148,19 +1166,19 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1276,12 +1294,12 @@
   
 
   
-Migration
+Platform 
Differences Between Weex and Web
 
   
 
   
-Platform Differences Between Weex and Web
+Migration
   
 
   

http://git-wip-us.ap

[10/11] incubator-weex-site git commit: Site updated: 2017-05-17 16:58:12

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/41aa574b/content/cn/references/components/waterfall.html
--
diff --git a/content/cn/references/components/waterfall.html 
b/content/cn/references/components/waterfall.html
index 2c83192..1cdb3d1 100644
--- a/content/cn/references/components/waterfall.html
+++ b/content/cn/references/components/waterfall.html
@@ -3,18 +3,18 @@
 
   
   
-  Weex
+   | Weex
   
-  
+  
 
-
+
 https://weex.apache.org/cn/references/components/waterfall.html";>
 
-
-
+
+
 
-
-
+
+
   
 
   
@@ -28,10 +28,10 @@
   
 
 
-
+
   
   
-window.PAGE_TYPE = "cn/references/components/waterfall";
+window.PAGE_TYPE = "references";
 window.ROOT = "/"
   
   
@@ -117,9 +117,7 @@
   
   
 
-  
-
-  
+  

 
 
@@ -127,48 +125,607 @@
   
   
 
-
-
-  
-教程
-  
-
-
-  
-手册
-  
-
-
-  
-FAQ
-  
-
-
-工具和服务
-
+  
+
+
+  
+  
+v2.x
+v1.x
+  
+ 
+
+
+  
+
+  手册
+
+  
+  
+
+
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+   
+
+  
+通用特性
+
+  
+
   
-Playground
+iOS APIs
   
+
   
-Devtools
+Android APIs
   
+
   
-Weexpack
+HTML5 APIs
   
+
   
-http://dotwe.org"; target="_blank">Snippets
+JS Framework APIs
   
+
   
-https://market.dotwe.org"; target="_blank">Market
+通用样式
   
-
-
-
-  https://github.com/apache/incubator-weex/"; target="_blank">
-GitHub
-  
-
-  
+
+  
+文本样式
+  
+
+  
+颜色名称列表
+  
+
+  
+手势
+  
+
+  
+Path 
(英)
+  
+
+  
+
+  
+
+  
+内
建组件
+
+  
+
+  
+
+  
+
+  
+<

[2/4] incubator-weex git commit: * [doc] update changes doc since 0.10

* [doc] update changes doc since 0.10


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

Branch: refs/heads/dev
Commit: f4a57cc5a2efe3c259607d929c546b936c909682
Parents: 5c72f20
Author: moxun.ljf 
Authored: Wed Mar 29 11:46:51 2017 +0800
Committer: moxun.ljf 
Committed: Wed Mar 29 11:46:51 2017 +0800

--
 doc/source/cn/references/components/list.md | 13 +
 doc/source/cn/references/components/scroller.md | 16 +++-
 doc/source/cn/references/components/slider.md   |  8 
 doc/source/cn/references/modules/dom.md |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4a57cc5/doc/source/cn/references/components/list.md
--
diff --git a/doc/source/cn/references/components/list.md 
b/doc/source/cn/references/components/list.md
index 4055fe3..3cc3049 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -42,6 +42,7 @@ version: 2.1
 ## 特性
 
 - `loadmoreoffset {number}`:默认值为 0,触发 `loadmore` 
事件所需要的垂直偏移距离(设备屏幕底部与 `` 
底部之间的距离)。当 `` 的滚动条滚动到足够接近 
`` 底部时将会触发 `loadmore` 这个事件。
+- `offset-accuracy {number}` 0.11+:控制`onscroll`事件触发的频率,默认值为10,表示两次`onscroll`事件之间列表至少滚动了10px。注意,将该值设置为较小的数值会提高滚动事件采æ
 ·çš„精度,但同时也会降低页面的性能。
 
 ## 样式
 
@@ -59,6 +60,15 @@ version: 2.1
 
 - `loadmore` 0.5+:如果列表滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
 - `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
+  
+  事件中 event 对象属性:
+  - `contentSize {Object}`:列表的内容尺寸
+- `width {number}`: 列表内容宽度
+- `height {number}`: 列表内容高度
+  - `contentOffset {Object}`: 列表的偏移尺寸
+- `x {number}`: x轴上的偏移量
+- `y {number}`: y轴上的偏移量
+
 - 通用事件
 
   支持所有通用事件:
@@ -76,6 +86,9 @@ version: 2.1
 
 滚动到列表某个指定项是常见需求,`` 
拓展了该功能支持滚动到指定 ``。通过 `dom` module 
访问,更多信息可参考 [dom module](../modules/dom.html) 。
 
+### resetLoadmore() 0.9+
+在默认情况下,触发`loadmore`事件后,如果列表中内
容没有发生变更,则下一次滚动到列表末尾时将不会再次触发`loadmore`事件,ä½
 å¯ä»¥é€šè¿‡è°ƒç”¨`resetLoadmore()`方法来打ç 
´è¿™ä¸€é™åˆ¶ï¼Œè°ƒç”¨è¯¥æ–¹æ³•åŽï¼Œä¸‹ä¸€æ¬¡æ»šåŠ¨åˆ°åˆ—表末尾时将强制触发`loadmore`。
+
  参数
 
 - `node {node}`:指定目标节点。

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4a57cc5/doc/source/cn/references/components/scroller.md
--
diff --git a/doc/source/cn/references/components/scroller.md 
b/doc/source/cn/references/components/scroller.md
index 297f712..175b3f7 100644
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@ -41,7 +41,8 @@ version: 2.1
 
   ![mobile_preview](../images/scroller_1.jpg)
 
-- `loadmoreretry {number}`:默认值为 0,当 `loadmore` 
失败时是否重置 `loadmore` 相关的 UI,值不一样就会重置。
+- ~~`loadmoreretry {number}`:默认值为 0,当 `loadmore` 
失败时是否重置 `loadmore` 相关的 UI,值不一样就会重置。~~ 
该属性已废弃,请使用`resetLoadmore()`函数实现重置`loadmore`的操作。
+- `offset-accuracy {number}` 0.11+:控制`onscroll`事件触发的频率,默认值为10,表示两次`onscroll`事件之间列表至少滚动了10px。注意,将该值设置为较小的数值会提高滚动事件采æ
 ·çš„精度,但同时也会降低页面的性能。
 
 ## 样式
 
@@ -58,6 +59,16 @@ version: 2.1
 ## 事件
 
 - `loadmore` v0.5+:如果滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
+- `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
+
+  事件中 event 对象属性:

[3/4] incubator-weex git commit: Merge branch 'example-feature-scroll' of github.com:misakuo/incubator-weex into 0.11-dev

Merge branch 'example-feature-scroll' of github.com:misakuo/incubator-weex into 
0.11-dev


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

Branch: refs/heads/dev
Commit: c4fa292f00f2637a6a92760f56b0d41db6601c8d
Parents: bbb120d f4a57cc
Author: tancy 
Authored: Wed May 17 15:15:53 2017 +0800
Committer: tancy 
Committed: Wed May 17 15:15:53 2017 +0800

--
 doc/source/cn/references/components/list.md | 13 +
 doc/source/cn/references/components/scroller.md | 16 +++-
 doc/source/cn/references/components/slider.md   |  8 
 doc/source/cn/references/modules/dom.md |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--




[1/4] incubator-weex git commit: Update list.md

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 855f69bbb -> 5675ef71f


Update list.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/5c72f20e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5c72f20e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5c72f20e

Branch: refs/heads/dev
Commit: 5c72f20ee85a6eea22d56a4a4fe0dd63c8435f2b
Parents: a396e7c
Author: moxun 
Authored: Wed Mar 29 11:03:58 2017 +0800
Committer: GitHub 
Committed: Wed Mar 29 11:03:58 2017 +0800

--
 doc/source/cn/references/components/list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c72f20e/doc/source/cn/references/components/list.md
--
diff --git a/doc/source/cn/references/components/list.md 
b/doc/source/cn/references/components/list.md
index 335eef3..4055fe3 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -58,7 +58,7 @@ version: 2.1
 ## 事件
 
 - `loadmore` 0.5+:如果列表滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
-
+- `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
 - 通用事件
 
   支持所有通用事件:



[4/4] incubator-weex git commit: * [doc] merge scroller&dom&slider file update

* [doc] merge scroller&dom&slider file update


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

Branch: refs/heads/dev
Commit: 5675ef71f23ba5a15ec1b852f002db860b765220
Parents: 855f69b c4fa292
Author: tancy 
Authored: Wed May 17 16:52:23 2017 +0800
Committer: tancy 
Committed: Wed May 17 16:52:23 2017 +0800

--
 doc/source/cn/references/components/list.md | 13 +
 doc/source/cn/references/components/scroller.md | 15 +--
 doc/source/cn/references/components/slider.md   | 11 +--
 doc/source/cn/references/modules/dom.md |  5 +++--
 4 files changed, 34 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5675ef71/doc/source/cn/references/components/list.md
--
diff --cc doc/source/cn/references/components/list.md
index e6cd20a,3cc3049..7c8b2b2
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@@ -42,10 -42,8 +42,11 @@@ version: 2.
  ## 特性
  
  - `loadmoreoffset {number}`:默认值为 0,触发 `loadmore` 
事件所需要的垂直偏移距离(设备屏幕底部与 `` 
底部之间的距离)。当 `` 的滚动条滚动到足够接近 
`` 底部时将会触发 `loadmore` 这个事件。
+ - `offset-accuracy {number}` 0.11+:控制`onscroll`事件触发的频率,默认值为10,表示两次`onscroll`事件之间列表至少滚动了10px。注意,将该值设置为较小的数值会提高滚动事件采æ
 ·çš„精度,但同时也会降低页面的性能。
  
 +  ![mobile_preview](../images/list_4.jpg)
 +
 +- `offset-accuracy`:默认值是0,触发 `scroll` 
事件所需要的垂直偏移距离。
  ## 样式
  
  - 通用样式:支持所有通用样式
@@@ -61,13 -59,16 +62,22 @@@
  ## 事件
  
  - `loadmore` 0.5+:如果列表滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
+ - `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
+   
+   事件中 event 对象属性:
+   - `contentSize {Object}`:列表的内容尺寸
+ - `width {number}`: 列表内容宽度
+ - `height {number}`: 列表内容高度
+   - `contentOffset {Object}`: 列表的偏移尺寸
+ - `x {number}`: x轴上的偏移量
+ - `y {number}`: y轴上的偏移量
  
 +  [体验一下](http://dotwe.org/bc445ede8746a31360e3607d210304c5)
 +
 +- `scroll` 0.12+:列表滚动时触发这个事件。此事件回调中会给出当前`contentOffset`值。
 +
 +  [体验一下](http://dotwe.org/weex/5837c1b7f1f69e5adf1fc4cac0747c34)
 +
  - 通用事件
  
支持所有通用事件:

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5675ef71/doc/source/cn/references/components/scroller.md
--
diff --cc doc/source/cn/references/components/scroller.md
index 4a9c374,175b3f7..dd74525
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@@ -42,10 -41,9 +42,11 @@@ version: 2.
  
![mobile_preview](../images/scroller_1.jpg)
  
- - `loadmoreretry {number}`:默认值为 0,当 `loadmore` 
失败时是否重置 `loadmore` 相关的 UI,值不一样就会重置。
+ - ~~`loadmoreretry {number}`:默认值为 0,当 `loadmore` 
失败时是否重置 `loadmore` 相关的 UI,值不一样就会重置。~~ 
该属性已废弃,请使用`resetLoadmore()`函数实现重置`loadmore`的操作。
+ - `offset-accuracy {number}` 0.11+:控制`onscroll`事件触发的频率,默认值为10,表示两次`onscroll`事件之间列表至少滚动了10px。注意,将该值设置为较小的数值会提高滚动事件采æ
 ·çš„精度,但同时也会降低页面的性能。
  
 +- `offset-accuracy`:默认值是0,触发 `scroll` 
事件所需要的垂直偏移距离。
 +
  ## 样式
  
  - 通用样式:支持所有通用样式
@@@ -61,8 -59,15 +62,15 @@@
  ## 事件
  
  - `loadmore` v0.5+:如果滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
 -- `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
++- `scroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º1

[5/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/modules/animation.html
--
diff --git a/content/cn/references/modules/animation.html 
b/content/cn/references/modules/animation.html
index f0778c8..414ddb2 100644
--- a/content/cn/references/modules/animation.html
+++ b/content/cn/references/modules/animation.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/modules/clipboard.html
--
diff --git a/content/cn/references/modules/clipboard.html 
b/content/cn/references/modules/clipboard.html
index b63c46d..905f3b4 100644
--- a/content/cn/references/modules/clipboard.html
+++ b/content/cn/references/modules/clipboard.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs

[8/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

Site updated: 2017-05-17 16:52:49


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/cefd3b3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/cefd3b3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/cefd3b3f

Branch: refs/heads/asf-site
Commit: cefd3b3ffde72ea6351aa33f3f7c878d32489518
Parents: a9487e9
Author: tancy 
Authored: Wed May 17 16:52:50 2017 +0800
Committer: tancy 
Committed: Wed May 17 16:52:50 2017 +0800

--
 content/cn/references/advanced/extend-jsfm.html | 40 -
 .../references/advanced/extend-to-android.html  | 40 -
 .../cn/references/advanced/extend-to-html5.html | 40 -
 .../cn/references/advanced/extend-to-ios.html   | 40 -
 content/cn/references/advanced/index.html   | 40 -
 .../advanced/integrate-devtool-to-android.html  | 40 -
 .../advanced/integrate-devtool-to-ios.html  | 40 -
 content/cn/references/android-apis.html | 40 -
 content/cn/references/color-names.html  | 40 -
 content/cn/references/common-event.html | 40 -
 content/cn/references/common-style.html | 40 -
 content/cn/references/components/a.html | 40 -
 content/cn/references/components/cell.html  | 40 -
 content/cn/references/components/div.html   | 40 -
 content/cn/references/components/image.html | 40 -
 content/cn/references/components/index.html | 40 -
 content/cn/references/components/indicator.html | 40 -
 content/cn/references/components/input.html | 40 -
 content/cn/references/components/list.html  | 40 -
 content/cn/references/components/loading.html   | 40 -
 content/cn/references/components/refresh.html   | 40 -
 content/cn/references/components/scroller.html  | 67 ++
 content/cn/references/components/slider.html| 94 ++--
 content/cn/references/components/switch.html| 40 -
 content/cn/references/components/text.html  | 40 -
 content/cn/references/components/textarea.html  | 40 -
 content/cn/references/components/video.html | 40 -
 content/cn/references/components/web.html   | 40 -
 content/cn/references/gesture.html  | 40 -
 content/cn/references/html5-apis.html   | 40 -
 content/cn/references/index.html| 40 -
 content/cn/references/ios-apis.html | 40 -
 content/cn/references/js-service/index.html | 40 -
 content/cn/references/jsfm-apis.html| 40 -
 content/cn/references/migration/difference.html | 40 -
 content/cn/references/migration/index.html  | 40 -
 .../migration/migration-from-weex.html  | 40 -
 content/cn/references/modules/animation.html| 40 -
 content/cn/references/modules/clipboard.html| 40 -
 content/cn/references/modules/dom.html  | 68 ++
 content/cn/references/modules/globalevent.html  | 40 -
 content/cn/references/modules/index.html| 40 -
 content/cn/references/modules/modal.html| 40 -
 content/cn/references/modules/navigator.html| 40 -
 content/cn/references/modules/picker.html   | 40 -
 content/cn/references/modules/storage.html  | 40 -
 content/cn/references/modules/stream.html   | 40 -
 content/cn/references/modules/websocket.html| 40 -
 content/cn/references/modules/webview.html  | 40 -
 content/cn/references/native-dom-api.html   | 40 -
 content/cn/references/path.html | 40 -
 content/cn/references/platform-difference.html  | 40 -
 content/cn/references/text-style.html   | 40 -
 content/cn/references/unit.html | 40 -
 .../cn/references/vue/difference-of-vuex.html   | 40 -
 .../cn/references/vue/difference-with-web.html  | 40 -
 content/cn/references/vue/index.html| 40 -
 content/cn/references/web-standards.html| 40 -
 content/cn/references/weex-variable.html| 40 -
 content/cn/v-0.10/references/api.html   |  8 +-
 content/cn/v-0.10/references/cheatsheet.html|  8 +-
 content/cn/v-0.10/references/color-names.html   |  8 +-
 content/cn/v-0.10/references/common-attrs.html  |  8 +-
 content/cn/v-0.10/references/common-event.html  |  8 +-
 content/cn/v-0.10/references/common-style.html  |  8 +-
 .../cn/v-0.10/references/component-defs.html|  8 +-
 content/cn/v-0.10/references/components/a.html  |  8 +-
 .../cn/v-0.10/references/components/cell.html   |  8 +-
 .../cn/v-0.10/references/components/div.html|  8 +

[2/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/content.json
--
diff --git a/content/content.json b/content/content.json
index 2a19e1a..3e9e7a3 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:  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=225556&sort
 =-id&colspec=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 when img.resize=contain b6272a2 * [android] fix npe in 
onScrollerListener (#138) 8

[6/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/components/text.html
--
diff --git a/content/cn/references/components/text.html 
b/content/cn/references/components/text.html
index 4fd0dec..c15781f 100644
--- a/content/cn/references/components/text.html
+++ b/content/cn/references/components/text.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/components/textarea.html
--
diff --git a/content/cn/references/components/textarea.html 
b/content/cn/references/components/textarea.html
index 61da480..b616aca 100644
--- a/content/cn/references/components/textarea.html
+++ b/content/cn/references/components/textarea.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs

[1/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

Repository: incubator-weex-site
Updated Branches:
  refs/heads/asf-site a9487e967 -> cefd3b3ff


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/v-0.10/references/api.html
--
diff --git a/content/v-0.10/references/api.html 
b/content/v-0.10/references/api.html
index fbae62f..5bc4b70 100644
--- a/content/v-0.10/references/api.html
+++ b/content/v-0.10/references/api.html
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/v-0.10/references/color-names.html
--
diff --git a/content/v-0.10/references/color-names.html 
b/content/v-0.10/references/color-names.html
index cdde34b..c4768b8 100644
--- a/content/v-0.10/references/color-names.html
+++ b/content/v-0.10/references/color-names.html
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/v-0.10/references/common-attrs.html
--
diff --git a/content/v-0.10/references/common-attrs.html 
b/content/v-0.10/references/common-attrs.html
index bc648ed..2427569 100644
--- a/content/v-0.10/references/common-attrs.html
+++ b/content/v-0.10/references/common-attrs.html
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/v-0.10/references/common-event.html
--
diff --git a/content/v-0.10/references/common-event.html 
b/content/v-0.10/references/common-event.html
index 150dc62..50a5e29 100644
--- a/content/v-0.10/references/common-event.html
+++ b/content/v-0.10/references/common-event.html
@@ -490,11 +490,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/v-0.10/references/common-style.html
--
diff --git a/content/v-0.10/references/common-style.html 
b/content/v-0.10/references/common-style.html
index 4c73277..d82e74d 100644
--- a/content/v-0.10/references/common-style.html
+++ b/content/v-0.10/references/common-style.html
@@ -495,11 +495,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   
@@ -935,11 +935,11 @@
   
 
   
-globalEvent
+animation
   
 
   
-animation
+globalEvent
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/v-0.10/references/component-defs.html
--

[4/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/modules/websocket.html
--
diff --git a/content/cn/references/modules/websocket.html 
b/content/cn/references/modules/websocket.html
index 7d50ade..f23413d 100644
--- a/content/cn/references/modules/websocket.html
+++ b/content/cn/references/modules/websocket.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/modules/webview.html
--
diff --git a/content/cn/references/modules/webview.html 
b/content/cn/references/modules/webview.html
index 9dc0d3d..f74f2ff 100644
--- a/content/cn/references/modules/webview.html
+++ b/content/cn/references/modules/webview.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs
+ 

[3/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/v-0.10/references/component-defs.html
--
diff --git a/content/cn/v-0.10/references/component-defs.html 
b/content/cn/v-0.10/references/component-defs.html
index 2c394d2..0360308 100644
--- a/content/cn/v-0.10/references/component-defs.html
+++ b/content/cn/v-0.10/references/component-defs.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/v-0.10/references/components/a.html
--
diff --git a/content/cn/v-0.10/references/components/a.html 
b/content/cn/v-0.10/references/components/a.html
index fda583e..a957fac 100644
--- a/content/cn/v-0.10/references/components/a.html
+++ b/content/cn/v-0.10/references/components/a.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/v-0.10/references/components/cell.html
--
diff --git a/content/cn/v-0.10/references/components/cell.html 
b/content/cn/v-0.10/references/components/cell.html
index 4bc48d1..beb4367 100644
--- a/content/cn/v-0.10/references/components/cell.html
+++ b/content/cn/v-0.10/references/components/cell.html
@@ -429,11 +429,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -893,11 +893,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/v-0.10/references/components/div.html
--
diff --git a/content/cn/v-0.10/references/components/div.html 
b/content/cn/v-0.10/references/components/div.html
index f3cfeb1..edb8bee 100644
--- a/content/cn/v-0.10/references/components/div.html
+++ b/content/cn/v-0.10/references/components/div.html
@@ -430,11 +430,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -894,11 +894,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/v-0.10/references/components/image.html
--
diff --git a/content/cn/v-0.10/references/components/image.html 
b/content/cn/v-0.10/references/components/image.html
index f9ee3c2..e4121ad 100644
--- a/content/cn/v-0.10/references/components/image.html
+++ b/content/cn/v-0.10/references/components/image.html
@@ -430,11 +430,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -894,11 +894,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/v-0.10/references/components/index.html
--

[7/8] incubator-weex-site git commit: Site updated: 2017-05-17 16:52:49

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/components/cell.html
--
diff --git a/content/cn/references/components/cell.html 
b/content/cn/references/components/cell.html
index 456c399..287da36 100644
--- a/content/cn/references/components/cell.html
+++ b/content/cn/references/components/cell.html
@@ -456,11 +456,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -533,11 +533,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -694,12 +694,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1133,11 +1133,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -1294,12 +1294,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/cefd3b3f/content/cn/references/components/div.html
--
diff --git a/content/cn/references/components/div.html 
b/content/cn/references/components/div.html
index df159fd..75cb742 100644
--- a/content/cn/references/components/div.html
+++ b/content/cn/references/components/div.html
@@ -458,11 +458,11 @@
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
@@ -499,11 +499,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -535,11 +535,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -572,11 +572,11 @@
   
 
   
-picker
+WebSocket
   
 
   
-WebSocket
+picker
   
 
   
@@ -696,12 +696,12 @@
   
 
   
-迁移
+Weex 和 
Web 平台的差异
 
   
 
   
-Weex 和 Web 平台的差异
+迁移
   
 
   
@@ -1058,11 +1058,11 @@
   
 
   
-JS Framework APIs
+HTML5 AP

[GitHub] incubator-weex issue #349: * [android] fixed issues #35. when a tag href is ...

Github user sospartan commented on the issue:

https://github.com/apache/incubator-weex/pull/349
  
Already fixed by 
https://github.com/apache/incubator-weex/commit/eeaf303aecc091d37d8b6d9b16d88dd5e5c97ed2

Sorry, @IskenHuang your PR is deprecated 🐶 


---
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 #355: * [doc] update water fall doc format

Github user weex-bot commented on the issue:

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

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 55.165 (55.246) seconds

  



  Generated by :no_entry_sign: http://danger.systems/";>danger




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


[07/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/v-0.10/references/components/list.html
--
diff --git a/content/cn/v-0.10/references/components/list.html 
b/content/cn/v-0.10/references/components/list.html
index 85d2bb3..23ddf6b 100644
--- a/content/cn/v-0.10/references/components/list.html
+++ b/content/cn/v-0.10/references/components/list.html
@@ -430,11 +430,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -466,11 +466,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -894,11 +894,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/v-0.10/references/components/loading.html
--
diff --git a/content/cn/v-0.10/references/components/loading.html 
b/content/cn/v-0.10/references/components/loading.html
index ec909d1..26cbc9f 100644
--- a/content/cn/v-0.10/references/components/loading.html
+++ b/content/cn/v-0.10/references/components/loading.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/v-0.10/references/components/refresh.html
--
diff --git a/content/cn/v-0.10/references/components/refresh.html 
b/content/cn/v-0.10/references/components/refresh.html
index 7ea3a7a..1c0062a 100644
--- a/content/cn/v-0.10/references/components/refresh.html
+++ b/content/cn/v-0.10/references/components/refresh.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/v-0.10/references/components/scroller.html
--
diff --git a/content/cn/v-0.10/references/components/scroller.html 
b/content/cn/v-0.10/references/components/scroller.html
index b0d3d91..a3bc539 100644
--- a/content/cn/v-0.10/references/components/scroller.html
+++ b/content/cn/v-0.10/references/components/scroller.html
@@ -430,11 +430,11 @@
   
 
  

[09/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/index.html
--
diff --git a/content/cn/references/index.html b/content/cn/references/index.html
index e522a03..71797d2 100644
--- a/content/cn/references/index.html
+++ b/content/cn/references/index.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/ios-apis.html
--
diff --git a/content/cn/references/ios-apis.html 
b/content/cn/references/ios-apis.html
index 15ccf31..68146f3 100644
--- a/content/cn/references/ios-apis.html
+++ b/content/cn/references/ios-apis.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/js-service/index.html
--
diff --git a/content/cn/references/js-service/index.html 
b/content/cn/references/js-service/index.html
index ea54b52..82ab290 100644
--- a/content/cn/references/js-service/index.html
+++ b/content/cn/references/js-service/index.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

[03/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/components/text.html
--
diff --git a/content/references/components/text.html 
b/content/references/components/text.html
index d989af9..9fdd4d5 100644
--- a/content/references/components/text.html
+++ b/content/references/components/text.html
@@ -11,7 +11,7 @@
 https://weex.apache.org/references/components/text.html";>
 
 
-
+
 
 
 
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,12 +1276,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1312,7 +1312,7 @@
   
 
   
-  Updated time: 
17/05/2017
+  Updated time: 
17/05/2017
 
 The weex builtin component 
‘text’ is used to render text with specified style rule.  tag can 
contain text value only. You can use variable interpolation in the text content 
with the mark {{}}.
 Child ComponentsThis component supports no 
child components.

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/components/textarea.html
--
diff --git a/content/references/components/textarea.html 
b/content/references/components/textarea.html
index e0e9b18..ef37458 100644
--- a/content/references/components/textarea.html
+++ b/content/references/components/textarea.html
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,12 +1276,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/components/video.html
--
diff --git a/content/references/components/video.html 
b/content/references/components/video.html
index 6a45b0a..8f1282c 100644
--- a/content/references/components/video.html
+++ b/content/references/components/video.html
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,12 +1276,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web

[11/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

Site updated: 2017-05-17 15:18:14


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/a9487e96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/a9487e96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/a9487e96

Branch: refs/heads/asf-site
Commit: a9487e967e669b1d37c68d0a7598debe788b528c
Parents: 1320397
Author: tancy 
Authored: Wed May 17 15:18:15 2017 +0800
Committer: tancy 
Committed: Wed May 17 15:18:15 2017 +0800

--
 content/cn/guide/integrate-to-your-app.html |  4 +-
 content/cn/guide/set-up-env.html|  4 +-
 content/cn/guide/tools/index.html   |  4 +-
 content/cn/guide/tools/toolkit.html |  4 +-
 content/cn/references/advanced/extend-jsfm.html | 24 +++
 .../references/advanced/extend-to-android.html  | 24 +++
 .../cn/references/advanced/extend-to-html5.html | 24 +++
 .../cn/references/advanced/extend-to-ios.html   | 28 
 content/cn/references/advanced/index.html   | 24 +++
 .../advanced/integrate-devtool-to-android.html  | 24 +++
 .../advanced/integrate-devtool-to-ios.html  | 24 +++
 content/cn/references/android-apis.html | 24 +++
 content/cn/references/color-names.html  | 24 +++
 content/cn/references/common-event.html | 24 +++
 content/cn/references/common-style.html | 28 
 content/cn/references/components/a.html | 24 +++
 content/cn/references/components/cell.html  | 24 +++
 content/cn/references/components/div.html   | 24 +++
 content/cn/references/components/image.html | 24 +++
 content/cn/references/components/index.html | 24 +++
 content/cn/references/components/indicator.html | 24 +++
 content/cn/references/components/input.html | 28 
 content/cn/references/components/list.html  | 48 -
 content/cn/references/components/loading.html   | 24 +++
 content/cn/references/components/refresh.html   | 28 
 content/cn/references/components/scroller.html  | 66 -
 content/cn/references/components/slider.html| 75 +++-
 content/cn/references/components/switch.html| 24 +++
 content/cn/references/components/text.html  | 28 
 content/cn/references/components/textarea.html  | 24 +++
 content/cn/references/components/video.html | 24 +++
 content/cn/references/components/waterfall.html |  4 +-
 content/cn/references/components/web.html   | 28 
 content/cn/references/gesture.html  | 24 +++
 content/cn/references/html5-apis.html   | 24 +++
 content/cn/references/index.html| 24 +++
 content/cn/references/ios-apis.html | 24 +++
 content/cn/references/js-service/index.html | 24 +++
 content/cn/references/jsfm-apis.html| 24 +++
 content/cn/references/migration/difference.html | 24 +++
 content/cn/references/migration/index.html  | 24 +++
 .../migration/migration-from-weex.html  | 24 +++
 content/cn/references/modules/animation.html| 24 +++
 content/cn/references/modules/clipboard.html| 24 +++
 content/cn/references/modules/dom.html  | 48 -
 content/cn/references/modules/globalevent.html  | 28 
 content/cn/references/modules/index.html| 24 +++
 content/cn/references/modules/modal.html| 28 
 content/cn/references/modules/navigator.html| 24 +++
 content/cn/references/modules/picker.html   | 24 +++
 content/cn/references/modules/storage.html  | 24 +++
 content/cn/references/modules/stream.html   | 24 +++
 content/cn/references/modules/websocket.html| 24 +++
 content/cn/references/modules/webview.html  | 28 
 content/cn/references/native-dom-api.html   | 24 +++
 content/cn/references/path.html | 24 +++
 content/cn/references/platform-difference.html  | 24 +++
 content/cn/references/text-style.html   | 24 +++
 content/cn/references/unit.html | 24 +++
 .../cn/references/vue/difference-of-vuex.html   | 24 +++
 .../cn/references/vue/difference-with-web.html  | 24 +++
 content/cn/references/vue/index.html| 24 +++
 content/cn/references/web-standards.html| 24 +++
 content/cn/references/weex-variable.html| 24 +++
 content/cn/releasenote.html |  4 +-
 content/cn/v-0.10/references/api.html   | 16 ++---
 content/cn/v-0.10/references/cheatsheet.html| 16 ++---
 content/cn/v-0.10/references/color-names.html   | 16 ++---
 content/cn/v-0.10/references/common-attrs.html  | 16 ++---
 content/cn/v-0.10/references/common-event.html  | 16 ++---
 content/cn/v-0.10/re

[01/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

Repository: incubator-weex-site
Updated Branches:
  refs/heads/asf-site 1320397e3 -> a9487e967


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/v-0.10/references/modules/navigator.html
--
diff --git a/content/v-0.10/references/modules/navigator.html 
b/content/v-0.10/references/modules/navigator.html
index bce9759..17738ec 100644
--- a/content/v-0.10/references/modules/navigator.html
+++ b/content/v-0.10/references/modules/navigator.html
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/v-0.10/references/modules/storage.html
--
diff --git a/content/v-0.10/references/modules/storage.html 
b/content/v-0.10/references/modules/storage.html
index 7cca4ff..af62773 100644
--- a/content/v-0.10/references/modules/storage.html
+++ b/content/v-0.10/references/modules/storage.html
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/v-0.10/references/modules/stream.html
--
diff --git a/content/v-0.10/references/modules/stream.html 
b/content/v-0.10/references/modules/stream.html
index b1aec58..8cb4f6b 100644
--- a/content/v-0.10/references/modules/stream.html
+++ b/content/v-0.10/references/modules/stream.html
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/v-0.10/references/modules/timer.html
--
diff --git a/content/v-0.10/references/modules/timer.html 
b/content/v-0.10/references/modules/timer.html
index a5ad4bd..58a2f44 100644
--- a/content/v-0.10/references/modules/timer.html
+++ b/content/v-0.10/references/modules/timer.html
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/v-0.10/references/modules/webview.html
--
diff --git a/content/v-0.10/references/modules/webview.html 
b/content/v-0.10/references/modules/webview.html
index ff01d67..76204dc 100644
--- a/content/v-0.10/references/modules/webview.html
+++ b/content/v-0.10/references/modules/webview.html
@@ -490,11 +490,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   
@@ -930,11 +930,11 @@
   
 
   
-animation
+globalEvent
   
 
   
-globalEvent
+animation
   
 
   

http://git-wip-us.apache.org/repos/as

[06/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/v-0.10/references/wxc/wxc-navpage.html
--
diff --git a/content/cn/v-0.10/references/wxc/wxc-navpage.html 
b/content/cn/v-0.10/references/wxc/wxc-navpage.html
index 6249e3c..fa14780 100644
--- a/content/cn/v-0.10/references/wxc/wxc-navpage.html
+++ b/content/cn/v-0.10/references/wxc/wxc-navpage.html
@@ -429,11 +429,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -465,11 +465,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -893,11 +893,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -929,11 +929,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/v-0.10/references/wxc/wxc-tabbar.html
--
diff --git a/content/cn/v-0.10/references/wxc/wxc-tabbar.html 
b/content/cn/v-0.10/references/wxc/wxc-tabbar.html
index 3a62dcd..21b8828 100644
--- a/content/cn/v-0.10/references/wxc/wxc-tabbar.html
+++ b/content/cn/v-0.10/references/wxc/wxc-tabbar.html
@@ -427,11 +427,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -463,11 +463,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -891,11 +891,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -927,11 +927,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   



[02/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/native-dom-api.html
--
diff --git a/content/references/native-dom-api.html 
b/content/references/native-dom-api.html
index 74b696c..773e078 100644
--- a/content/references/native-dom-api.html
+++ b/content/references/native-dom-api.html
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,12 +1276,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/path.html
--
diff --git a/content/references/path.html b/content/references/path.html
index 67f2d04..70f0f33 100644
--- a/content/references/path.html
+++ b/content/references/path.html
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,12 +1276,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/platfrom-difference.html
--
diff --git a/content/references/platfrom-difference.html 
b/content/references/platfrom-difference.html
index ce5950b..8873c8f 100644
--- a/content/references/platfrom-difference.html
+++ b/content/references/platfrom-difference.html
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,12 +1276,12 @@
   
 
   
-Platform Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/text-style.html
--
diff --git a/content/references/text-style.html 
b/content/references/text-style.html
index 7e729f7..0071cd1 100644
--- a/content/references/text-style.html
+++ b/content/references/text-style.html
@@ -488,11 +488,11 @@
   
 
   
-
+

[04/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/examples/dom-rect.html
--
diff --git a/content/examples/dom-rect.html b/content/examples/dom-rect.html
index 112cdc3..164d859 100644
--- a/content/examples/dom-rect.html
+++ b/content/examples/dom-rect.html
@@ -11,7 +11,7 @@
 https://weex.apache.org/examples/dom-rect.html";>
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/guide/integrate-to-your-app.html
--
diff --git a/content/guide/integrate-to-your-app.html 
b/content/guide/integrate-to-your-app.html
index a52ff2c..391db21 100644
--- a/content/guide/integrate-to-your-app.html
+++ b/content/guide/integrate-to-your-app.html
@@ -11,7 +11,7 @@
 https://weex.apache.org/guide/integrate-to-your-app.html";>
 
 
-
+
 
 
 
@@ -462,7 +462,7 @@
   
 
   
-  Updated time: 
28/04/2017
+  Updated time: 
17/05/2017
 
 Integrate to Your 
AppIntegrate to 
AndroidTip:The following documents assume that you already have a 
certain Android development experience.
 Android has two ways to 
integrate weex1.using source code: Can quickly use the latest features 
of WEEX, according to your own characteristics of the project. So, you can do 
some related improvements.

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/guide/set-up-env.html
--
diff --git a/content/guide/set-up-env.html b/content/guide/set-up-env.html
index 02d2ea4..55fea1a 100644
--- a/content/guide/set-up-env.html
+++ b/content/guide/set-up-env.html
@@ -12,7 +12,7 @@
 
 
 https://img.alicdn.com/tfs/TB1NBhdQXXzXFXX-712-343.png";>
-
+
 
 
 
@@ -464,7 +464,7 @@
   
 
   
-  Updated time: 
28/04/2017
+  Updated time: 
17/05/2017
 
 Set up development environmentUse dotWe is 
a good choice, But if you want to develop locally on your own machine, you will 
set up your development environment.
 You will need Node.js and the https://github.com/weexteam/weex-toolkit"; target="_blank" 
rel="external">Weex CLi.

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/guide/tools/index.html
--
diff --git a/content/guide/tools/index.html b/content/guide/tools/index.html
index 603be88..f6de919 100644
--- a/content/guide/tools/index.html
+++ b/content/guide/tools/index.html
@@ -11,7 +11,7 @@
 https://weex.apache.org/guide/tools/index.html";>
 
 
-
+
 
 
 
@@ -462,7 +462,7 @@
   
 
   
-  Updated time: 
28/04/2017
+  Updated time: 
17/05/2017
 
 Tools
 weex-toolkit

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/guide/tools/toolkit.html
--
diff --git a/content/guide/tools/toolkit.html b/content/guide/tools/toolkit.html
index f069649..fa0d28d 100644
--- a/content/guide/tools/toolkit.html
+++ b/content/guide/tools/toolkit.html
@@ -22,7 +22,7 @@
 https://img.alicdn.com/tps/TB1aPTEKFXa-1436-813.png";>
 https://img.alicdn.com/tps/TB1_trbKFc0XVXX-2880-1800.png";>
 https://gw.alicdn.com/tfs/TB19n4AQXawXVXX-577-70.png";>
-
+
 
 
 
@@ -474,7 +474,7 @@
   
 
   
-  Updated time: 
28/04/2017
+  Updated time: 
17/05/2017
 
 weex-toolkithttps://github.com/weexteam/weex-toolkit"; target="_blank" 
rel="external">weex-toolkit is an official command line tool to help 
developers to create, debug and build their Weex project.
 Installuse npm to install weex-toolkit:

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/references/advanced/extend-jsfm.html
--
diff --git a/content/references/advanced/extend-jsfm.html 
b/content/references/advanced/extend-jsfm.html
index 9ef59c8..81780d4 100644
--- a/content/references/advanced/extend-jsfm.html
+++ b/content/references/advanced/extend-jsfm.html
@@ -488,11 +488,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -685,12 +685,12 @@
   
 
   
-Platform 
Differences Between Weex and Web
+Migration
 
   
 
   
-Migration
+Platform Differences Between Weex and Web
   
 
   
@@ -1079,11 +1079,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1276,1

[05/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/content.json
--
diff --git a/content/content.json b/content/content.json
index c4bb037..2a19e1a 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:  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=225556&sort
 =-id&colspec=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 when img.resize=contain b6272a2 * [android] fix npe in 
onScrollerListener (#138) 8

[10/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/components/index.html
--
diff --git a/content/cn/references/components/index.html 
b/content/cn/references/components/index.html
index 4a53802..2ef4f56 100644
--- a/content/cn/references/components/index.html
+++ b/content/cn/references/components/index.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/components/indicator.html
--
diff --git a/content/cn/references/components/indicator.html 
b/content/cn/references/components/indicator.html
index 0e10bc3..ba50e02 100644
--- a/content/cn/references/components/indicator.html
+++ b/content/cn/references/components/indicator.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/components/input.html
--
diff --git a/content/cn/references/components/input.html 
b/content/cn/references/components/input.html
index eb3a471..a408f34 100644
--- a/content/cn/references/components/input.html
+++ b/content/cn/references/components/input.html
@@ -11,7 +11,7 @@
 https://weex.apache.org/cn/references/components/input.html";>
 
 
-
+
 
 
 
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
   

[08/11] incubator-weex-site git commit: Site updated: 2017-05-17 15:18:14

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/modules/webview.html
--
diff --git a/content/cn/references/modules/webview.html 
b/content/cn/references/modules/webview.html
index c8d988a..9dc0d3d 100644
--- a/content/cn/references/modules/webview.html
+++ b/content/cn/references/modules/webview.html
@@ -11,7 +11,7 @@
 https://weex.apache.org/cn/references/modules/webview.html";>
 
 
-
+
 
 
 
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1330,7 +1330,7 @@
   
 
   
-  Updated time: 
28/04/2017
+  Updated time: 
17/05/2017
 
 webview一系列的 
 组件操作接口。 比如 
goBack、goForward、和 
reload。webview module 与  
组件共用。
 示例查看 简单浏览器 ,一个结合 
 组件和 webview module 的示例。

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/native-dom-api.html
--
diff --git a/content/cn/references/native-dom-api.html 
b/content/cn/references/native-dom-api.html
index 55e7760..1f81c3e 100644
--- a/content/cn/references/native-dom-api.html
+++ b/content/cn/references/native-dom-api.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -497,11 +497,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -570,11 +570,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   
@@ -1056,11 +1056,11 @@
   
 
   
-HTML5 APIs
+JS Framework APIs
   
 
   
-JS Framework APIs
+HTML5 APIs
   
 
   
@@ -1097,11 +1097,11 @@
   
 
   
-
+
   
 
   
-
+
   
 
   
@@ -1170,11 +1170,11 @@
   
 
   
-WebSocket
+picker
   
 
   
-picker
+WebSocket
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/a9487e96/content/cn/references/path.html
--
diff --git a/content/cn/references/path.html b/content/cn/references/path.html
index 84d0818..f2eacf9 100644
--- a/content/cn/references/path.html
+++ b/content/cn/references/path.html
@@ -456,11 +456,11 @@
   
 
   
-HTML5 APIs
+ 

[2/3] incubator-weex git commit: * [doc] update changes doc since 0.10

* [doc] update changes doc since 0.10


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

Branch: refs/heads/0.11-dev
Commit: f4a57cc5a2efe3c259607d929c546b936c909682
Parents: 5c72f20
Author: moxun.ljf 
Authored: Wed Mar 29 11:46:51 2017 +0800
Committer: moxun.ljf 
Committed: Wed Mar 29 11:46:51 2017 +0800

--
 doc/source/cn/references/components/list.md | 13 +
 doc/source/cn/references/components/scroller.md | 16 +++-
 doc/source/cn/references/components/slider.md   |  8 
 doc/source/cn/references/modules/dom.md |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4a57cc5/doc/source/cn/references/components/list.md
--
diff --git a/doc/source/cn/references/components/list.md 
b/doc/source/cn/references/components/list.md
index 4055fe3..3cc3049 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -42,6 +42,7 @@ version: 2.1
 ## 特性
 
 - `loadmoreoffset {number}`:默认值为 0,触发 `loadmore` 
事件所需要的垂直偏移距离(设备屏幕底部与 `` 
底部之间的距离)。当 `` 的滚动条滚动到足够接近 
`` 底部时将会触发 `loadmore` 这个事件。
+- `offset-accuracy {number}` 0.11+:控制`onscroll`事件触发的频率,默认值为10,表示两次`onscroll`事件之间列表至少滚动了10px。注意,将该值设置为较小的数值会提高滚动事件采æ
 ·çš„精度,但同时也会降低页面的性能。
 
 ## 样式
 
@@ -59,6 +60,15 @@ version: 2.1
 
 - `loadmore` 0.5+:如果列表滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
 - `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
+  
+  事件中 event 对象属性:
+  - `contentSize {Object}`:列表的内容尺寸
+- `width {number}`: 列表内容宽度
+- `height {number}`: 列表内容高度
+  - `contentOffset {Object}`: 列表的偏移尺寸
+- `x {number}`: x轴上的偏移量
+- `y {number}`: y轴上的偏移量
+
 - 通用事件
 
   支持所有通用事件:
@@ -76,6 +86,9 @@ version: 2.1
 
 滚动到列表某个指定项是常见需求,`` 
拓展了该功能支持滚动到指定 ``。通过 `dom` module 
访问,更多信息可参考 [dom module](../modules/dom.html) 。
 
+### resetLoadmore() 0.9+
+在默认情况下,触发`loadmore`事件后,如果列表中内
容没有发生变更,则下一次滚动到列表末尾时将不会再次触发`loadmore`事件,ä½
 å¯ä»¥é€šè¿‡è°ƒç”¨`resetLoadmore()`方法来打ç 
´è¿™ä¸€é™åˆ¶ï¼Œè°ƒç”¨è¯¥æ–¹æ³•åŽï¼Œä¸‹ä¸€æ¬¡æ»šåŠ¨åˆ°åˆ—表末尾时将强制触发`loadmore`。
+
  参数
 
 - `node {node}`:指定目标节点。

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4a57cc5/doc/source/cn/references/components/scroller.md
--
diff --git a/doc/source/cn/references/components/scroller.md 
b/doc/source/cn/references/components/scroller.md
index 297f712..175b3f7 100644
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@ -41,7 +41,8 @@ version: 2.1
 
   ![mobile_preview](../images/scroller_1.jpg)
 
-- `loadmoreretry {number}`:默认值为 0,当 `loadmore` 
失败时是否重置 `loadmore` 相关的 UI,值不一样就会重置。
+- ~~`loadmoreretry {number}`:默认值为 0,当 `loadmore` 
失败时是否重置 `loadmore` 相关的 UI,值不一样就会重置。~~ 
该属性已废弃,请使用`resetLoadmore()`函数实现重置`loadmore`的操作。
+- `offset-accuracy {number}` 0.11+:控制`onscroll`事件触发的频率,默认值为10,表示两次`onscroll`事件之间列表至少滚动了10px。注意,将该值设置为较小的数值会提高滚动事件采æ
 ·çš„精度,但同时也会降低页面的性能。
 
 ## 样式
 
@@ -58,6 +59,16 @@ version: 2.1
 ## 事件
 
 - `loadmore` v0.5+:如果滚动到底部将会立即触发这个事件,ä½
 å¯ä»¥åœ¨è¿™ä¸ªäº‹ä»¶çš„处理函数中加载下一页的列表项。
+- `onscroll` 0.11+: 
列表发生滚动时将会触发该事件,事件的默认抽æ 
·çŽ‡ä¸º10px,即列表每滚动10px触发一次,可通过属性`offset-accuracy`设置抽æ
 ·çŽ‡ã€‚
+
+  事件中 event 对象属æ

  1   2   >