You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/09/21 12:16:09 UTC
[01/14] incubator-weex git commit: * [iOS] webview scale page to fit
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 5af980c81 -> eee46df77
* [iOS] webview scale page to fit
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e83b0de2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e83b0de2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e83b0de2
Branch: refs/heads/0.16-dev
Commit: e83b0de20898fc470047925fd404f413fb88a76f
Parents: fa82089
Author: NSHYJ <hu...@gmail.com>
Authored: Thu Aug 31 09:51:22 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Aug 31 09:51:22 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e83b0de2/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index 0ae4974..92debfa 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@ -82,6 +82,7 @@ WX_EXPORT_METHOD(@selector(goForward))
_webview = (WXWebView *)self.view;
_webview.delegate = self;
_webview.allowsInlineMediaPlayback = YES;
+ _webview.scalesPageToFit = YES;
_jsContext = [_webview valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
__weak typeof(self) weakSelf = self;
_jsContext[@"$notifyWeex"] = ^(JSValue *data) {
[14/14] incubator-weex git commit: Merge branch 'doc-merge-dev' of
https://github.com/gurisxie/incubator-weex into 0.16-dev
Posted by gu...@apache.org.
Merge branch 'doc-merge-dev' of https://github.com/gurisxie/incubator-weex into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eee46df7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eee46df7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eee46df7
Branch: refs/heads/0.16-dev
Commit: eee46df77bf014e6f43eeddb1cb94dc36e882cf7
Parents: 5af980c e42de91
Author: gurisxie <27...@qq.com>
Authored: Thu Sep 21 20:15:45 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Sep 21 20:15:45 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/index.md | 9 ++++++---
doc/source/cn/guide/set-up-env.md | 4 ++--
doc/source/cn/guide/tools/toolkit.md | 2 +-
.../cn/references/advanced/extend-to-android.md | 21 ++++++++++++++++++--
doc/source/cn/references/common-style.md | 1 +
doc/source/cn/references/components/text.md | 6 +++---
doc/source/cn/references/modules/animation.md | 2 ++
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/guide/index.md | 4 ++--
doc/source/guide/set-up-env.md | 6 +++---
doc/source/guide/tools/toolkit.md | 5 ++---
doc/source/references/common-style.md | 1 +
doc/source/references/components/text.md | 8 ++++----
doc/source/references/modules/animation.md | 3 ++-
doc/source/references/modules/dom.md | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 1 +
16 files changed, 51 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[03/14] incubator-weex git commit: * [android] add the right proguard
config of extend-to-android
Posted by gu...@apache.org.
* [android] add the right proguard config of extend-to-android
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72184b43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72184b43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72184b43
Branch: refs/heads/0.16-dev
Commit: 72184b43d04548acd0354934c6f84e22579bc9a9
Parents: 3ae4e89
Author: zshshr <zh...@gmail.com>
Authored: Wed Sep 13 14:38:37 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Sep 13 14:38:37 2017 +0800
----------------------------------------------------------------------
.../cn/references/advanced/extend-to-android.md | 21 ++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/72184b43/doc/source/cn/references/advanced/extend-to-android.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/advanced/extend-to-android.md b/doc/source/cn/references/advanced/extend-to-android.md
index 61a5bbf..0dcfa14 100644
--- a/doc/source/cn/references/advanced/extend-to-android.md
+++ b/doc/source/cn/references/advanced/extend-to-android.md
@@ -193,9 +193,26 @@ public class ImageAdapter implements IWXImgLoaderAdapter {
```java
-keep class com.taobao.weex.WXDebugTool{*;}
-keep class com.taobao.weex.devtools.common.LogUtil{*;}
--keep public class * extends com.taobao.weex.ui.component.WXComponent{*;}
--keep public class * extends com.taobao.weex.common.WXModule{*;}
-keepclassmembers class ** {
@com.taobao.weex.ui.component.WXComponentProp public *;
}
+-keep class com.taobao.weex.bridge.**{*;}
+-keep class com.taobao.weex.dom.**{*;}
+-keep class com.taobao.weex.adapter.**{*;}
+-keep class com.taobao.weex.common.**{*;}
+-keep class * implements com.taobao.weex.IWXObject{*;}
+-keep class com.taobao.weex.ui.**{*;}
+-keep class com.taobao.weex.ui.component.**{*;}
+-keep class com.taobao.weex.utils.**{
+ public <fields>;
+ public <methods>;
+ }
+-keep class com.taobao.weex.view.**{*;}
+-keep class com.taobao.weex.module.**{*;}
+-keep public class * extends com.taobao.weex.common.WXModule{*;}
+-keep public class * extends com.taobao.weex.ui.component.WXComponent{*;}
+-keep public class com.taobao.taolive.ui.weex.**{*;}
+-keep class * implements com.taobao.weex.ui.IExternalComponentGetter{*;}
+-keep class com.alibaba.aliweex.hc.HCConfig{*;}
+-keep class com.alibaba.dynamic.**{*;}
```
\ No newline at end of file
[04/14] incubator-weex git commit: * [doc] Update doc for animation.
Posted by gu...@apache.org.
* [doc] Update doc for animation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5b3ecd5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5b3ecd5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5b3ecd5c
Branch: refs/heads/0.16-dev
Commit: 5b3ecd5ccf88a6247c9327ebb48220d9993ff74c
Parents: 3ae4e89
Author: YorkShen <sh...@gmail.com>
Authored: Wed Sep 13 15:08:04 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Sep 13 15:08:04 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 3 +++
doc/source/cn/references/modules/animation.md | 2 ++
doc/source/references/common-style.md | 3 +++
doc/source/references/modules/animation.md | 3 ++-
4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b3ecd5c/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/common-style.md b/doc/source/cn/references/common-style.md
index 0d40e69..937e8de 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -314,6 +314,9 @@ transform 属性向元素应用 2D 转换。该属性允许我们对元素进行
- scaleX( <number> )
- scaleY( <number> )
- rotate( <angle/degree> )
+- rotateX( <angle/degree> ) <span class="api-version">v0.14+</span>
+- rotateY( <angle/degree> ) <span class="api-version">v0.14+</span>
+- perspective( <number> ) Android 4.1及以上版本支持 <span class="api-version">v0.16+</span>
- transform-origin: number/percentage/keyword(top/left/right/bottom)
### 示例
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b3ecd5c/doc/source/cn/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/animation.md b/doc/source/cn/references/modules/animation.md
index f50bea3..8d188fc 100644
--- a/doc/source/cn/references/modules/animation.md
+++ b/doc/source/cn/references/modules/animation.md
@@ -47,6 +47,8 @@ version: 2.1
| `translate`/`translateX`/`translateY` | 指定元素要移动到的位置 | 像素值或百分比 | 无 |
| `rotate` | 指定元素将被旋转的角度，单位是度 | number | 无 |
| `scale`/`scaleX`/`scaleY` | 按比例放大或缩小元素 | number | 无 |
+| `rotate`/`rotateX` <span class="api-version">v0.14+</span> /`rotateY` <span class="api-version">v0.14+</span> | 指定元素将被旋转的角度，单位是度 | number | 无 |
+| `perspective` <span class="api-version">v0.16+</span> | 观察者距离z=0平面的距离，在Android 4.1及以上有效 | number | 正无穷
* `callback {Function}`：动画执行完毕之后的回调
* `needLayout（boolean）`：节点动画执行时是否产生布局动画即LayoutAnimation
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b3ecd5c/doc/source/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/references/common-style.md b/doc/source/references/common-style.md
index c0bd084..9c1251f 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -203,6 +203,9 @@ Currently supported format:
* scaleX( <number> )
* scaleY( <number> )
* rotate( <angle/degree> )
+- rotateX( <angle/degree> ) <span class="api-version">v0.14+</span>
+- rotateY( <angle/degree> ) <span class="api-version">v0.14+</span>
+- perspective( <number> ), supported for Android 4.1 and above. <span class="api-version">v0.16+</span>
* transform-origin: number/percentage/keyword(top/left/right/bottom)
### Example
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b3ecd5c/doc/source/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/animation.md b/doc/source/references/modules/animation.md
index 6ea5cbd..a2f5175 100644
--- a/doc/source/references/modules/animation.md
+++ b/doc/source/references/modules/animation.md
@@ -52,7 +52,8 @@ properties of `transform`:
| name | description | value type | default value |
| :------------------------------ | :--------------------------------------- | :--------------- | :------------ |
| translate/translateX/translateY | Specifies the location of which the element will be translated to. | pixel or percent | none |
-| rotate | Specifies the angle of which the element will be rotated, the unit is degree. | number | none |
+| rotate/rotateX <span class="api-version">v0.14+</span> /rotateY <span class="api-version">v0.14+</span> |Specifies the angle of which the element will be rotated, the unit is degree.|number|none|
+| perspective <span class="api-version">v0.16+</span> | The distance between the z=0 plane and the user in order to give to the 3D-positioned element some perspective. Supported for Android 4.1 and above. | number | positive infinity
| scale/scaleX/scaleY | Stretch or shrink the element. | number | none |
- `callback`(function): Callback which is called after the completion of transition.
[12/14] incubator-weex git commit: * [doc] fix doc dotwe address
Posted by gu...@apache.org.
* [doc] fix doc dotwe address
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eeaa5e0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eeaa5e0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eeaa5e0b
Branch: refs/heads/0.16-dev
Commit: eeaa5e0bd24a580dcbf1ab6cec4c13f2f9718d63
Parents: a64ce53
Author: atomtong <to...@qq.com>
Authored: Thu Sep 21 17:07:14 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Thu Sep 21 17:07:14 2017 +0800
----------------------------------------------------------------------
doc/source/guide/set-up-env.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eeaa5e0b/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 6a846b0..1cffbcd 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -90,4 +90,4 @@ You can modify this page in `src/foo.vue`. The code is shown below:
</style>
```
-If you're curious to learn more about technical details, continue on to the next section. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime.
+If you're curious to learn more about technical details, continue on to the next section. And don't forget to write code at [dotWe](http://dotwe.org) and preview at anytime.
[11/14] incubator-weex git commit: * [doc] update set-up-env.md
Posted by gu...@apache.org.
* [doc] update set-up-env.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a64ce53b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a64ce53b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a64ce53b
Branch: refs/heads/0.16-dev
Commit: a64ce53b2f6869953f3e04542f5448448a131d50
Parents: 4c3f020
Author: erha19 <fa...@gmail.com>
Authored: Wed Sep 20 17:36:28 2017 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Wed Sep 20 17:36:28 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/set-up-env.md | 2 +-
doc/source/guide/set-up-env.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a64ce53b/doc/source/cn/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md
index a01c4ae..98d1b0d 100644
--- a/doc/source/cn/guide/set-up-env.md
+++ b/doc/source/cn/guide/set-up-env.md
@@ -74,7 +74,7 @@ $ sudo cnpm install -g weex-toolkit
然后初始化 Weex 项目：
```bash
-$ weex init awesome-project
+$ weex create awesome-project
```
执行完命令后，在 `awesome-project` 目录中就创建了一个使用 Weex 和 Vue 的模板项目。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a64ce53b/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 1dee4f6..6a846b0 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -44,7 +44,7 @@ Then you can use the Weex command to verify that the installation is successful:
You can use the CLI to generate a Weex project called "awesome-project". Run the following command in a Terminal:
```bash
-$ weex init awesome-project
+$ weex create awesome-project
```
Then enter the awesome-project folder, the CLI has been for us to generate a standard project structure.
[08/14] incubator-weex git commit: * [doc] Update doc format.
Posted by gu...@apache.org.
* [doc] Update 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/81aa503e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/81aa503e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/81aa503e
Branch: refs/heads/0.16-dev
Commit: 81aa503ee9008d7f093ae270594579dd7bcd6f20
Parents: bdd6f1b
Author: YorkShen <sh...@gmail.com>
Authored: Fri Sep 15 16:27:36 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Fri Sep 15 16:27:36 2017 +0800
----------------------------------------------------------------------
doc/source/references/common-style.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/81aa503e/doc/source/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/references/common-style.md b/doc/source/references/common-style.md
index 9c1251f..359b0e0 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -203,9 +203,9 @@ Currently supported format:
* scaleX( <number> )
* scaleY( <number> )
* rotate( <angle/degree> )
-- rotateX( <angle/degree> ) <span class="api-version">v0.14+</span>
-- rotateY( <angle/degree> ) <span class="api-version">v0.14+</span>
-- perspective( <number> ), supported for Android 4.1 and above. <span class="api-version">v0.16+</span>
+* rotateX( <angle/degree> ) <span class="api-version">v0.14+</span>
+* rotateY( <angle/degree> ) <span class="api-version">v0.14+</span>
+* perspective( <number> ), supported for Android 4.1 and above. <span class="api-version">v0.16+</span>
* transform-origin: number/percentage/keyword(top/left/right/bottom)
### Example
[05/14] incubator-weex git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Posted by gu...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/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/d16ba8d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d16ba8d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d16ba8d8
Branch: refs/heads/0.16-dev
Commit: d16ba8d888e07d285e3f523ed4010c934b1a4c48
Parents: 72184b4 5b3ecd5
Author: zshshr <zh...@gmail.com>
Authored: Wed Sep 13 15:21:10 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Sep 13 15:21:10 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 3 +++
doc/source/cn/references/modules/animation.md | 2 ++
doc/source/references/common-style.md | 3 +++
doc/source/references/modules/animation.md | 3 ++-
4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[06/14] incubator-weex git commit: * [doc] bug fix setup about
Posted by gu...@apache.org.
* [doc] bug fix setup about
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5cffb4e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5cffb4e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5cffb4e5
Branch: refs/heads/0.16-dev
Commit: 5cffb4e5c52bffc30c24a461ccf76a2546030635
Parents: b13b428
Author: gurisxie <27...@qq.com>
Authored: Fri Sep 15 10:50:30 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Sep 15 10:50:30 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/set-up-env.md | 2 +-
doc/source/cn/guide/tools/toolkit.md | 2 +-
doc/source/guide/set-up-env.md | 2 +-
doc/source/guide/tools/toolkit.md | 5 ++---
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/cn/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md
index 139e155..30b77d6 100644
--- a/doc/source/cn/guide/set-up-env.md
+++ b/doc/source/cn/guide/set-up-env.md
@@ -90,7 +90,7 @@ $ weex init awesome-project
- `serve`: 开启静态服务器
- `debug`: 调试模式
-我们先通过 `npm install` 安装项目依赖。之后运行 `npm run dev` 和 `npm run serve` 开启watch 模式和静态服务器。
+我们先通过 `npm install` 安装项目依赖。之后运行根目录下的 `sh ./start` 开启 watch 模式和静态服务器。
然后我们打开浏览器，进入 `http://localhost:8080/index.html` 即可看到 weex h5 页面。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/cn/guide/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/toolkit.md b/doc/source/cn/guide/tools/toolkit.md
index 90bfe13..de72f75 100644
--- a/doc/source/cn/guide/tools/toolkit.md
+++ b/doc/source/cn/guide/tools/toolkit.md
@@ -53,7 +53,7 @@ $ weex init awesome-project
- `serve`: 开启静态服务器
- `debug`: 调试模式
-我们先通过 `npm install` 安装项目依赖。之后运行 `npm run dev` 和 `npm run serve` 开启 `watch` 模式和静态服务器。
+我们先通过 `npm install` 安装项目依赖。之后运行根目录下的 `sh ./start` 开启 watch 模式和静态服务器。
然后我们打开浏览器，进入 `http://localhost:8080/index.html` 即可看到 Weex h5 页面。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 702c347..b734d08 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -57,7 +57,7 @@ We enter the awesome-project folder and install dependencies with the following
npm install
```
-Then we run `npm run dev` and `npm run serve` to start watch mode and static server.
+Then we run `sh ./start` in root directory to start watch mode and static server.
Finally, we can see the Weex page in `http://localhost:8080/index.html`.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5cffb4e5/doc/source/guide/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/toolkit.md b/doc/source/guide/tools/toolkit.md
index 2e19b2d..ff088cb 100644
--- a/doc/source/guide/tools/toolkit.md
+++ b/doc/source/guide/tools/toolkit.md
@@ -37,10 +37,9 @@ There are some useful npm scripts you will use in the future:
- `serve`: start a web server
- `debug`: open the debug mode
-When all dependences are ready, you can input `npm run dev` and run `npm run server` in a command line tab. Now you can visit our web page in :
-
-http://localhost:8080/index.html
+Then we run `sh ./start` in root directory to start watch mode and static server.
+Finally, we can see the Weex page in `http://localhost:8080/index.html`.
### preview Weex page in time
[07/14] incubator-weex git commit: Merge commit
'd16ba8d888e07d285e3f523ed4010c934b1a4c48' into dev
Posted by gu...@apache.org.
Merge commit 'd16ba8d888e07d285e3f523ed4010c934b1a4c48' into dev
Conflicts:
doc/source/guide/set-up-env.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bdd6f1b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bdd6f1b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bdd6f1b5
Branch: refs/heads/0.16-dev
Commit: bdd6f1b5b6a0dc1c2fbd12335b801f687149d29c
Parents: 5cffb4e d16ba8d
Author: gurisxie <27...@qq.com>
Authored: Fri Sep 15 10:55:24 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Sep 15 10:55:24 2017 +0800
----------------------------------------------------------------------
.flowconfig | 1 +
.gitignore | 4 +
.travis.yml | 91 ++-
Dangerfile-ios | 1 +
HOW-TO-BUILD.md | 80 +++
LICENSE | 22 +-
POSSIBLE-NOTICES-FOR-BIN-DIST | 3 +
README.md | 53 +-
README_RELEASE.md | 69 --
RUN-RAT.md | 12 +
WeexSDK.podspec | 6 +-
android/build.gradle | 7 +-
android/commons/build.gradle | 1 +
.../adapter/DefaultWebSocketAdapter.java | 54 +-
.../weex/commons/util/RequestIdGenerator.java | 15 +
.../weex/commons/util/WSEventReporter.java | 192 ++++++
.../gradle/wrapper/gradle-wrapper.properties | 4 +-
android/playground/app/build.gradle | 4 +-
.../java/com/alibaba/weex/WXApplication.java | 4 +
.../java/com/alibaba/weex/WXPageActivity.java | 3 +-
.../extend/adapter/InterceptWXHttpAdapter.java | 57 +-
.../weex/extend/component/WXParallax.java | 345 ++++++++++
.../weex/extend/module/WXEventModule.java | 23 +-
android/run-ci.sh | 4 -
android/sdk/assets/main.js | 8 -
android/sdk/build.gradle | 27 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 7558100 -> 7570504 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 4545544 -> 12121924 bytes
.../java/com/taobao/weex/ComponentObserver.java | 50 ++
.../com/taobao/weex/LayoutFinishListener.java | 26 +
.../java/com/taobao/weex/WXEnvironment.java | 5 +
.../main/java/com/taobao/weex/WXSDKEngine.java | 6 +
.../java/com/taobao/weex/WXSDKInstance.java | 102 ++-
.../main/java/com/taobao/weex/WXSDKManager.java | 15 +-
.../taobao/weex/adapter/ICrashInfoReporter.java | 27 +
.../taobao/weex/adapter/IDrawableLoader.java | 3 +-
.../weex/adapter/IWXUserTrackAdapter.java | 2 +-
.../java/com/taobao/weex/bridge/WXBridge.java | 299 +++++++-
.../com/taobao/weex/bridge/WXBridgeManager.java | 425 +++++++++++-
.../com/taobao/weex/bridge/WXModuleManager.java | 44 +-
.../java/com/taobao/weex/common/Constants.java | 2 +
.../weex/common/ICheckBindingScroller.java | 27 +
.../java/com/taobao/weex/common/IWXBridge.java | 21 +
.../java/com/taobao/weex/common/WXConfig.java | 1 +
.../com/taobao/weex/common/WXImageStrategy.java | 9 +-
.../com/taobao/weex/common/WXPerformance.java | 9 +-
.../taobao/weex/dom/DOMActionContextImpl.java | 15 +-
.../com/taobao/weex/dom/TextDecorationSpan.java | 55 ++
.../main/java/com/taobao/weex/dom/WXAttr.java | 38 +-
.../java/com/taobao/weex/dom/WXDomHandler.java | 4 +
.../java/com/taobao/weex/dom/WXDomManager.java | 19 +
.../java/com/taobao/weex/dom/WXDomModule.java | 2 +-
.../com/taobao/weex/dom/WXImageQuality.java | 4 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 4 +
.../main/java/com/taobao/weex/dom/WXStyle.java | 32 +-
.../com/taobao/weex/dom/WXSwitchDomObject.java | 29 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 15 +-
.../com/taobao/weex/dom/action/Actions.java | 74 +-
.../taobao/weex/dom/action/AnimationAction.java | 40 +-
.../weex/dom/action/CreateFinishAction.java | 20 +
.../weex/dom/action/ExecutableRenderAction.java | 48 ++
.../weex/dom/action/ModuleInvocationAction.java | 68 ++
.../weex/dom/action/UpdateStyleAction.java | 4 +-
.../taobao/weex/ui/IExternalModuleGetter.java | 30 +
.../taobao/weex/ui/IExternalMoudleGetter.java | 29 -
.../ui/animation/DimensionUpdateListener.java | 74 --
.../weex/ui/animation/HeightProperty.java | 35 +
.../weex/ui/animation/LayoutParamsProperty.java | 64 ++
.../weex/ui/animation/WXAnimationBean.java | 73 +-
.../taobao/weex/ui/animation/WidthProperty.java | 35 +
.../ui/component/AbstractEditComponent.java | 47 +-
.../com/taobao/weex/ui/component/Textarea.java | 6 +
.../taobao/weex/ui/component/WXComponent.java | 113 ++-
.../taobao/weex/ui/component/WXScroller.java | 88 ++-
.../com/taobao/weex/ui/component/WXSlider.java | 14 +-
.../weex/ui/component/WXTextDecoration.java | 1 +
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 296 +++++++-
.../ui/component/list/DefaultDragHelper.java | 173 +++++
.../weex/ui/component/list/DragHelper.java | 57 ++
.../ui/component/list/DragSupportCallback.java | 146 ++++
.../weex/ui/component/list/EventTrigger.java | 25 +
.../ui/component/list/StickyHeaderHelper.java | 2 +-
.../taobao/weex/ui/component/list/WXCell.java | 1 -
.../weex/ui/component/list/WXListComponent.java | 9 +-
.../taobao/weex/ui/module/WXTimerModule.java | 97 ++-
.../com/taobao/weex/ui/view/WXEditText.java | 9 +-
.../weex/ui/view/WXHorizontalScrollView.java | 27 +
.../com/taobao/weex/ui/view/WXImageView.java | 31 +-
.../com/taobao/weex/ui/view/WXScrollView.java | 1 -
.../weex/ui/view/border/BorderDrawable.java | 3 +-
.../ExtendedStaggeredGridLayoutManager.java | 18 +
.../taobao/weex/utils/WXDataStructureUtil.java | 21 +-
.../com/taobao/weex/utils/WXResourceUtils.java | 2 +-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 4 +
.../java/com/taobao/weex/utils/WXViewUtils.java | 34 +-
.../java/com/taobao/weex/WXSDKEngineTest.java | 1 -
.../java/com/taobao/weex/WXSDKInstanceTest.java | 26 +-
.../weex/adapter/DefaultUriAdapterTest.java | 4 +-
.../clipboard/WXClipboardModuleTest.java | 4 +-
.../navigator/WXNavigatorModuleTest.java | 4 +-
.../appfram/storage/DefaultWXStorageTest.java | 32 +-
.../appfram/storage/WXStorageModuleTest.java | 16 +-
.../taobao/weex/bridge/WXBridgeManagerTest.java | 14 +-
.../com/taobao/weex/bridge/WXBridgeTest.java | 4 +-
.../com/taobao/weex/bridge/WXHashMapTest.java | 4 +-
.../taobao/weex/bridge/WXModuleManagerTest.java | 4 +-
.../java/com/taobao/weex/dom/WXAttrTest.java | 23 +-
.../com/taobao/weex/dom/WXDomModuleTest.java | 4 +-
.../com/taobao/weex/dom/WXDomObjectTest.java | 4 +-
.../com/taobao/weex/dom/WXDomStatementTest.java | 4 +-
.../taobao/weex/dom/WXTextDomObjectTest.java | 4 +-
.../ui/animation/WXAnimationModuleTest.java | 4 +-
.../weex/ui/component/EditComponentTest.java | 4 +-
.../taobao/weex/ui/component/TextareaTest.java | 4 +-
.../weex/ui/component/WXComponentTest.java | 4 +-
.../com/taobao/weex/ui/component/WXDivTest.java | 4 +-
.../taobao/weex/ui/component/WXEmbedTest.java | 4 +-
.../taobao/weex/ui/component/WXImageTest.java | 14 +-
.../taobao/weex/ui/component/WXLoadingTest.java | 4 +-
.../taobao/weex/ui/component/WXRefreshTest.java | 4 +-
.../weex/ui/component/WXScrollerTest.java | 4 +-
.../weex/ui/component/WXSliderNeighborTest.java | 4 +-
.../taobao/weex/ui/component/WXSliderTest.java | 4 +-
.../taobao/weex/ui/component/WXSwitchTest.java | 4 +-
.../taobao/weex/ui/component/WXVideoTest.java | 4 +-
.../com/taobao/weex/ui/component/WXWebTest.java | 4 +-
.../component/helper/WXTimeInputHelperTest.java | 4 +-
.../component/list/DefaultDragHelperTest.java | 132 ++++
.../ui/component/list/WXListComponentTest.java | 4 +-
.../taobao/weex/ui/module/WXMetaModuleTest.java | 4 +-
.../weex/ui/module/WXModalUIModuleTest.java | 4 +-
.../weex/ui/module/WXTimerModuleTest.java | 48 +-
.../weex/ui/module/WXWebViewModuleTest.java | 4 +-
.../weex/ui/view/WXCirclePageAdapterTest.java | 4 +-
.../taobao/weex/ui/view/WXScrollViewTest.java | 4 +-
.../com/taobao/weex/ui/view/WXWebViewTest.java | 9 +-
.../weex/ui/view/gesture/WXGestureTest.java | 4 +-
.../com/taobao/weex/utils/TypefaceUtilTest.java | 4 +-
.../com/taobao/weex/utils/WXFileUtilsTest.java | 17 +-
.../com/taobao/weex/utils/WXLogUtilsTest.java | 7 +-
.../weex/utils/WXReflectionUtilsTest.java | 4 +-
.../java/com/taobao/weex/utils/WXUtilsTest.java | 16 +-
android/weex_debug/build.gradle | 10 +-
.../taobao/weex/bridge/WXWebsocketBridge.java | 88 +++
bin/commit-msg.sh | 28 -
bin/dist-browser.sh | 60 --
bin/dist-js-framework.sh | 56 --
bin/dist-vue.sh | 58 --
bin/install-hooks.sh | 23 -
bin/pre-commit.sh | 27 -
bin/pre-push.sh | 28 -
bin/release.sh | 20 -
bin/welcome.sh | 27 -
build/config.js | 5 +-
build/karma.vue.conf.js | 16 +-
build/webpack.examples.web.config.js | 30 +-
build/webpack.test.web.config.js | 22 +-
dangerfile.js | 332 +++++++--
doc/_config.yml | 11 +
doc/_config_cn.yml | 337 +++++++++
doc/source/_posts/arkit.md | 112 +++
doc/source/_posts/cn/hello.md | 6 -
doc/source/_posts/coreml.md | 79 +++
doc/source/_posts/hello_world.md | 6 -
doc/source/cn/blog/index.md | 4 -
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/tools/index.md | 1 +
doc/source/cn/guide/tools/plugin.md | 77 +++
.../cn/references/advanced/extend-to-android.md | 32 +-
.../cn/references/advanced/extend-to-ios.md | 4 +-
.../advanced/integrate-devtool-to-android.md | 86 ++-
doc/source/cn/references/bubble.md | 146 ++++
doc/source/cn/references/common-style.md | 66 +-
doc/source/cn/references/components/image.md | 2 +-
doc/source/cn/references/components/input.md | 257 +++++--
doc/source/cn/references/components/list.md | 8 +-
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/cn/references/components/text.md | 66 +-
doc/source/cn/references/downgrade.md | 11 +
doc/source/cn/references/index.md | 4 +-
doc/source/cn/references/modules/animation.md | 41 +-
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/cn/references/modules/meta.md | 96 +++
doc/source/cn/references/modules/picker.md | 2 +-
doc/source/cn/references/modules/timer.md | 47 ++
doc/source/cn/references/modules/websocket.md | 2 +-
doc/source/cn/references/weex-variable.md | 5 +-
doc/source/cn/releasenote.md | 663 ++----------------
doc/source/cn/v-0.10/references/bubble.md | 150 ++++
.../cn/v-0.10/references/components/input.md | 216 +++++-
doc/source/faq.md | 6 +-
doc/source/guide/index.md | 26 +-
doc/source/guide/integrate-to-your-app.md | 6 +-
doc/source/guide/intro/using-vue.md | 6 +-
doc/source/guide/intro/write-once.md | 14 +-
doc/source/guide/set-up-env.md | 20 +-
doc/source/guide/tools/index.md | 1 +
doc/source/guide/tools/plugin.md | 68 ++
.../references/advanced/extend-to-android.md | 14 +
doc/source/references/advanced/extend-to-ios.md | 5 +-
doc/source/references/bubble.md | 146 ++++
doc/source/references/common-style.md | 60 ++
doc/source/references/components/image.md | 2 +-
doc/source/references/components/input.md | 249 +++++--
doc/source/references/components/list.md | 7 +-
doc/source/references/components/scroller.md | 4 +-
doc/source/references/components/text.md | 71 +-
doc/source/references/downgrade.md | 11 +
doc/source/references/index.md | 2 +
doc/source/references/modules/animation.md | 55 +-
doc/source/references/modules/dom.md | 2 +-
doc/source/references/modules/meta.md | 97 +++
doc/source/references/modules/timer.md | 58 ++
doc/source/references/modules/websocket.md | 2 +-
doc/source/references/weex-variable.md | 5 +-
doc/source/releasenote.md | 663 ++----------------
doc/source/v-0.10/references/bubble.md | 150 ++++
doc/themes/weex/languages/cn.yml | 17 +-
doc/themes/weex/languages/en.yml | 16 +-
.../weex/layout/_partial/after-footer.ejs | 10 +
doc/themes/weex/layout/_partial/footer.ejs | 2 +-
doc/themes/weex/layout/_partial/head.ejs | 3 +
doc/themes/weex/layout/_partial/header.ejs | 27 +-
.../weex/layout/_partial/post/summary.ejs | 7 +
doc/themes/weex/layout/_partial/sidebar.ejs | 3 +
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/index.ejs | 28 +
doc/themes/weex/layout/layout.ejs | 15 +
doc/themes/weex/layout/post.ejs | 7 -
doc/themes/weex/source/css/blog.scss | 3 +
doc/themes/weex/source/css/common.scss | 14 +-
doc/themes/weex/source/css/docsearch.min.css | 2 +
doc/themes/weex/source/css/index.scss | 63 +-
doc/themes/weex/source/css/media-queries.scss | 3 +-
doc/themes/weex/source/css/partial/footer.scss | 5 +-
doc/themes/weex/source/css/partial/header.scss | 6 +-
.../weex/source/css/partial/highlight.scss | 7 +-
.../weex/source/css/partial/search-form.scss | 44 +-
doc/themes/weex/source/css/partial/summary.scss | 6 +
doc/themes/weex/source/css/variable.scss | 4 +-
doc/themes/weex/source/images/fliggy.png | Bin 0 -> 19329 bytes
doc/themes/weex/source/images/juhuasuan.png | Bin 0 -> 46340 bytes
doc/themes/weex/source/images/qianniu.png | Bin 0 -> 19852 bytes
doc/themes/weex/source/images/taopiaopiao.png | Bin 0 -> 12460 bytes
doc/themes/weex/source/js/common.js | 38 ++
doc/themes/weex/source/js/docsearch.min.js | 7 +
examples/iconfont.we | 63 +-
examples/index.we | 1 +
examples/vue/components/input.vue | 17 +
examples/vue/components/waterfall.vue | 165 +++--
examples/vue/hello.vue | 2 +-
examples/vue/iconfont.vue | 80 ++-
examples/vue/index.vue | 4 +-
examples/vue/market/gcanvas.vue | 38 +-
examples/vue/modules/websocket.vue | 116 ++++
html5/render/native/index.js | 33 +-
html5/render/native/setup.js | 58 ++
html5/render/vue/README.md | 42 +-
html5/render/vue/components/a.js | 19 +
html5/render/vue/components/div.js | 1 +
html5/render/vue/components/image.js | 1 +
html5/render/vue/components/index.js | 9 +-
html5/render/vue/components/input.js | 53 +-
.../render/vue/components/scrollable/header.js | 3 +-
.../vue/components/scrollable/list/cell.js | 1 +
.../vue/components/scrollable/list/index.js | 14 +-
.../components/scrollable/loading-indicator.js | 146 +++-
.../render/vue/components/scrollable/loading.js | 5 +-
.../render/vue/components/scrollable/refresh.js | 5 +-
.../vue/components/scrollable/scroller.js | 19 +-
.../vue/components/scrollable/waterfall.js | 337 +++++++++
html5/render/vue/components/slider/index.js | 155 +----
html5/render/vue/components/slider/indicator.js | 37 +-
.../render/vue/components/slider/slideMixin.js | 660 ++++++++++++++----
.../vue/components/slider/slider-neighbor.css | 21 -
.../vue/components/slider/slider-neighbor.js | 138 +---
html5/render/vue/components/slider/slider.css | 34 +
html5/render/vue/components/switch.js | 1 +
html5/render/vue/components/text.js | 1 +
html5/render/vue/components/textarea.js | 1 +
html5/render/vue/components/video.js | 28 +-
html5/render/vue/components/web.js | 1 +
html5/render/vue/config.js | 21 +
html5/render/vue/core/node.js | 159 ++++-
html5/render/vue/core/style.js | 175 +++--
html5/render/vue/env/global.js | 2 +
html5/render/vue/env/index.js | 4 +-
html5/render/vue/env/viewport.js | 6 +-
html5/render/vue/env/weex.js | 39 +-
html5/render/vue/env/wx-env.js | 20 +-
html5/render/vue/index.js | 18 +-
html5/render/vue/lib/envd/index.js | 179 +++++
html5/render/vue/lib/envd/params.js | 17 +
html5/render/vue/lib/envd/version.js | 152 +++++
html5/render/vue/lib/gesture.js | 512 ++++++++++++++
html5/render/vue/mixins/base.js | 77 ++-
html5/render/vue/mixins/index.js | 4 +-
html5/render/vue/mixins/scrollable.js | 120 +++-
html5/render/vue/mixins/sticky.js | 65 ++
html5/render/vue/mixins/style.js | 77 ++-
html5/render/vue/modules/animation.js | 3 +
html5/render/vue/modules/dom.js | 56 +-
html5/render/vue/modules/globalEvent.js | 69 ++
html5/render/vue/modules/index.js | 4 +
html5/render/vue/modules/modal/style.js | 2 +-
html5/render/vue/modules/modal/toast.js | 3 +-
html5/render/vue/modules/websocket/index.js | 26 +
html5/render/vue/modules/websocket/websocket.js | 62 ++
html5/render/vue/styles/base.css | 86 +--
html5/render/vue/styles/reset.css | 5 +
html5/render/vue/utils/component.js | 185 +++--
html5/render/vue/utils/event.js | 6 +-
html5/render/vue/utils/func.js | 173 ++++-
html5/render/vue/utils/index.js | 104 ---
html5/render/vue/utils/lazyload.js | 17 +-
html5/render/vue/utils/perf.js | 126 +++-
html5/render/vue/utils/style.js | 256 +++++--
html5/runtime/vdom/document.js | 4 +-
html5/runtime/vdom/element.js | 25 +-
html5/shared/console.js | 10 +-
html5/test/render/vue/core/node.js | 32 +-
html5/test/render/vue/core/scope-style-map.js | 4 +
.../render/vue/data/dotvue/event-bubble-bar.vue | 2 +-
.../render/vue/data/dotvue/event-bubble.vue | 6 +-
html5/test/render/vue/helper/utils.js | 10 +-
html5/test/render/vue/modules/modal.js | 225 ++++++
html5/test/render/vue/modules/websocket.js | 80 +++
html5/test/render/vue/utils/component.js | 50 +-
html5/test/render/vue/utils/event.js | 78 +++
html5/test/render/vue/utils/func.js | 278 +++++++-
html5/test/render/vue/utils/lazyload.js | 106 +++
html5/test/render/vue/utils/perf.js | 132 ++++
html5/test/render/vue/utils/style.js | 162 ++++-
html5/test/render/vue/utils/type.js | 49 ++
html5/test/render/vue/validator/index.js | 31 +-
html5/test/unit/default/vm/vm.js | 2 +-
ios/playground/Podfile | 2 +-
.../WeexDemo.xcodeproj/project.pbxproj | 12 +-
ios/playground/WeexDemo/AppDelegate.m | 4 +
.../WeexDemo/WXConfigCenterDefaultImpl.h | 25 +
.../WeexDemo/WXConfigCenterDefaultImpl.m | 45 ++
ios/playground/WeexDemo/WXDemoViewController.m | 24 +-
.../WeexDemo/extend/module/WXEventModule.m | 16 +
ios/sdk/WeexSDK-Dynamic/Info.plist | 24 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 680 ++++++++++++++++++-
.../xcschemes/WeexSDK-Dynamic.xcscheme | 80 +++
ios/sdk/WeexSDK/Resources/main.js | 8 -
.../WeexSDK/Sources/Bridge/WXBridgeContext.h | 8 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 205 +++++-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 217 +++++-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 13 +-
.../Component/Recycler/WXRecyclerComponent.h | 3 +-
.../Component/Recycler/WXRecyclerComponent.m | 5 +-
.../Recycler/WXSectionDataController.h | 2 +
.../WeexSDK/Sources/Component/WXAComponent.m | 13 +-
.../Sources/Component/WXCanvasComponent.h | 2 +-
.../Sources/Component/WXComponent_internal.h | 3 +-
.../Sources/Component/WXCycleSliderComponent.m | 42 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 11 +-
.../Sources/Component/WXEmbedComponent.m | 2 +-
.../Sources/Component/WXFooterComponent.h | 2 +-
.../Sources/Component/WXHeaderComponent.h | 3 +-
.../Sources/Component/WXImageComponent.m | 39 +-
.../Sources/Component/WXIndicatorComponent.m | 3 +
.../WeexSDK/Sources/Component/WXListComponent.m | 118 +++-
.../Sources/Component/WXLoadingComponent.m | 7 -
.../Sources/Component/WXScrollerComponent.m | 45 +-
.../Sources/Component/WXSliderComponent.m | 1 +
.../Component/WXSliderNeighborComponent.m | 9 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 146 ++--
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 7 +
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 123 +++-
.../Sources/Component/WXVideoComponent.m | 12 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 11 +-
.../Sources/Controller/WXBaseViewController.m | 25 +-
.../Sources/Controller/WXRootViewController.m | 1 +
.../Sources/Display/WXComponent+BoxShadow.h | 4 -
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 1 +
ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 23 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 60 +-
.../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 28 +-
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +
.../WeexSDK/Sources/Manager/WXBridgeManager.h | 2 +
.../Sources/Manager/WXComponentManager.h | 5 +-
.../Sources/Manager/WXComponentManager.m | 39 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 8 +-
.../WeexSDK/Sources/Manager/WXServiceFactory.h | 2 +-
.../WeexSDK/Sources/Manager/WXTracingManager.h | 126 ++++
.../WeexSDK/Sources/Manager/WXTracingManager.m | 384 +++++++++++
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 5 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 68 +-
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 +
.../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 17 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 56 +-
.../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 ++
.../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 ++++
.../WeexSDK/Sources/Module/WXAnimationModule.m | 69 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 29 +-
.../WeexSDK/Sources/Module/WXModalUIModule.m | 1 +
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 7 -
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 11 +-
.../WeexSDK/Sources/Module/WXPrerenderManager.h | 89 +++
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 314 +++++++++
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 6 +-
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +-
.../WeexSDK/Sources/Module/WXWebSocketModule.h | 1 -
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 1 +
.../Sources/Network/WXResourceRequestHandler.h | 2 +
.../WXResourceRequestHandlerDefaultImpl.m | 5 +-
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 43 ++
.../Sources/Protocol/WXConfigCenterProtocol.h | 20 +
.../Sources/Protocol/WXScrollerProtocol.h | 7 +
.../Sources/Protocol/WXURLRewriteProtocol.h | 5 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 6 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 8 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 9 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 118 ++--
.../View/WXComponent+PseudoClassManagement.h | 4 +-
.../View/WXComponent+PseudoClassManagement.m | 4 +-
.../Sources/View/WXComponent+ViewManagement.m | 114 +++-
ios/sdk/WeexSDK/Sources/View/WXView.m | 1 +
ios/sdk/WeexSDK/Sources/WeexSDK.h | 5 +
ios/sdk/WeexSDK/dependency/SRWebSocket.h | 17 +-
ios/sdk/WeexSDK/dependency/SRWebSocket.m | 18 +-
ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 +
ios/sdk/WeexSDKTests/WXURLRewriteTests.m | 21 -
ios/sdk/WeexSDKTests/dependency/libOCMock.a | Bin 2098920 -> 0 bytes
ios/sdk/buildScripts.sh | 2 +
package.json | 39 +-
packages/weex-vue-render/README.md | 42 +-
packages/weex-vue-render/package.json | 8 +-
pre-build/native-bundle-main.js | 8 +
scripts/build_from_source.sh | 14 +-
scripts/commit-msg.sh | 28 +
scripts/dist-browser.sh | 60 ++
scripts/dist-js-framework.sh | 56 ++
scripts/dist-vue.sh | 58 ++
scripts/generate_apache_release.sh | 35 +
scripts/install-hooks.sh | 23 +
scripts/pre-commit.sh | 27 +
scripts/pre-push.sh | 28 +
scripts/release.sh | 20 +
scripts/release_files.rules | 10 +-
scripts/repackage_android.sh | 20 -
scripts/replace-header.sh | 4 -
scripts/welcome.sh | 27 +
test/.gitignore | 3 +-
test/ci-funcs.sh | 18 -
test/mocha.opts | 2 +-
test/pages/components/hyperlink.vue | 31 +
test/pages/components/hyperlink_target.vue | 22 +
test/pages/components/scroller-fixed.vue | 14 +-
test/pages/components/slider-common.vue | 229 +++++++
test/pages/components/textarea-maxlength.vue | 10 +-
test/pages/css/border.vue | 135 +++-
test/pages/modules/globalEvent.vue | 48 ++
test/pages/modules/vue_timer.vue | 75 ++
test/pages/modules/we_timer.we | 73 ++
test/run.sh | 9 +
test/screenshot/border-android.png | Bin 0 -> 156247 bytes
test/screenshot/border-ios.png | Bin 168396 -> 126185 bytes
test/screenshot/compositing-ios.png | Bin 228661 -> 228306 bytes
test/scripts/components/hyperlink.test.js | 44 ++
test/scripts/components/recycler.test.js | 16 +-
test/scripts/components/scroller-fixed.test.js | 5 +-
test/scripts/components/slider-common.test.js | 100 +++
test/scripts/components/text.test.js | 2 +-
.../components/textarea-maxlength.test.js | 6 +-
test/scripts/css/border.test.js | 7 +-
test/scripts/modules/globalEvent.test.js | 60 ++
test/scripts/modules/timer.test.js | 100 +++
test/scripts/util.js | 37 +-
test/serve.sh | 3 +-
479 files changed, 17535 insertions(+), 4603 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdd6f1b5/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
[13/14] incubator-weex git commit: Merge commit
'eeaa5e0bd24a580dcbf1ab6cec4c13f2f9718d63' into doc-merge-dev
Posted by gu...@apache.org.
Merge commit 'eeaa5e0bd24a580dcbf1ab6cec4c13f2f9718d63' into doc-merge-dev
finish Conflicts:
doc/source/cn/references/common-style.md
doc/source/references/common-style.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/e42de911
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e42de911
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e42de911
Branch: refs/heads/0.16-dev
Commit: e42de9110e6b190901ac28e3ad57d17d4b9e8b72
Parents: 8325077 eeaa5e0
Author: gurisxie <27...@qq.com>
Authored: Thu Sep 21 17:56:13 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Sep 21 17:56:13 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/index.md | 9 ++++++---
doc/source/cn/guide/set-up-env.md | 4 ++--
doc/source/cn/guide/tools/toolkit.md | 2 +-
.../cn/references/advanced/extend-to-android.md | 21 ++++++++++++++++++--
doc/source/cn/references/common-style.md | 1 +
doc/source/cn/references/components/text.md | 6 +++---
doc/source/cn/references/modules/animation.md | 2 ++
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/guide/index.md | 4 ++--
doc/source/guide/set-up-env.md | 6 +++---
doc/source/guide/tools/toolkit.md | 5 ++---
doc/source/references/common-style.md | 1 +
doc/source/references/components/text.md | 8 ++++----
doc/source/references/modules/animation.md | 3 ++-
doc/source/references/modules/dom.md | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 1 +
16 files changed, 51 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e42de911/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
----------------------------------------------------------------------
[10/14] incubator-weex git commit: * [doc] bug fix index
Posted by gu...@apache.org.
* [doc] bug fix index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4c3f0205
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c3f0205
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c3f0205
Branch: refs/heads/0.16-dev
Commit: 4c3f020504e9e05bc699e333db771f3d3b398e26
Parents: 5148596
Author: gurisxie <27...@qq.com>
Authored: Tue Sep 19 17:22:25 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Sep 19 17:22:25 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/index.md | 9 ++++++---
doc/source/guide/index.md | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4c3f0205/doc/source/cn/guide/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/index.md b/doc/source/cn/guide/index.md
index 22670ed..8208629 100644
--- a/doc/source/cn/guide/index.md
+++ b/doc/source/cn/guide/index.md
@@ -10,9 +10,11 @@ has_chapter_content: true
Weex 是一套简单易用的跨平台开发方案，能以 web 的开发体验构建高性能、可扩展的 native 应用，为了做到这些，Weex 与 Vue 合作，使用 Vue 作为上层框架，并遵循 W3C 标准实现了统一的 JSEngine 和 DOM API，这样一来，你甚至可以使用其他框架驱动 Weex，打造三端一致的 native 应用。
-## Vue 是什么？
+## VueJS简介
-Vue.js 是 Evan You 开发的渐进式 JavaScript 框架。开发者能够通过撰写 `*.vue` 文件，基于 `<template>`, `<style>`, `<script>` 快速构建组件化的 web 应用。
+> [VueJS](https://vuejs.org/) 是 Evan You 开发的渐进式 JavaScript 框架。开发者能够通过撰写 `*.vue` 文件，基于 `<template>`, `<style>`, `<script>` 快速构建组件化的 web 应用。
+
+**VueJS 由 [Evan You](https://twitter.com/youyuxi) 开发维护.**
## Hello World
@@ -52,5 +54,6 @@ Vue.js 是 Evan You 开发的渐进式 JavaScript 框架。开发者能够通过
}
</script>
```
+它太容易了，对吧?看一下语法，这就是vue。
-我们暂时不去关心 Weex 的技术细节，仅看大致的代码结构，我们可以看到语法就是我们熟悉的 Vue。你可以修改这个例子，再次扫码尝试。
+你可以试着修改Hello World示例如果你有以前的知识构建VueJS的例子，然后生成一个新的二维码扫描。如果你没有以前的VueJS知识,别担心,这个指南教你。此外，你可以学习(VueJS指南)(https://vuejs.org/v2/guide)。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4c3f0205/doc/source/guide/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/index.md b/doc/source/guide/index.md
index de7de7c..a7f5139 100644
--- a/doc/source/guide/index.md
+++ b/doc/source/guide/index.md
@@ -12,7 +12,7 @@ Weex is a framework for building Mobile cross-platform high performance UI appli
## Introduction to VueJS
->[Vue](https://vuejs.org/) (pronounced /vjuː/, like view) is a progressive framework for building user interfaces. Unlike other monolithic frameworks, Vue is designed from the ground up to be incrementally adoptable. The core library is focused on the view layer only, and is very easy to pick up and integrate with other libraries or existing projects. On the other hand, Vue is also perfectly capable of powering sophisticated Single-Page Applications when used in combination with modern tooling and supporting libraries.
+>[VueJS](https://vuejs.org/) (pronounced /vjuː/, like view) is a progressive framework for building user interfaces. Unlike other monolithic frameworks, Vue is designed from the ground up to be incrementally adoptable. The core library is focused on the view layer only, and is very easy to pick up and integrate with other libraries or existing projects. On the other hand, Vue is also perfectly capable of powering sophisticated Single-Page Applications when used in combination with modern tooling and supporting libraries.
**VueJS is developed by [Evan You](https://twitter.com/youyuxi).**
@@ -20,7 +20,7 @@ Weex now fully supports VueJS 2.x officailly. Weex put Vue 2.x as its built-in J
## Hello world Example
-The easiest way to try Weex is to use the [Playground App](../playground.html) to write a **Hello World** example at [dotWe](https://dotwe.org). No installation is required and you do not even have to write native code.
+The easiest way to try Weex is to use the [Playground App](../playground.html) to write a [Hello World](http://dotwe.org/vue/4d5a0471ece3daabd4681bc6d703c4c1) example at [dotWe](http://dotwe.org). No installation is required and you do not even have to write native code.
To test Weex online using our Playground App:
[09/14] incubator-weex git commit: * [doc] bugfix week init project
run command
Posted by gu...@apache.org.
* [doc] bugfix week init project run command
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5148596d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5148596d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5148596d
Branch: refs/heads/0.16-dev
Commit: 5148596d0ff05b7fd36d4616853c4a66be1e30c7
Parents: 81aa503
Author: gurisxie <27...@qq.com>
Authored: Mon Sep 18 19:24:59 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Sep 18 19:24:59 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/set-up-env.md | 2 +-
doc/source/cn/guide/tools/toolkit.md | 2 +-
doc/source/guide/set-up-env.md | 2 +-
doc/source/guide/tools/toolkit.md | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5148596d/doc/source/cn/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md
index 30b77d6..a01c4ae 100644
--- a/doc/source/cn/guide/set-up-env.md
+++ b/doc/source/cn/guide/set-up-env.md
@@ -90,7 +90,7 @@ $ weex init awesome-project
- `serve`: 开启静态服务器
- `debug`: 调试模式
-我们先通过 `npm install` 安装项目依赖。之后运行根目录下的 `sh ./start` 开启 watch 模式和静态服务器。
+我们先通过 `npm install` 安装项目依赖。之后运行根目录下的 `npm run dev & npm run serve` 开启 watch 模式和静态服务器。
然后我们打开浏览器，进入 `http://localhost:8080/index.html` 即可看到 weex h5 页面。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5148596d/doc/source/cn/guide/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/toolkit.md b/doc/source/cn/guide/tools/toolkit.md
index de72f75..d721118 100644
--- a/doc/source/cn/guide/tools/toolkit.md
+++ b/doc/source/cn/guide/tools/toolkit.md
@@ -53,7 +53,7 @@ $ weex init awesome-project
- `serve`: 开启静态服务器
- `debug`: 调试模式
-我们先通过 `npm install` 安装项目依赖。之后运行根目录下的 `sh ./start` 开启 watch 模式和静态服务器。
+我们先通过 `npm install` 安装项目依赖。之后运行根目录下的 `npm run dev & npm run serve` 开启 watch 模式和静态服务器。
然后我们打开浏览器，进入 `http://localhost:8080/index.html` 即可看到 Weex h5 页面。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5148596d/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 9580afc..1dee4f6 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -57,7 +57,7 @@ We enter the awesome-project folder and install dependencies with the following
npm install
```
-Then we run `sh ./start` in root directory to start watch mode and static server.
+Then we run `npm run dev & npm run serve` in root directory to start watch mode and static server.
Finally, we can see the Weex page in `http://localhost:8080/index.html`.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5148596d/doc/source/guide/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/toolkit.md b/doc/source/guide/tools/toolkit.md
index ff088cb..a325923 100644
--- a/doc/source/guide/tools/toolkit.md
+++ b/doc/source/guide/tools/toolkit.md
@@ -37,7 +37,7 @@ There are some useful npm scripts you will use in the future:
- `serve`: start a web server
- `debug`: open the debug mode
-Then we run `sh ./start` in root directory to start watch mode and static server.
+Then we run `npm run dev & npm run serve` in root directory to start watch mode and static server.
Finally, we can see the Weex page in `http://localhost:8080/index.html`.
[02/14] incubator-weex git commit: * [doc] update text document
Posted by gu...@apache.org.
* [doc] update text document
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3ae4e89e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3ae4e89e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3ae4e89e
Branch: refs/heads/0.16-dev
Commit: 3ae4e89e8cacb224af716f91bcb086f3c46355b1
Parents: e83b0de
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 12 18:19:22 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 12 18:19:22 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/text.md | 6 +++---
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/references/components/text.md | 8 ++++----
doc/source/references/modules/dom.md | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ae4e89e/doc/source/cn/references/components/text.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/text.md b/doc/source/cn/references/components/text.md
index 136d409..b91f6f9 100644
--- a/doc/source/cn/references/components/text.md
+++ b/doc/source/cn/references/components/text.md
@@ -62,7 +62,7 @@ version: 2.1
`支持版本:v0.12.0`
-支持ttf和woff字体格式的自定义字体, 可以通过调用 `dom` module 里面的 [addRule](../modules/dom.html#addRule)方法, 构建自定义的`font-family`使用, addRule 建议在`mounted`时候调用
+支持ttf和woff字体格式的自定义字体, 可以通过调用 `dom` module 里面的 [addRule](../modules/dom.html#addRule)方法, 构建自定义的`font-family`使用, addRule 建议在 `beforeCreate` 或者更早时调用
```html
<template>
@@ -75,7 +75,7 @@ version: 2.1
</template>
<script>
module.exports = {
- mounted: function() {
+ beforeCreate: function() {
var domModule = weex.requireModule('dom');
//目前支持ttf、woff文件，不支持svg、eot类型,moreItem at http://www.iconfont.cn/
@@ -89,7 +89,7 @@ version: 2.1
</script>
```
-[try it](http://dotwe.org/vue/6ece072d0abd9a9e5718eb26bd5719f8)
+[try it](http://dotwe.org/vue/95b2c6716f37066d5f44c5c75c979394)
## 示例
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ae4e89e/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 9f0297c..a177929 100644
--- a/doc/source/cn/references/modules/dom.md
+++ b/doc/source/cn/references/modules/dom.md
@@ -274,7 +274,7 @@ domModule.addRule('fontFace', {
```
-[try it](http://dotwe.org/vue/6ece072d0abd9a9e5718eb26bd5719f8)
+[try it](http://dotwe.org/vue/95b2c6716f37066d5f44c5c75c979394)
## 其他
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ae4e89e/doc/source/references/components/text.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/text.md b/doc/source/references/components/text.md
index e235fae..f0a1bc5 100644
--- a/doc/source/references/components/text.md
+++ b/doc/source/references/components/text.md
@@ -59,7 +59,7 @@ check out [common events](../common-event.html)
`support:v0.12.0`
-support `ttf` and `woff` font format to custom your text, call [addRule](../modules/dom.html#addRule) in dom module to build your own `font-family`, we suggest that you call `addRule` in `mounted`
+support `ttf` and `woff` font format to custom your text, call [addRule](../modules/dom.html#addRule) in dom module to build your own `font-family`, we suggest that you call `addRule` in `beforeCreate`
```html
<template>
@@ -72,10 +72,10 @@ support `ttf` and `woff` font format to custom your text, call [addRule](../modu
</template>
<script>
module.exports = {
- mounted: function() {
+ beforeCreate: function() {
var domModule = weex.requireModule('dom');
- //目前支持ttf、woff文件，不支持svg、eot类型,moreItem at http://www.iconfont.cn/
+ //support ttf、woff file，svg、eot can not be supported ,moreItem at http://www.iconfont.cn/
domModule.addRule('fontFace', {
'fontFamily': "iconfont2",
@@ -86,7 +86,7 @@ support `ttf` and `woff` font format to custom your text, call [addRule](../modu
</script>
```
-[try it](http://dotwe.org/vue/6ece072d0abd9a9e5718eb26bd5719f8)
+[try it](http://dotwe.org/vue/95b2c6716f37066d5f44c5c75c979394)
## Example
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ae4e89e/doc/source/references/modules/dom.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/dom.md b/doc/source/references/modules/dom.md
index 5cb354f..0209f64 100644
--- a/doc/source/references/modules/dom.md
+++ b/doc/source/references/modules/dom.md
@@ -271,6 +271,6 @@ domModule.addRule('fontFace', {
});
```
-[try it](http://dotwe.org/vue/6ece072d0abd9a9e5718eb26bd5719f8)
+[try it](http://dotwe.org/vue/95b2c6716f37066d5f44c5c75c979394)