You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ha...@apache.org on 2018/03/22 11:02:06 UTC
[1/7] incubator-weex-site git commit: update doc of
input&slider&pickers
Repository: incubator-weex-site
Updated Branches:
refs/heads/master ff1c81fc3 -> da4a81e4d
update doc of input&slider&pickers
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/bc465a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/bc465a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/bc465a5e
Branch: refs/heads/master
Commit: bc465a5e8e4159440ffc06006e0ae3b2bb599d59
Parents: 58feaa3
Author: moxun.ljf <mo...@alibaba-inc.com>
Authored: Thu Mar 22 12:02:23 2018 +0800
Committer: moxun.ljf <mo...@alibaba-inc.com>
Committed: Thu Mar 22 12:02:23 2018 +0800
----------------------------------------------------------------------
source/cn/references/components/input.md | 10 +++++++++-
source/cn/references/components/slider.md | 4 ++++
source/cn/references/modules/picker.md | 9 +++++++++
source/references/components/input.md | 10 +++++++++-
source/references/components/slider.md | 4 ++++
source/references/modules/picker.md | 9 +++++++++
6 files changed, 44 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/bc465a5e/source/cn/references/components/input.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/input.md b/source/cn/references/components/input.md
index c97dc04..6782b29 100644
--- a/source/cn/references/components/input.md
+++ b/source/cn/references/components/input.md
@@ -125,9 +125,17 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
- `setSelectionRange(selectionStart,selectionEnd)` <span class="api-version">v0.11+</span>设置文本选区
- `selectionStart {number}`：设置文本选区的起始点
- `selectionEnd {number}`：设置文本选区的起终点
-- `getEditSelectionRange(callback[selectionStart,selectionEnd])` <span class="api-version">v0.11+</span>设置文本选区
+- `getSelectionRange(callback[selectionStart,selectionEnd])` <span class="api-version">v0.11+</span>设置文本选区
- `selectionStart {number}`：获取文本选区的起始点
- `selectionEnd {number}`：获取文本选区的起终点
+- `setTextFormatter(params)`<span class="api-version">v0.18+</span>：这是一个非常有用的特性，可以对input设置一组对输入的内容进行实时格式化的规则。
+ - `params {object}`：格式化规则，包含以下参数：
+ - `formatRule {regexp}`：格式化匹配的正则表达式
+ - `formatReplace {string}`：格式化匹配后用于替换的内容
+ - `recoverRule {regexp}`：从格式化后的内容还原原始内容的正则表达式
+ - `recoverReplace {string}`：还原原始内容时用于替换的内容
+
+`setTextFormatter` 的详细使用方法请参照 [示例](http://dotwe.org/vue/bea3cb0cad697829d8d343552a2b7b77)
## 约束
目前不支持 `this.$el(id).value = ''` 这种方式改写 input value。只支持在 `<input>` 组件的 `input`、`change` 事件中改写。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/bc465a5e/source/cn/references/components/slider.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/slider.md b/source/cn/references/components/slider.md
index bb2098d..18feaaf 100644
--- a/source/cn/references/components/slider.md
+++ b/source/cn/references/components/slider.md
@@ -25,6 +25,10 @@ version: 2.1
- `interval {number}`：值为毫秒数，此值设定 slider 切换时间间隔。当 `auto-play` 值为 `true` 时生效。
- `infinite {boolean}`：循环播放，可选值为 `true`/`false`，默认的是 `true`。
- `offset-x-accuracy {number}`<sup class="wx-v">0.11+</sup>：控制`onscroll`事件触发的频率，默认值为10，表示两次`onscroll`事件之间Slider Page至少滚动了10px。注意，将该值设置为较小的数值会提高滚动事件采样的精度，但同时也会降低页面的性能。
+- `show-indicators {boolean}`：设置是否显示indicator
+- `index {number}`：设置显示slider的第几个页面
+- `scrollable {boolean}`：设置是否可以通过滑动手势来切换slider页面
+- `keep-index {boolean}`：设置slider中的数据发生变化后是否保持变化前的页面index
## 样式
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/bc465a5e/source/cn/references/modules/picker.md
----------------------------------------------------------------------
diff --git a/source/cn/references/modules/picker.md b/source/cn/references/modules/picker.md
index ed1cff2..35e3db5 100644
--- a/source/cn/references/modules/picker.md
+++ b/source/cn/references/modules/picker.md
@@ -24,6 +24,15 @@ version: 2.1
- `options {Object}`：调用单选 picker 选项
- `index {number}`：默认选中的选项
- `items {array}`：picker 数据源
+ - `textColor {color}`：picker中文字的颜色
+ - `selectionColor {color}`：picker中选中item的背景色
+ - `confirmTitle {string}`：确认按钮的文案
+ - `cancelTitle {string}`：取消按钮的文案
+ - `confirmTitleColor {color}`：确认按钮的文字颜色
+ - `cancelTitleColor {color}`：取消按钮的文字颜色
+ - `title {string}`：对话框的标题
+ - `titleColor {color}`：对话框标题的文字颜色
+ - `titleBackgroundColor {color}`：对话框标题的背景色
- `callback {function (ret)}`：执行完读取操作后的回调函数。`ret {Object}` 为 `callback` 函数的参数，有两个属性：
- `result {string}`：结果三种类型 `success`, `cancel`, `error`
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/bc465a5e/source/references/components/input.md
----------------------------------------------------------------------
diff --git a/source/references/components/input.md b/source/references/components/input.md
index a618ba4..2c2e29b 100644
--- a/source/references/components/input.md
+++ b/source/references/components/input.md
@@ -103,10 +103,18 @@ check out [common events](../common-event.html)
- `selectionStart {number}`:set starting location text selection range
- `selectionEnd {number}`:set end location text selection range
-- `getEditSelectionRange(callback[selectionStart,selectionEnd])` <span class="api-version">v0.11+</span>get text selection range of input or textarea
+- `getSelectionRange(callback[selectionStart,selectionEnd])` <span class="api-version">v0.11+</span>get text selection range of input or textarea
- `selectionStart {number}`:get starting location text selection range
- `selectionEnd {number}`: get end location text selection range
+- `setTextFormatter(params)`<span class="api-version">v0.18+</span>: This is a very useful feature,can be used to set a set of rules for the input to formatting the input content in real-time.
+ - `params {object}`：formatting rules, contains the following parameters:
+ - `formatRule {regexp}`: Regular expression used to format the match
+ - `formatReplace {string}`: Contents to replace after format matching
+ - `recoverRule {regexp}`: Regular expressions to restore original content from formatted content
+ - `recoverReplace {string}`: Content to replace when restoring original content
+
+For details of `setTextFormatter`, please refer to [sample](http://dotwe.org/vue/bea3cb0cad697829d8d343552a2b7b77)
### Notes
input does not support the common-event `click`. Please listen to the `input` or `change` event instead.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/bc465a5e/source/references/components/slider.md
----------------------------------------------------------------------
diff --git a/source/references/components/slider.md b/source/references/components/slider.md
index 920a6b8..74c8487 100644
--- a/source/references/components/slider.md
+++ b/source/references/components/slider.md
@@ -22,6 +22,10 @@ It supports all kinds of weex components as its slides, especially the `indicato
- `interval`: <number> millisecond. This value determines time interval for each page displayed in slider.
- `index`: <number> . This value determines the index of current shown slide. The default value is `0`.
- `offset-x-accuracy {float}`：set the scroll event trigger precision, precision value represents the rolling distance of a page width ratio.
+- `show-indicators {boolean}`：set whether to display indicator
+- `infinite {boolean}`：set whether the page in the slider can be scrolled
+- `scrollable {boolean}`：set whether slider pages can be switched by sliding gestures
+- `keep-index {boolean}`：set whether to maintain the index of the page after the data changes
## Styles
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/bc465a5e/source/references/modules/picker.md
----------------------------------------------------------------------
diff --git a/source/references/modules/picker.md b/source/references/modules/picker.md
index 1ecdedf..e8ecac0 100644
--- a/source/references/modules/picker.md
+++ b/source/references/modules/picker.md
@@ -24,6 +24,15 @@ pick data(single column)
- `options {Object}`:pick options
- `index {number}`:default selected row
- `items {array}`:picker's data
+ - `textColor {color}`：text color in the picker item
+ - `selectionColor {color}`：the background color of the selected item in the picker
+ - `confirmTitle {string}`：confirm button text
+ - `cancelTitle {string}`：cancel button text
+ - `confirmTitleColor {color}`：confirm button text color
+ - `cancelTitleColor {color}`：cancel button text color
+ - `title {string}`：title of dialog
+ - `titleColor {color}`：text color of the dialog title
+ - `titleBackgroundColor {color}`：background color of the dialog title
- `callback {function (ret)}`:the callback function after executing this action.`ret {Object}` is `callback` 's parameter:
- `result {string}`:result is one of success,cancel,error
[7/7] incubator-weex-site git commit: Update url validator to scan
local path and fix 404 local path (#118)
Posted by ha...@apache.org.
Update url validator to scan local path and fix 404 local path (#118)
close #105
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/da4a81e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/da4a81e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/da4a81e4
Branch: refs/heads/master
Commit: da4a81e4de53dac692e6b6175899115a03276bc5
Parents: 4dedcdf 15a0788
Author: Hanks <zh...@gmail.com>
Authored: Thu Mar 22 19:01:23 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Thu Mar 22 19:01:23 2018 +0800
----------------------------------------------------------------------
package-lock.json | 9 +++
package.json | 1 +
source/cn/guide/index.md | 8 +--
source/cn/guide/use-vue.md | 2 +-
source/cn/references/components/cell.md | 4 +-
source/cn/references/components/div.md | 4 +-
source/cn/references/components/indicator.md | 4 +-
source/cn/references/components/input.md | 6 +-
source/cn/references/components/list.md | 4 +-
source/cn/references/components/loading.md | 2 +-
source/cn/references/components/refresh.md | 2 +-
source/cn/references/components/scroller.md | 4 +-
source/cn/references/components/slider.md | 4 +-
source/cn/references/components/switch.md | 4 +-
source/cn/references/components/text.md | 2 +-
source/cn/references/components/textarea.md | 6 +-
source/cn/references/components/video.md | 2 +-
source/cn/references/components/waterfall.md | 4 +-
source/cn/references/modules/storage.md | 1 +
source/cn/tools/index.md | 4 +-
source/cn/tools/toolkit.md | 21 +++----
source/cn/wiki/css-units.md | 2 +-
source/cn/wiki/faq.md | 6 +-
source/cn/wiki/index.md | 10 ++--
source/cn/wiki/platform-difference.md | 10 ++--
source/cn/wiki/text-styles.md | 2 +-
source/contributing.md | 4 +-
source/development-process.md | 6 +-
source/guide/create-a-plugin.md | 2 +-
source/guide/index.md | 6 +-
source/guide/use-vue.md | 2 +-
source/references/components/cell.md | 8 +--
source/references/components/div.md | 8 +--
source/references/components/indicator.md | 8 +--
source/references/components/input.md | 8 +--
source/references/components/list.md | 8 +--
source/references/components/loading.md | 2 +-
source/references/components/refresh.md | 2 +-
source/references/components/scroller.md | 8 +--
source/references/components/slider.md | 10 ++--
source/references/components/switch.md | 8 +--
source/references/components/text.md | 6 +-
source/references/components/textarea.md | 8 +--
source/references/components/video.md | 2 +-
source/references/components/waterfall.md | 8 +--
source/references/weex-variable.md | 2 +-
source/tools/index.md | 4 +-
source/tools/toolkit.md | 10 ++--
source/wiki/faq.md | 8 +--
source/wiki/index.md | 14 ++---
source/wiki/text-styles.md | 2 +-
test/url-validator.js | 69 ++++++++++++++++++-----
52 files changed, 203 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/da4a81e4/source/cn/references/components/input.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/da4a81e4/source/cn/references/components/slider.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/da4a81e4/source/references/components/input.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/da4a81e4/source/references/components/slider.md
----------------------------------------------------------------------
diff --cc source/references/components/slider.md
index d822760,6d3b377..05cfd3d
--- a/source/references/components/slider.md
+++ b/source/references/components/slider.md
@@@ -22,12 -22,8 +22,12 @@@ It supports all kinds of weex component
- `interval`: <number> millisecond. This value determines time interval for each page displayed in slider.
- `index`: <number> . This value determines the index of current shown slide. The default value is `0`.
- `offset-x-accuracy {float}`：set the scroll event trigger precision, precision value represents the rolling distance of a page width ratio.
+- `show-indicators {boolean}`：set whether to display indicator
+- `infinite {boolean}`：set whether the page in the slider can be scrolled
+- `scrollable {boolean}`：set whether slider pages can be switched by sliding gestures
+- `keep-index {boolean}`：set whether to maintain the index of the page after the data changes
- - `index {number}`: specify current page index of slider
+ - `index {number}`: specify current page index of slider
[try in dotWe](http://dotwe.org/vue/58a29d38247e7946a6db44e1b616f082)
## Styles
[2/7] incubator-weex-site git commit: Fix a lot of 404 local path
Posted by ha...@apache.org.
Fix a lot of 404 local path
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/06f9ee6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/06f9ee6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/06f9ee6c
Branch: refs/heads/master
Commit: 06f9ee6cbe6b973b9d8ea0c832b88a8b017678ac
Parents: 8fcc513
Author: Zhenfei You <he...@imyzf.com>
Authored: Thu Mar 22 17:06:16 2018 +0800
Committer: Zhenfei You <he...@imyzf.com>
Committed: Thu Mar 22 17:06:26 2018 +0800
----------------------------------------------------------------------
source/cn/guide/index.md | 4 ++--
source/cn/guide/use-vue.md | 2 +-
source/cn/references/components/cell.md | 4 ++--
source/cn/references/components/div.md | 4 ++--
source/cn/references/components/indicator.md | 4 ++--
source/cn/references/components/input.md | 6 +++---
source/cn/references/components/list.md | 4 ++--
source/cn/references/components/loading.md | 2 +-
source/cn/references/components/refresh.md | 2 +-
source/cn/references/components/scroller.md | 4 ++--
source/cn/references/components/slider.md | 4 ++--
source/cn/references/components/switch.md | 4 ++--
source/cn/references/components/text.md | 2 +-
source/cn/references/components/textarea.md | 6 +++---
source/cn/references/components/video.md | 2 +-
source/cn/references/components/waterfall.md | 4 ++--
source/cn/references/modules/storage.md | 1 +
source/cn/releasenote.md | 6 +++---
source/cn/tools/index.md | 4 ++--
source/cn/tools/toolkit.md | 7 ++++---
source/cn/wiki/css-units.md | 2 +-
source/cn/wiki/faq.md | 6 +++---
source/cn/wiki/index.md | 10 +++++-----
source/cn/wiki/platform-difference.md | 10 +++++-----
source/cn/wiki/text-styles.md | 2 +-
source/contributing.md | 4 ++--
source/development-process.md | 6 ++++--
source/guide/create-a-plugin.md | 2 +-
source/guide/index.md | 4 ++--
source/guide/use-vue.md | 2 +-
source/references/components/cell.md | 8 ++++----
source/references/components/div.md | 8 ++++----
source/references/components/indicator.md | 8 ++++----
source/references/components/input.md | 8 ++++----
source/references/components/list.md | 8 ++++----
source/references/components/loading.md | 2 +-
source/references/components/refresh.md | 2 +-
source/references/components/scroller.md | 8 ++++----
source/references/components/slider.md | 10 +++++-----
source/references/components/switch.md | 8 ++++----
source/references/components/text.md | 6 +++---
source/references/components/textarea.md | 8 ++++----
source/references/components/video.md | 2 +-
source/references/components/waterfall.md | 8 ++++----
source/references/weex-variable.md | 2 +-
source/releasenote.md | 6 +++---
source/tools/index.md | 4 ++--
source/tools/toolkit.md | 14 +++++++-------
source/wiki/faq.md | 8 ++++----
source/wiki/index.md | 14 +++++++-------
source/wiki/text-styles.md | 2 +-
51 files changed, 136 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/guide/index.md
----------------------------------------------------------------------
diff --git a/source/cn/guide/index.md b/source/cn/guide/index.md
index 400da60..f6f257e 100644
--- a/source/cn/guide/index.md
+++ b/source/cn/guide/index.md
@@ -26,7 +26,7 @@ Weex 的另一个主要目标是跟进当代先进的 Web 开发和原生开发
-这个例子在屏幕正中间渲染了一个单词 “Yo”。 如果你想在移动设备上预览渲染结果，你只需要安装[Weex playground app](https://weex.apache.org/cn/tools/playground.html) 或将 Weex SDK 集成到您自己的应用程序中，然后使用扫描网页右侧的二维码。
+这个例子在屏幕正中间渲染了一个单词 “Yo”。 如果你想在移动设备上预览渲染结果，你只需要安装[Weex playground app](https://weex-project.io/playground.html) 或将 Weex SDK 集成到您自己的应用程序中，然后使用扫描网页右侧的二维码。
在源代码的 `<template>` 中，`<div>` 你应该很熟悉了，它在 Weex 平台上也是一个通用容器。但是 `<text>` 组件是由 Weex 特有的，它是一个块级的文本容器，可以用来渲染文字。
@@ -83,7 +83,7 @@ Weex 可以只编写一份代码，开发出三端都可用的页面。
> Vue.js 和 Rax 都已经集成进了 Weex SDK，你不需要再额外引入。
-然而 Weex 也不是只支持 Vue 和 Rax，你也可以把自己喜欢的前端框架集成到 Weex 中。有一个文档*[扩展前端框架](./advanced/extend-js-framework.html)*描述了如何实现，但是这个过程仍然非常复杂和棘手，你需要了解关于 js-native 之间通信和原生渲染引擎的许多底层细节。
+然而 Weex 也不是只支持 Vue 和 Rax，你也可以把自己喜欢的前端框架集成到 Weex 中。有一个文档*[扩展前端框架](/cn/guide/extend-js-framework.html)*描述了如何实现，但是这个过程仍然非常复杂和棘手，你需要了解关于 js-native 之间通信和原生渲染引擎的许多底层细节。
## 创建一个 App
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/guide/use-vue.md
----------------------------------------------------------------------
diff --git a/source/cn/guide/use-vue.md b/source/cn/guide/use-vue.md
index d431876..c828f90 100644
--- a/source/cn/guide/use-vue.md
+++ b/source/cn/guide/use-vue.md
@@ -82,7 +82,7 @@ Vue 中的[单文件组件](https://cn.vuejs.org/v2/guide/single-file-components
### 使用weex-loader
-[weex-loader](https://github.com/weexteam/weex-loader) 是一个 webpack 的 [loader](https://webpack.js.org/concepts/loaders/#using-loaders)，它能把`*.vue`文件转化为简单的javascript 模块用于安卓以及 iOS 平台。所有的特性和配置都是跟 [vue-loader](https://vue-loader.vuejs.org/en/) 一样的。
+[weex-loader](https://github.com/weexteam/weex-loader) 是一个 webpack 的 [loader](http://webpack.github.io/docs/using-loaders.html)，它能把`*.vue`文件转化为简单的javascript 模块用于安卓以及 iOS 平台。所有的特性和配置都是跟 [vue-loader](https://vue-loader.vuejs.org/en/) 一样的。
需要注意的是，如果您的Webpack配置的*entry*选项是一个`*.vue`文件的话，你仍需要传递一个额外的`entry`参数。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/cell.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/cell.md b/source/cn/references/components/cell.md
index f4c4c2b..4e61034 100644
--- a/source/cn/references/components/cell.md
+++ b/source/cn/references/components/cell.md
@@ -31,7 +31,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -44,7 +44,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
## 示例
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/div.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/div.md b/source/cn/references/components/div.md
index 710a9d8..b649a31 100644
--- a/source/cn/references/components/div.md
+++ b/source/cn/references/components/div.md
@@ -51,7 +51,7 @@ version: 2.1
- `opacity`
- `background-color`
-查看 [组件通用样式](../common-style.html)
+查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -62,7 +62,7 @@ version: 2.1
- `appear`
- `disappear`
-查看 [通用事件](../common-event.html)
+查看 [通用事件](/cn/wiki/common-events.html)
## 约束
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/indicator.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/indicator.md b/source/cn/references/components/indicator.md
index 0e9f639..283449b 100644
--- a/source/cn/references/components/indicator.md
+++ b/source/cn/references/components/indicator.md
@@ -31,7 +31,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
**注意 1：**
@@ -51,7 +51,7 @@ version: 2.1
- `appear`
- `disappear`
-查看 [通用事件](../common-event.html)
+查看 [通用事件](/cn/wiki/common-events.html)
## 约束
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/input.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/input.md b/source/cn/references/components/input.md
index 66c85e7..8f01126 100644
--- a/source/cn/references/components/input.md
+++ b/source/cn/references/components/input.md
@@ -52,7 +52,7 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
- 支持 `font-weight`
- 支持 `text-align`
- 查看 [文本样式](../text-style.html)
+ 查看 [文本样式](/cn/wiki/text-styles.html)
- 通用样式：支持所有通用样式
- 盒模型
@@ -61,7 +61,7 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -109,7 +109,7 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/list.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/list.md b/source/cn/references/components/list.md
index 37dd523..f502641 100644
--- a/source/cn/references/components/list.md
+++ b/source/cn/references/components/list.md
@@ -58,7 +58,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -85,7 +85,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
## 扩展
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/loading.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/loading.md b/source/cn/references/components/loading.md
index d66eeea..7ac4df9 100644
--- a/source/cn/references/components/loading.md
+++ b/source/cn/references/components/loading.md
@@ -89,7 +89,7 @@ version: 2.1
## 样式
- - 支持所有通用样式。查看 [组件通用样式](../common-style.html)
+ - 支持所有通用样式。查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/refresh.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/refresh.md b/source/cn/references/components/refresh.md
index 14fcc1f..0f1430d 100644
--- a/source/cn/references/components/refresh.md
+++ b/source/cn/references/components/refresh.md
@@ -86,7 +86,7 @@ version: 2.1
## 样式
- - 支持所有通用样式。查看 [组件通用样式](../common-style.html)
+ - 支持所有通用样式。查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/scroller.md b/source/cn/references/components/scroller.md
index 9ae7833..1334a07 100644
--- a/source/cn/references/components/scroller.md
+++ b/source/cn/references/components/scroller.md
@@ -58,7 +58,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -84,7 +84,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
## 扩展
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/slider.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/slider.md b/source/cn/references/components/slider.md
index ad90222..8856d82 100644
--- a/source/cn/references/components/slider.md
+++ b/source/cn/references/components/slider.md
@@ -39,7 +39,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -62,7 +62,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
## 示例
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/switch.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/switch.md b/source/cn/references/components/switch.md
index 63ff5f1..3d235de 100644
--- a/source/cn/references/components/switch.md
+++ b/source/cn/references/components/switch.md
@@ -66,7 +66,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
## 样式
@@ -89,7 +89,7 @@ version: 2.1
- `opacity`
- `background-color`
-查看 [组件通用样式](../common-style.html)
+查看 [组件通用样式](/cn/wiki/common-styles.html)
## 使用说明
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/text.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/text.md b/source/cn/references/components/text.md
index de3f5b6..8b4932f 100644
--- a/source/cn/references/components/text.md
+++ b/source/cn/references/components/text.md
@@ -18,7 +18,7 @@ version: 2.1
## 样式
* 支持 **[通用样式](../../wiki/common-styles.html)。**
* `lines {number}`: 指定文本行数。默认值是 `0`， 代表不限制行数。
-* 支持 **[文本样式](../wiki/text-style.html)。**
+* 支持 **[文本样式](/cn/wiki/text-styles.html)。**
* 支持 `color` 样式.
* 支持 `font-size` 样式，默认值为`32`.
* 支持 `font-style` 样式.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/textarea.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/textarea.md b/source/cn/references/components/textarea.md
index b8cd14c..b4eff5f 100644
--- a/source/cn/references/components/textarea.md
+++ b/source/cn/references/components/textarea.md
@@ -38,7 +38,7 @@ version: 2.1
- 支持 `font-weight`
- 支持 `text-align`
- 查看 [文本样式](../text-style.html)
+ 查看 [文本样式](/cn/wiki/text-styles.html)
- 通用样式：支持所有通用样式
@@ -48,7 +48,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
@@ -90,7 +90,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
## 示例
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/video.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/video.md b/source/cn/references/components/video.md
index 67c5024..ffd7fe8 100644
--- a/source/cn/references/components/video.md
+++ b/source/cn/references/components/video.md
@@ -32,7 +32,7 @@ version: 2.1
- `opacity`
- `background-color`
- 查看 [组件通用样式](../common-style.html)
+ 查看 [组件通用样式](/cn/wiki/common-styles.html)
## 事件
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/components/waterfall.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/waterfall.md b/source/cn/references/components/waterfall.md
index 1844eba..75ea7b9 100644
--- a/source/cn/references/components/waterfall.md
+++ b/source/cn/references/components/waterfall.md
@@ -41,7 +41,7 @@ version: 2.1
- `opacity`
- `background-color`
-查看 [组件通用样式](../common-style.html)
+查看 [组件通用样式](/cn/wiki/common-styles.html)
### 事件
@@ -54,7 +54,7 @@ version: 2.1
- `appear`
- `disappear`
- 查看 [通用事件](../common-event.html)
+ 查看 [通用事件](/cn/wiki/common-events.html)
### API
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/references/modules/storage.md
----------------------------------------------------------------------
diff --git a/source/cn/references/modules/storage.md b/source/cn/references/modules/storage.md
index 855f081..181ec3a 100644
--- a/source/cn/references/modules/storage.md
+++ b/source/cn/references/modules/storage.md
@@ -182,3 +182,4 @@ version: 2.1
## 其它参考
* [W3school: html5 localStorage](http://www.w3school.com.cn/html5/html_5_webstorage.asp)
+* [storage 模块完整的 Demo](https://github.com/apache/incubator-weex/blob/dev/examples/module/storage-demo.we)
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/releasenote.md
----------------------------------------------------------------------
diff --git a/source/cn/releasenote.md b/source/cn/releasenote.md
index 5ead271..ba3ab43 100644
--- a/source/cn/releasenote.md
+++ b/source/cn/releasenote.md
@@ -174,7 +174,7 @@ layout: post
The former front-end 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-weight`](https://weex.apache.org/wiki/text-styles.html)
+ - [text `font-weight`](https://weex-project.io/references/text-style.html)
`font-weight` can set to [`normal`|`bold`] or 100-900.
- gradient
like CSS3, now you can use gradient in Weex. For example:
@@ -183,7 +183,7 @@ layout: post
background-image: linear-gradient(to right, blue, white);
```
- [Read more about gradient](https://weex.apache.org/wiki/common-styles.html#linear-gradient-v0-10).
+ [Read more about gradient](https://weex-project.io/references/common-style.html).
- Pseudo class
Currently, Weex supports 4 pseudo classes:`active`, `focus`, `disabled`, `enabled`.
- New BroadcastChannel API
@@ -225,7 +225,7 @@ layout: post
- Has full set of commands for developers to setup android/ios application 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](https://market.dotwe.org) was formally used for developers to publish/download weex plugins.
+ - [Plugin market](http://market.weex-project.io) was formally used for developers to publish/download weex plugins.
## v0.9.4
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/tools/index.md
----------------------------------------------------------------------
diff --git a/source/cn/tools/index.md b/source/cn/tools/index.md
index c6c4517..33a61f6 100644
--- a/source/cn/tools/index.md
+++ b/source/cn/tools/index.md
@@ -7,7 +7,7 @@ version: 2.1
# 开发工具
-+ [Playground App](./playground.html)
++ [Playground App](/tools/playground.html)
+ [Online Playground](http://dotwe.org/vue/)
+ [weex-toolkit](./toolkit.html)
-+ [Weex Language Support插件](./plugin.html)
++ [Weex Language Support插件](/cn/tools/helpers.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/source/cn/tools/toolkit.md b/source/cn/tools/toolkit.md
index 2df904d..0c66756 100644
--- a/source/cn/tools/toolkit.md
+++ b/source/cn/tools/toolkit.md
@@ -50,7 +50,7 @@ weex-toolkit工具支持对你的Weex文件（`.we`或`.vue`)在监听模式下
$ weex preview src/foo.vue
```
-浏览器会自动得打开预览页面并且你可以看到你的weex页面的布局和效果。如果你在你的设备上安装了[Playground](https://weex.apache.org/cn/tools/playground.html)，你还可以通过扫描页面上的二维码来查看页面。
+浏览器会自动得打开预览页面并且你可以看到你的weex页面的布局和效果。如果你在你的设备上安装了[Playground](https://weex.apache.org/cn/playground.html)，你还可以通过扫描页面上的二维码来查看页面。
使用下面的命令，你将可以预览整个文件夹中的`.vue`文件
@@ -198,6 +198,7 @@ ElementMode可以切换Element标签中Domtree显示模式，下图为vdom显示
#### 集成devtool工具
* Android
- * 查看文档 [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), 它会引导你一步一步配置和使用它。
+ * 查看文档 [Weex devtools (Android)](/cn/guide/integrate-devtool-to-android.html), 它会引导你一步一步配置和使用它。
* iOS
- * 查看文档 [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), 它会引导你一步一步配置和使用它。
+ * 查看文档 [Weex devtools (iOS)](/cn/guide/integrate-devtool-to-ios.html), 它会引导你一步一步配置和使用它。
+和使用它。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/wiki/css-units.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/css-units.md b/source/cn/wiki/css-units.md
index 4b67ca0..512544c 100644
--- a/source/cn/wiki/css-units.md
+++ b/source/cn/wiki/css-units.md
@@ -53,7 +53,7 @@ version: 2.1
## CSS `number` 单位
-仅仅一个数字。用于 [`opacity`](./common-style.html)，[`lines`](./text-style.html)等。
+仅仅一个数字。用于 [`opacity`](./common-styles.html)，[`lines`](./text-styles.html)等。
有时值必须是整数，例如：`lines`。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/wiki/faq.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/faq.md b/source/cn/wiki/faq.md
index b2a1a89..4ac33e8 100644
--- a/source/cn/wiki/faq.md
+++ b/source/cn/wiki/faq.md
@@ -19,7 +19,7 @@ version: 2.1
## Windows 指令错误
-请先安装 [Git for Windows](https://git-scm.com/download/win)，在 [For Windows](https://github.com/apache/incubator-weex/tree/master#for-windows) 中查看更多信息。
+请先安装 [Git for Windows](https://git-scm.com/download/win)，在 [For Windows](https://github.com/apache/incubator-weex/tree/dev#for-windows) 中查看更多信息。
## Android Studio 中 Gradle 错误
@@ -137,8 +137,8 @@ else {
如果你有两个页面，A 页面和 B 页面
-1. A -> B，使用 [getConfig api](/references/api.md#getconfig) or [storage module](/modules/storage.md) 传递数据；
-2. B -> A，使用 [storage module](/modules/storage.md) 传递数据。
+1. A -> B，使用 [getConfig api](/references/api.md#getconfig) or [storage module](/cn/references/modules/storage.html) 传递数据；
+2. B -> A，使用 [storage module](/cn/references/modules/storage.html) 传递数据。
## 父子组件之间进行 repeat 操作
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/wiki/index.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/index.md b/source/cn/wiki/index.md
index 14d3372..2777081 100644
--- a/source/cn/wiki/index.md
+++ b/source/cn/wiki/index.md
@@ -13,7 +13,7 @@ version: 2.1
Weex 表面上是一个客户端技术，但实际上它串联起了从本地开发环境到云端部署和分发的整个链路。开发者首先可以在本地像撰写 web 页面一样撰写一个 app 的页面，然后编译成一段 JavaScript 代码，形成 Weex 的一个 JS bundle；在云端，开发者可以把生成的 JS bundle 部署上去，然后通过网络请求或预下发的方式传递到用户的移动应用客户端；在移动应用客户端里，WeexSDK 会准备好一个 JavaScript 引擎，并且在用户打开一个 Weex 页面时执行相应的 JS bundle，并在执行过程中产生各种命令发送到 native 端进行的界面渲染或数据存储、网络通信、调用设备功能、用户交互响应等移动应用的场景实践；同时，如果用户没有安装移动应用，他仍然可以在浏览器里打开一个相同的 web 页面，这个页面是使用相同的页面源代码，通过浏览器里的 JavaScript 引擎运行起来的。
-
+
## 本地开发环境
@@ -25,8 +25,8 @@ Weex 的本地开发环境基于 web 开发体验而设计，web 开发者可以
**相关阅读**
-* [Weex 和 web 平台的差异](../../references/platform-difference.html)
-* [Vue 2.x 在 Weex 和 web 中的差异](../../references/vue/difference-with-web.html)
+* [Weex 和 web 平台的差异](/cn/wiki/platform-difference.html)
+* [Vue 2.x 在 Weex 和 web 中的差异](/cn/wiki/platform-difference.html)
* [快速上手](../index.html)
* [使用 Devtools](./devtools.html)
@@ -49,8 +49,8 @@ Weex 目前提供了 iOS 和 Android 两个客户端的 native 渲染层。每
* [Weex 的组件和模块跟 web 标准的区别](../../references/web-standards.html)
* [如何使用 iOS](../../references/ios-apis.html)
* [如何使用 Android](../../references/android-apis.html)
-* [如何扩展 iOS](../../references/advanced/extend-to-ios.html)
-* [如何扩展 Android](../../references/advanced/extend-to-android.html)
+* [如何扩展 iOS](/cn/guide/extend-ios.html)
+* [如何扩展 Android](/cn/guide/extend-android.html)
## 浏览器渲染
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/wiki/platform-difference.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/platform-difference.md b/source/cn/wiki/platform-difference.md
index 482dca9..9a6b53f 100644
--- a/source/cn/wiki/platform-difference.md
+++ b/source/cn/wiki/platform-difference.md
@@ -55,16 +55,16 @@ Weex 中并未提供浏览器中的 `window` 和 `screen` 对象，不支持使
这些接口与浏览器自身的实现有关，可以控制页面的前进后退并且获取状态信息。虽然在 Android 和 iOS 中也有“历史”和“导航”的概念，但是它是用于多个管理视图之间的跳转的。换句话说，在浏览器中执行“前进”、“后退”仍然会处于同一个页签中，在原生应用中“前进”、“后退”则会真实的跳转到其他页面。
-此外 Weex 也提供了 `navigator` 模块来操作页面的跳转，使用方法参考[《navigator 导航控制》](./modules/navigator.html)。
+此外 Weex 也提供了 `navigator` 模块来操作页面的跳转，使用方法参考[《navigator 导航控制》](/cn/references/modules/navigator.html)。
## 能够调用移动设备原生 API
在 Weex 中能够调用移动设备原生 API，使用方法是通过注册、调用模块来实现。其中有一些模块是 Weex 内置的，如 clipboard 、 navigator 、storage 等。
-+ [《clipboard 剪切板》](./modules/clipboard.html)
-+ [《navigator 导航控制》](./modules/navigator.html)
-+ [《storage 本地存储 》](./modules/storage.html)
++ [《clipboard 剪切板》](/cn/references/modules/clipboard.html)
++ [《navigator 导航控制》](/cn/references/modules/navigator.html)
++ [《storage 本地存储 》](/cn/references/modules/storage.html)
-为了保持框架的通用性，Weex 内置的原生模块有限，不过 Weex 提供了横向扩展的能力，可以扩展原生模块，具体的扩展方法请参考[《iOS 扩展》](./advanced/index.html) 和[《Android 扩展》](./advanced/extend-to-android.html)。
+为了保持框架的通用性，Weex 内置的原生模块有限，不过 Weex 提供了横向扩展的能力，可以扩展原生模块，具体的扩展方法请参考[《iOS 扩展》](/cn/index.html) 和[《Android 扩展》](/cn/guide/extend-android.html)。
> 有些接口在浏览器环境中也存在，不过在使用时应该注意浏览器的兼容性；如剪贴板功能，出于安全性考虑，绝大多数浏览器都限制其使用。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/cn/wiki/text-styles.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/text-styles.md b/source/cn/wiki/text-styles.md
index 7b1850e..be91530 100644
--- a/source/cn/wiki/text-styles.md
+++ b/source/cn/wiki/text-styles.md
@@ -10,7 +10,7 @@ version: 2.1
<span class="weex-version">v0.5+</span>
-文本类组件共享一些通用样式, 这类组件目前包括 [`<text>`](./components/text.html) 和 [`<input>`](./components/input.html)。
+文本类组件共享一些通用样式, 这类组件目前包括 [`<text>`](/cn/references/components/text.html) 和 [`<input>`](/cn/references/components/input.html)。
## 属性
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/contributing.md
----------------------------------------------------------------------
diff --git a/source/contributing.md b/source/contributing.md
index 0df300d..8e762a6 100644
--- a/source/contributing.md
+++ b/source/contributing.md
@@ -16,7 +16,7 @@ You can use Weex directly through [Getting Started](./guide/index.html) tutorial
We are using JIRA for tracking all the issues and updating whenever when have an internal fix in progress. Before filing a new task, try to confirm if it is already listed or if there is a fix in progress.
##### Report New Issues
-Open a [JIRA Issue](https://issues.apache.org/jira/projects/WEEX) , click on the top red "Create" button (you may need to [create a JIRA account](https://issues.apache.org/jira/secure/Signup!default.jspa) if you haven't registered). [Bug Report Guidelines](../bug-report-guidelines.html) document provides some of the most useful information about writing a good bug report. The better your bug report is, the faster we can reproduce and fix it!
+Open a [JIRA Issue](https://issues.apache.org/jira/projects/WEEX) , click on the top red "Create" button (you may need to [create a JIRA account](https://issues.apache.org/jira/secure/Signup!default.jspa) if you haven't registered). [Bug Report Guidelines](/bug-report-guidelines.html) document provides some of the most useful information about writing a good bug report. The better your bug report is, the faster we can reproduce and fix it!
## Contribute Code
@@ -24,7 +24,7 @@ Apache Weex is an open source project and both, core team members and external c
You can contribute code by either fixing an existing bug or developing new features. In either case, we always encourage to create a JIRA ticket and ensure we are in agreement on your proposal.
-To help you get started, we've created a document with more details about development process. Please read **[Getting Started with Development Process](../development-process.html)**.
+To help you get started, we've created a document with more details about development process. Please read **[Getting Started with Development Process](/development-process.html)**.
## Ask or Answer Questions
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/development-process.md
----------------------------------------------------------------------
diff --git a/source/development-process.md b/source/development-process.md
index db6362c..ed01d01 100644
--- a/source/development-process.md
+++ b/source/development-process.md
@@ -23,7 +23,7 @@ Be sure to search the issues before creating new ones to avoid duplication. If y
2. Clone your fork, create a new branch to push your commits to.
-3. Develop your feature or bug fix. Make sure your changes meet the [code style guidelines](../development-process.html#code-style-guidelines).
+3. Develop your feature or bug fix. Make sure your changes meet the [code style guidelines](/development-process.html#code-style-guidelines).
4. Copy and paste this to the top of your new file(s):
@@ -50,7 +50,7 @@ Be sure to search the issues before creating new ones to avoid duplication. If y
5. Documentation and tests should be added or referenced if they need to be added or updated as part of the change.
-6. Commit to your branch following [commit guidelines](../development-process.html#commit-guidelines).
+6. Commit to your branch following [commit guidelines](/development-process.html#commit-guidelines).
## 3. Create a Pull Request
@@ -97,3 +97,5 @@ A short subject and a blank line after the subject are crucial. Use the bug numb
Some good thoughts on how to write good git commit messages can be found [here](https://chris.beams.io/posts/git-commit/).
+
+
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/guide/create-a-plugin.md
----------------------------------------------------------------------
diff --git a/source/guide/create-a-plugin.md b/source/guide/create-a-plugin.md
index fe3753a..9a098f8 100644
--- a/source/guide/create-a-plugin.md
+++ b/source/guide/create-a-plugin.md
@@ -102,7 +102,7 @@ See [Extend iOS](./extend-ios.html).
```
## Publish the plugin in the weex market
-You can publish to the [Weex Market](../tools/market.html) with the simple command:
+You can publish to the [Weex Market](https://market.dotwe.org/) with the simple command:
```
weex plugin publish
```
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/guide/index.md
----------------------------------------------------------------------
diff --git a/source/guide/index.md b/source/guide/index.md
index 15d3b11..30520e6 100644
--- a/source/guide/index.md
+++ b/source/guide/index.md
@@ -26,7 +26,7 @@ Here is an [example](http://dotwe.org/vue/8da01827631b21150a12dd54d7114380) writ
-This example renders a word "Yo" in the center of the screen. If you want to preview the rendered result on mobile devices, you need to install the [Weex playground app](https://weex.apache.org/tools/playground.html) or integrate Weex SDK into your own app. Then scan your page's QR code with your playground app or your own app (with the QR scan feature to load scanned URL with Weex SDK), and you will see the rendered result on your device.
+This example renders a word "Yo" in the center of the screen. If you want to preview the rendered result on mobile devices, you need to install the [Weex playground app](https://weex-project.io/playground.html) or integrate Weex SDK into your own app. Then scan your page's QR code with your playground app or your own app (with the QR scan feature to load scanned URL with Weex SDK), and you will see the rendered result on your device.
Within the `<template>` of the source code, You must be familiar with the `<div>` which is widely used on the web, and it's also the generic container on Weex. But the `<text>` component is provided by Weex, it's a block-level text container.
@@ -127,7 +127,7 @@ It will start a web server on the `8081` port. You can open `http://localhost:80
-Besides, You can also open `http://localhost:8081/preview.html` to preview the rendered result for web in iframe. You can also scan the QR code generated on the right using the [Weex playground app](../tools/playground.html) then you'll see the rendered result on the mobile device.
+Besides, You can also open `http://localhost:8081/preview.html` to preview the rendered result for web in iframe. You can also scan the QR code generated on the right using the [Weex playground app](/tools/playground.html) then you'll see the rendered result on the mobile device.
### Build and Run
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/guide/use-vue.md
----------------------------------------------------------------------
diff --git a/source/guide/use-vue.md b/source/guide/use-vue.md
index dbe241c..91767bd 100644
--- a/source/guide/use-vue.md
+++ b/source/guide/use-vue.md
@@ -85,7 +85,7 @@ Use different bundles for different platforms is to make good use of the platfor
### Use weex-loader
-[weex-loader](https://github.com/weexteam/weex-loader) is a [loader](https://webpack.js.org/concepts/loaders/#using-loaders) for webpack that can transform `*.vue` file into a plain javascript module for Android and iOS platform. All features and configurations of it are same with [vue-loader](https://vue-loader.vuejs.org/en/).
+[weex-loader](https://github.com/weexteam/weex-loader) is a [loader](http://webpack.github.io/docs/using-loaders.html) for webpack that can transform `*.vue` file into a plain javascript module for Android and iOS platform. All features and configurations of it are same with [vue-loader](https://vue-loader.vuejs.org/en/).
One thing should be noted that if the *entry* option of your Webpack config is a `*.vue` file, you also need to pass an additional `entry` parameter.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/cell.md
----------------------------------------------------------------------
diff --git a/source/references/components/cell.md b/source/references/components/cell.md
index 37b0da3..d948a43 100644
--- a/source/references/components/cell.md
+++ b/source/references/components/cell.md
@@ -24,7 +24,7 @@ This type of component supports all kinds of weex component as its child compone
### Styles
-**common styles**: check out the [common styles](../common-style.html)
+**common styles**: check out the [common styles](/wiki/common-styles.html)
- support flexbox related styles
- support box model related styles
@@ -35,10 +35,10 @@ This type of component supports all kinds of weex component as its child compone
### Events
-**common events**: check out the [common events](../common-event.html)
+**common events**: check out the [common events](/wiki/common-events.html)
-- support `click` event. Check out [common events](../common-event.html)
-- support `appear` / `disappear` event. Check out [common events](../common-event.html)
+- support `click` event. Check out [common events](/wiki/common-events.html)
+- support `appear` / `disappear` event. Check out [common events](/wiki/common-events.html)
### Example
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/div.md
----------------------------------------------------------------------
diff --git a/source/references/components/div.md b/source/references/components/div.md
index 35e5b0d..3d0d80e 100644
--- a/source/references/components/div.md
+++ b/source/references/components/div.md
@@ -24,7 +24,7 @@ There is no specific attribute for this component.
### Styles
-**common styles**: check out the [common styles](../common-style.html)
+**common styles**: check out the [common styles](/wiki/common-styles.html)
- support flexbox related styles
- support box model related styles
@@ -33,10 +33,10 @@ There is no specific attribute for this component.
### Events
-**common events**: check out the [common events](../common-event.html)
+**common events**: check out the [common events](/wiki/common-events.html)
-- support `click` event. Check out [common events](../common-event.html)
-- support `appear` / `disappear` event. Check out [common events](../common-event.html)
+- support `click` event. Check out [common events](/wiki/common-events.html)
+- support `appear` / `disappear` event. Check out [common events](/wiki/common-events.html)
### Examples
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/indicator.md
----------------------------------------------------------------------
diff --git a/source/references/components/indicator.md b/source/references/components/indicator.md
index 700220b..494170a 100644
--- a/source/references/components/indicator.md
+++ b/source/references/components/indicator.md
@@ -27,7 +27,7 @@ Threr are some private styles for `<indicator>` :
- `item-selectedColor`: <colors> This style attribute sets the selected item, default is `#444444`.
- `item-size`: <length> The radius of the indicator elements, default is `5px`
-**common styles**: see [common styles](../common-style.html)
+**common styles**: see [common styles](/wiki/common-styles.html)
- support flexbox related styles
- support box model related styles
@@ -39,10 +39,10 @@ Threr are some private styles for `<indicator>` :
### Events
-**common events**: check out the [common events](../common-event.html)
+**common events**: check out the [common events](/wiki/common-events.html)
-- support `click` event. Check out [common events](../common-event.html)
-- support `appear` / `disappear` event. Check out [common events](../common-event.html)
+- support `click` event. Check out [common events](/wiki/common-events.html)
+- support `appear` / `disappear` event. Check out [common events](/wiki/common-events.html)
### Example
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/input.md
----------------------------------------------------------------------
diff --git a/source/references/components/input.md b/source/references/components/input.md
index bc0fe8b..0e29924 100644
--- a/source/references/components/input.md
+++ b/source/references/components/input.md
@@ -36,7 +36,7 @@ This component does not support any child component.
* `max` constrain the max date when `type` is `date`, format is `yyyy-MM-dd`
-* `min` constrain the min date when `type` is `date`, format is `yyyy-MM-dd`
+* `min` constrain the min date when `type` is `date`, format is `yyyy-MM-dd`
* `maxlength`: <span class="api-version">v0.7+</span> a number value to specify maxlength of input.
@@ -53,7 +53,7 @@ This component does not support any child component.
* `disabled`
* `enabled`
-* text styles: checkout [text styles](../text-style.html)
+* text styles: checkout [text styles](/wiki/text-styles.html)
* support `color` style.
* support `font-size` style.
@@ -62,7 +62,7 @@ This component does not support any child component.
* support `text-align` style.
### common styles
-check out [common styles for components](../common-style.html)
+check out [common styles for components](/wiki/common-styles.html)
* support flexbox related styles.
* support box model related styles.
@@ -83,7 +83,7 @@ check out [common styles for components](../common-style.html)
- `value`: component text value
### common events
-check out [common events](../common-event.html)
+check out [common events](/wiki/common-events.html)
* support `appear` / `disappear` event.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/list.md
----------------------------------------------------------------------
diff --git a/source/references/components/list.md b/source/references/components/list.md
index 679228f..ef68ecd 100644
--- a/source/references/components/list.md
+++ b/source/references/components/list.md
@@ -40,7 +40,7 @@ Please checkout [Scroller Component Attributes](./scroller.html) to have a look
### Styles
-common styles: check out [common styles for components](../common-style.html)
+common styles: check out [common styles for components](/wiki/common-styles.html)
* support flexbox related styles
* support box model related styles
@@ -53,10 +53,10 @@ onloadmore 0.5 used with loadmoreoffset attribute. if the view has less than lo
scroll <sup class="wx-v">0.12+</sup> used with offset-accuracy attribute. This event is fired when the list scrolls. The current contentOffset value is given in this event callback. See details in [scroll event demo](http://dotwe.org/vue/9ef0e52bacaa20182a693f2187d851aa).
-common events: check out the [common events](../common-event.html)
+common events: check out the [common events](/wiki/common-events.html)
-* support onclick event. Check out [common events](../common-event.html)
-* support onappear / ondisappear event. Check out [common events](../common-event.html)
+* support onclick event. Check out [common events](/wiki/common-events.html)
+* support onappear / ondisappear event. Check out [common events](/wiki/common-events.html)
### API
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/loading.md
----------------------------------------------------------------------
diff --git a/source/references/components/loading.md b/source/references/components/loading.md
index fc4389e..25b0971 100644
--- a/source/references/components/loading.md
+++ b/source/references/components/loading.md
@@ -90,7 +90,7 @@ The `<loading>` Component provide a pullup to loading function for some special
## Styles
- - Please check out the [common styles](../common/common-style)
+ - Please check out the [common styles](/wiki/common-styles.html)
## Events
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/refresh.md
----------------------------------------------------------------------
diff --git a/source/references/components/refresh.md b/source/references/components/refresh.md
index 87f1683..dddb79b 100644
--- a/source/references/components/refresh.md
+++ b/source/references/components/refresh.md
@@ -87,7 +87,7 @@ The `<refresh>` Component provide a pulldown-refresh function for some special c
## Styles
- - Please check out the [common styles](../common/common-style)
+ - Please check out the [common styles](/wiki/common-styles.html)
## Events
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/source/references/components/scroller.md b/source/references/components/scroller.md
index b4ac3b0..64371d5 100644
--- a/source/references/components/scroller.md
+++ b/source/references/components/scroller.md
@@ -38,7 +38,7 @@ There are two special components that can only be used inside scroller component
## Styles
-common styles: check out [common styles for components](../common-style.html)
+common styles: check out [common styles for components](/wiki/common-styles.html)
* support flexbox related styles
* support box model related styles
@@ -48,10 +48,10 @@ common styles: check out [common styles for components](../common-style.html)
## Events
-**common events**: check out the [common events](../common-event.html)
+**common events**: check out the [common events](/wiki/common-events.html)
-- support `click` event. Check out [common events](../common-event.html)
-- support `appear` / `disappear` event. Check out [common events](../common-event.html)
+- support `click` event. Check out [common events](/wiki/common-events.html)
+- support `appear` / `disappear` event. Check out [common events](/wiki/common-events.html)
- support `loadmore` event. The `loadmore` event should be used in concert with loadmoreoffset. If the view has less than loadmoreoffset to scroll down, the event will be triggered.See details in [example](http://dotwe.org/vue/26e980d5ccd9538941ea6d17761219ff).
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/slider.md
----------------------------------------------------------------------
diff --git a/source/references/components/slider.md b/source/references/components/slider.md
index b6bec18..6d3b377 100644
--- a/source/references/components/slider.md
+++ b/source/references/components/slider.md
@@ -23,12 +23,12 @@ It supports all kinds of weex components as its slides, especially the `indicato
- `index`: <number> . This value determines the index of current shown slide. The default value is `0`.
- `offset-x-accuracy {float}`：set the scroll event trigger precision, precision value represents the rolling distance of a page width ratio.
-- `index {number}`: specify current page index of slider
+- `index {number}`: specify current page index of slider
[try in dotWe](http://dotwe.org/vue/58a29d38247e7946a6db44e1b616f082)
## Styles
-**common styles**: check out [common styles for components](../common-style.html)
+**common styles**: check out [common styles for components](/wiki/common-styles.html)
- support flexbox related styles
- support box model related styles
@@ -40,10 +40,10 @@ It supports all kinds of weex components as its slides, especially the `indicato
- `change`: triggerd when the slide's index is changed. The event object contains the attribute of `index`, which is the index number of the currently shown slide.
- `scroll` <sup class="wx-v">0.11+</sup>：this event is fired when scrolling. The current offsetXRatio value is given in this event callback.
-**common events**: check out the [common events](../common-event.html)
+**common events**: check out the [common events](/wiki/common-events.html)
-- support `click` event. Check out [common events](../common-event.html)
-- support `appear` / `disappear` event. Check out [common events](../common-event.html)
+- support `click` event. Check out [common events](/wiki/common-events.html)
+- support `appear` / `disappear` event. Check out [common events](/wiki/common-events.html)
### Example
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/switch.md
----------------------------------------------------------------------
diff --git a/source/references/components/switch.md b/source/references/components/switch.md
index 4b59184..0263732 100644
--- a/source/references/components/switch.md
+++ b/source/references/components/switch.md
@@ -47,9 +47,9 @@ None.
## Events
-* `appear` / `disappear` event. check out [common events](../common-event.html)
-* `click` / `longpress`: check out [common events](../common-event.html)
-* `change`: check out [common events](../common-event.html)
+* `appear` / `disappear` event. check out [common events](/wiki/common-events.html)
+* `click` / `longpress`: check out [common events](/wiki/common-events.html)
+* `change`: check out [common events](/wiki/common-events.html)
## Parameters of events' object for onchange event:
@@ -70,7 +70,7 @@ None.
> **Notes:** If the container of `<switch>` is not set to `align-items:flex-start`, the switch in android will be stretched.
-common styles: check out [common styles for components](../common-style.html)
+common styles: check out [common styles for components](/wiki/common-styles.html)
## Usage Notes
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/text.md
----------------------------------------------------------------------
diff --git a/source/references/components/text.md b/source/references/components/text.md
index d72be39..120d390 100644
--- a/source/references/components/text.md
+++ b/source/references/components/text.md
@@ -17,9 +17,9 @@ The weex builtin component 'text' is used to render text with specified style
this.text = textComponent.attr.value;
## Styles
-* Support [common styles for components](../wiki/common-style.html)
+* Support [common styles for components](/wiki/common-styles.html)
* lines: specify the text lines. Default value is `0` for unlimited.
-* Support [text styles](../wiki/text-style.html)
+* Support [text styles](/wiki/text-styles.html)
* support 'color' style.
* support 'font-size' style. iOS: default vlaue `32`. Android: platform specify. HTML5: default value `32`.
* support 'font-style' style.
@@ -30,7 +30,7 @@ The weex builtin component 'text' is used to render text with specified style
* support 'line-height'(available from v0.6.1) style.
## Events
-Support [common events](../common-event.html)
+Support [common events](/wiki/common-events.html)
## Custom Typeface
`support:v0.12.0`
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/textarea.md
----------------------------------------------------------------------
diff --git a/source/references/components/textarea.md b/source/references/components/textarea.md
index dd61177..def3734 100644
--- a/source/references/components/textarea.md
+++ b/source/references/components/textarea.md
@@ -35,7 +35,7 @@ The `textarea` component supports all the properties of the `text` component, in
* `disabled`
* `enabled`
-**text styles**: checkout [text styles](../text-style.html)
+**text styles**: checkout [text styles](/wiki/text-styles.html)
- support `color` style.
- support `font-size` style.
@@ -44,7 +44,7 @@ The `textarea` component supports all the properties of the `text` component, in
- support `text-align` style.
-**common styles**: check out [common styles for components](../common-style.html)
+**common styles**: check out [common styles for components](/wiki/common-styles.html)
- support flexbox related styles.
- support box model related styles.
@@ -58,9 +58,9 @@ The `textarea` component supports all the properties of the `text` component, in
- `focus`: a component has received focus.
- `blur`: a component has lost focus.
-**common events**: check out the [common events](../common-event.html)
+**common events**: check out the [common events](/wiki/common-events.html)
-- support `appear` / `disappear` event. Check out [common events](../common-event.html).
+- support `appear` / `disappear` event. Check out [common events](/wiki/common-events.html).
**Notes:** `<textarea>` does not support the common-event `click`. Please listen to the `input` or `change` event instead.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/video.md
----------------------------------------------------------------------
diff --git a/source/references/components/video.md b/source/references/components/video.md
index 5e82f9b..24c363d 100644
--- a/source/references/components/video.md
+++ b/source/references/components/video.md
@@ -21,7 +21,7 @@ The video component can be used to embed video content in a weex page.
* auto-play: <boolean> true | false. Use it to control whether it is playing when the page initialization finished. Defalut value is false.
## Styles
-common styles: check out [common styles for components](../common-style.html)
+common styles: check out [common styles for components](/wiki/common-styles.html)
* support flexbox related styles
* support box model related styles
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/components/waterfall.md
----------------------------------------------------------------------
diff --git a/source/references/components/waterfall.md b/source/references/components/waterfall.md
index 8eccd92..b5e4732 100644
--- a/source/references/components/waterfall.md
+++ b/source/references/components/waterfall.md
@@ -33,7 +33,7 @@ To see other attributes, please checkout [List Component Attributes](./list.htm
### Styles
-common styles: check out [common styles for components](../common-style.html)
+common styles: check out [common styles for components](/wiki/common-styles.html)
* support flexbox related styles
* support box model related styles
@@ -42,10 +42,10 @@ common styles: check out [common styles for components](../common-style.html)
### Events
-common events: check out the [common events](../common-event.html)
+common events: check out the [common events](/wiki/common-events.html)
-* support onclick event. Check out [common events](../common-event.html)
-* support onappear / ondisappear event. Check out [common events](../common-event.html)
+* support onclick event. Check out [common events](/wiki/common-events.html)
+* support onappear / ondisappear event. Check out [common events](/wiki/common-events.html)
### API
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/references/weex-variable.md
----------------------------------------------------------------------
diff --git a/source/references/weex-variable.md b/source/references/weex-variable.md
index 0439179..6dcc80d 100644
--- a/source/references/weex-variable.md
+++ b/source/references/weex-variable.md
@@ -92,7 +92,7 @@ weex.requireModule(name: string): Object | void;
### Use Native Module
-You can require a native module and use its APIs just like normal javascript functions. Here is [a simple example](http://dotwe.org/vue/cd7e97f7da08d6d4ca627fc127ab8828) of using the [`modal`](../components/modal.html) module:
+You can require a native module and use its APIs just like normal javascript functions. Here is [a simple example](http://dotwe.org/vue/cd7e97f7da08d6d4ca627fc127ab8828) of using the [`modal`](/examples/modal.html) module:
```html
<template>
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/releasenote.md
----------------------------------------------------------------------
diff --git a/source/releasenote.md b/source/releasenote.md
index 5ead271..ba3ab43 100644
--- a/source/releasenote.md
+++ b/source/releasenote.md
@@ -174,7 +174,7 @@ layout: post
The former front-end 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-weight`](https://weex.apache.org/wiki/text-styles.html)
+ - [text `font-weight`](https://weex-project.io/references/text-style.html)
`font-weight` can set to [`normal`|`bold`] or 100-900.
- gradient
like CSS3, now you can use gradient in Weex. For example:
@@ -183,7 +183,7 @@ layout: post
background-image: linear-gradient(to right, blue, white);
```
- [Read more about gradient](https://weex.apache.org/wiki/common-styles.html#linear-gradient-v0-10).
+ [Read more about gradient](https://weex-project.io/references/common-style.html).
- Pseudo class
Currently, Weex supports 4 pseudo classes:`active`, `focus`, `disabled`, `enabled`.
- New BroadcastChannel API
@@ -225,7 +225,7 @@ layout: post
- Has full set of commands for developers to setup android/ios application 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](https://market.dotwe.org) was formally used for developers to publish/download weex plugins.
+ - [Plugin market](http://market.weex-project.io) was formally used for developers to publish/download weex plugins.
## v0.9.4
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/tools/index.md
----------------------------------------------------------------------
diff --git a/source/tools/index.md b/source/tools/index.md
index 98a07c7..2188a70 100644
--- a/source/tools/index.md
+++ b/source/tools/index.md
@@ -7,7 +7,7 @@ version: 2.1
# 开发工具
-+ [Playground App](./playground.html)
++ [Playground App](/cn/tools/playground.html)
+ [Online Playground](http://dotwe.org/vue/)
+ [Weex Toolkit](./toolkit.html)
-+ [Syntax Highlight Plugins](./helpers.html)
++ [Syntax Highlight Plugins](/tools/helpers.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/source/tools/toolkit.md b/source/tools/toolkit.md
index b2d181d..e2cf62b 100644
--- a/source/tools/toolkit.md
+++ b/source/tools/toolkit.md
@@ -17,7 +17,7 @@ $ npm install -g weex-toolkit
You can use the `weex -v` command to confirm that the installation is successful.
-> If you have never installed node.js, you should go [node.js.org]( https://nodejs.org/en/) to download and install it. The node version needs to be upper 6.0. You can try [n](https://github.com/tj/n) to manage your node versions.
+> If you have never installed node.js, you should go [node.js.org]( https://nodejs.org/en/) to download and install it. The node version needs to be upper 6.0. You can try [n](https://github.com/tj/n) to manage your node versions.
If you meet some errors when installing, please go [weex-toolkit issues](https://github.com/weexteam/weex-toolkit/issues) or [weex-toolkit faq](https://github.com/weexteam/weex-toolkit#faq) to find some solution or have a discuss with us.
@@ -42,7 +42,7 @@ weex-toolkit supports previewing your Weex file(`.vue`) in a watch mode. You onl
$ weex preview src/foo.vue
```
-The browser automatically opens the preview page and you can see the layout and effects of your weex page. If you have a [Playground App](https://weex.apache.org/tools/playground.html) in your mobile devices, you can scan the QR code at the opened page.
+The browser automatically opens the preview page and you can see the layout and effects of your weex page. If you have a [Playground App](https://weex.apache.org/cn/playground.html) in your mobile devices, you can scan the QR code at the opened page.
Try the command below, you’ll preview the whole directory files.
@@ -62,7 +62,7 @@ $ weex compile [source] [dist] [options]
#### options
-| Option | Description |
+| Option | Description |
| -------- | :----- |
|`-w, --watch` | watch we file changes auto build them and refresh debugger page! [default `true`]|
|`-d,--devtool [devtool]` |set webpack devtool mode|
@@ -119,7 +119,7 @@ $ weex run web
weex debug [we_file|bundles_dir] [options]
```
-| Option | Description |
+| Option | Description |
| -------- | :----- |
|`-V, --verbose` | display logs of debugger server|
|`-v, --version` | display version|
@@ -141,7 +141,7 @@ $ weex debug
```
This command will start debug server and launch a chrome opening `DeviceList` page.
-this page will display a QR code, you can use [Playground](https://weex.apache.org/tools/playground.html) scan it for starting debug or integrate [Weex devtools](#Integrate devtool) into your application.
+this page will display a QR code, you can use [Playground](https://weex.apache.org/cn/playground.html) scan it for starting debug or integrate [Weex devtools](#Integrate devtool) into your application.
@@ -192,6 +192,6 @@ Click on the upper right corner of the Prophet to view the timing diagram (iOS i
#### Integrate devtool
* Android
- * See the doc [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), it will lead you to config and use it step by step.
+ * See the doc [Weex devtools (Android)](/guide/integrate-devtool-to-android.html), it will lead you to config and use it step by step.
* iOS
- * See the doc [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), it will lead you to config and use it step by step.
+ * See the doc [Weex devtools (iOS)](/guide/integrate-devtool-to-ios.html), it will lead you to config and use it step by step.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/wiki/faq.md
----------------------------------------------------------------------
diff --git a/source/wiki/faq.md b/source/wiki/faq.md
index b6b7f3a..1f32787 100644
--- a/source/wiki/faq.md
+++ b/source/wiki/faq.md
@@ -17,7 +17,7 @@ version: 2.1
## Command errors in MS Windows
-Please install [Git for Windows](https://git-scm.com/download/win) first, see [For Windows](https://github.com/apache/incubator-weex/tree/master#for-windows) for more information.
+Please install [Git for Windows](https://git-scm.com/download/win) first, see [For Windows](https://github.com/apache/incubator-weex/tree/dev#for-windows) for more information.
## Gradle errors in Android Studio
@@ -32,7 +32,7 @@ Weex's native runtime support load image file from device's disk, all you have t
This's is caused by weex-toolkit's dependency 'http-server', whose old version is not working well in chinese windows environment. We have fixed that, you should upgrade weex-toolkit before use that.
## Playground app display nothing (white screen) after scan
-Best way to find out what's happening is read debug log, you can follow [this document](./guide/index.html) to firgure out how to do that.
+Best way to find out what's happening is read debug log, you can follow [this document](/guide/index.html) to firgure out how to do that.
## About ECMAScript Version
@@ -131,8 +131,8 @@ else {
If you have 2 pages, A and B.
-0. A -> B, use [storage module](./references/modules/storage.html) to transfer data
-0. B -> A, use [storage module](./references/modules/storage.html) to transfer data
+0. A -> B, use [storage module](/references/modules/storage.html) to transfer data
+0. B -> A, use [storage module](/references/modules/storage.html) to transfer data
## How to use `repeat` in Parent-Child components
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/wiki/index.md
----------------------------------------------------------------------
diff --git a/source/wiki/index.md b/source/wiki/index.md
index 6157d04..c53db88 100644
--- a/source/wiki/index.md
+++ b/source/wiki/index.md
@@ -20,7 +20,7 @@ The WeexSDK would prepare a JavaScript engine to run corresponding JS bundle whe
Even if a user does not install the App, he can still open a same web page in the browser, using the same source code.
-
+
## Local Development Environment
@@ -32,8 +32,8 @@ Also same as the best practice of web development, each Weex page will be built
**Links**
-* [Platform differences between Weex and web](../../references/platform-difference.html)
-* [Differences of using Vue between Weex with web](../../references/vue/difference-with-web.html)
+* [Platform differences between Weex and web](/wiki/platform-difference.html)
+* [Differences of using Vue between Weex with web](/wiki/platform-difference.html)
* [Get Started](../index.html)
* [Using Devtools](./devtools.html)
@@ -56,10 +56,10 @@ Although Weex has provided a group of most commonly used components and modules
**Links**
* [Differences between Weex and web standard](../../references/web-standards.html)
-* [Using Weex in iOS](../../references/ios-apis.html)
-* [Using Weex in Android](../../references/android-apis.html)
-* [Extend to iOS](../../references/advanced/extend-to-ios.html)
-* [Extend to Android](../../references/advanced/extend-to-android.html)
+* [Using Weex in iOS](/references/ios-apis.html)
+* [Using Weex in Android](/references/android-apis.html)
+* [Extend to iOS](/guide/extend-ios.html)
+* [Extend to Android](/guide/extend-android.html)
## In the Browser
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/06f9ee6c/source/wiki/text-styles.md
----------------------------------------------------------------------
diff --git a/source/wiki/text-styles.md b/source/wiki/text-styles.md
index e1b7d90..f7f0cd9 100644
--- a/source/wiki/text-styles.md
+++ b/source/wiki/text-styles.md
@@ -8,7 +8,7 @@ version: 2.1
<!-- toc -->
-Text alike components share some common style rules. The text alike components currently includes [`text`](./components/text.html) and [`input`](./components/input.html).
+Text alike components share some common style rules. The text alike components currently includes [`text`](/references/components/text.html) and [`input`](/references/components/input.html).
## Properties
[5/7] incubator-weex-site git commit: Fix absolute URL to local
relative path
Posted by ha...@apache.org.
Fix absolute URL to local relative path
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/15a0788b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/15a0788b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/15a0788b
Branch: refs/heads/master
Commit: 15a0788b016886651bdf466c88c257442a5e82cd
Parents: 0bee04f
Author: Zhenfei You <he...@imyzf.com>
Authored: Thu Mar 22 17:22:44 2018 +0800
Committer: Zhenfei You <he...@imyzf.com>
Committed: Thu Mar 22 18:03:00 2018 +0800
----------------------------------------------------------------------
source/cn/guide/index.md | 6 +++---
source/cn/tools/toolkit.md | 16 ++++++++--------
source/guide/index.md | 4 ++--
source/tools/toolkit.md | 12 ++++++------
4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/15a0788b/source/cn/guide/index.md
----------------------------------------------------------------------
diff --git a/source/cn/guide/index.md b/source/cn/guide/index.md
index f6f257e..28c987b 100644
--- a/source/cn/guide/index.md
+++ b/source/cn/guide/index.md
@@ -26,7 +26,7 @@ Weex 的另一个主要目标是跟进当代先进的 Web 开发和原生开发
-这个例子在屏幕正中间渲染了一个单词 “Yo”。 如果你想在移动设备上预览渲染结果，你只需要安装[Weex playground app](https://weex-project.io/playground.html) 或将 Weex SDK 集成到您自己的应用程序中，然后使用扫描网页右侧的二维码。
+这个例子在屏幕正中间渲染了一个单词 “Yo”。 如果你想在移动设备上预览渲染结果，你只需要安装[Weex playground app](/cn/tools/playground.html) 或将 Weex SDK 集成到您自己的应用程序中，然后使用扫描网页右侧的二维码。
在源代码的 `<template>` 中，`<div>` 你应该很熟悉了，它在 Weex 平台上也是一个通用容器。但是 `<text>` 组件是由 Weex 特有的，它是一个块级的文本容器，可以用来渲染文字。
@@ -89,7 +89,7 @@ Weex 可以只编写一份代码，开发出三端都可用的页面。
> 以下步骤假设您已经了解了 Node.js 和 npm 的基本知识。如果对它们不熟悉，可以访问 [https://docs.npmjs.com/](https://docs.npmjs.com/) 来了解更多关于 npm 的用法。
-Weex 提供了一个命令行工具 [weex-toolkit](http://weex-project.io/tools/toolkit.html) 来帮助开发者使用 Weex。它可以用来快速创建一个空项目、初始化 iOS 和 Android 开发环境、调试、安装插件等操作。
+Weex 提供了一个命令行工具 [weex-toolkit](/cn/tools/toolkit.html) 来帮助开发者使用 Weex。它可以用来快速创建一个空项目、初始化 iOS 和 Android 开发环境、调试、安装插件等操作。
目前 `weex-toolkit` 只支持创建 Vue.js 的项目。创建 Rax 的项目可以使用 `rax-cli`，参考 [Rax 的官方网站](https://alibaba.github.io/rax/) 了解其用法。
@@ -123,7 +123,7 @@ npm start
-除此之外，你还可以打开 `http://localhost:8081/preview.html` 开启一个预览页面，它会把 web 端的页面放在一个 iframe 中渲染，而且在右侧生成一个二维码。用 [Weex playground app](http://weex-project.io/playground.html) 扫描这个二维码可以看到页面在手机上渲染的真实效果。
+除此之外，你还可以打开 `http://localhost:8081/preview.html` 开启一个预览页面，它会把 web 端的页面放在一个 iframe 中渲染，而且在右侧生成一个二维码。用 [Weex playground app](/cn/tools/playground.html) 扫描这个二维码可以看到页面在手机上渲染的真实效果。
### 编译和运行
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/15a0788b/source/cn/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/source/cn/tools/toolkit.md b/source/cn/tools/toolkit.md
index 0c66756..fb8043e 100644
--- a/source/cn/tools/toolkit.md
+++ b/source/cn/tools/toolkit.md
@@ -50,7 +50,7 @@ weex-toolkit工具支持对你的Weex文件（`.we`或`.vue`)在监听模式下
$ weex preview src/foo.vue
```
-浏览器会自动得打开预览页面并且你可以看到你的weex页面的布局和效果。如果你在你的设备上安装了[Playground](https://weex.apache.org/cn/playground.html)，你还可以通过扫描页面上的二维码来查看页面。
+浏览器会自动得打开预览页面并且你可以看到你的weex页面的布局和效果。如果你在你的设备上安装了[Playground](/cn/tools/playground.html)，你还可以通过扫描页面上的二维码来查看页面。
使用下面的命令，你将可以预览整个文件夹中的`.vue`文件
@@ -70,7 +70,7 @@ $ weex compile [source] [dist] [options]
#### 参数
-| Option | Description |
+| Option | Description |
| -------- | :----- |
|`-w, --watch` | 开启watch模式，同步文件改动并进行编译|
|`-d,--devtool [devtool]`|设置devtool选项|
@@ -106,7 +106,7 @@ $ weex run web
### debug
-** [Weex devtools](https://github.com/weexteam/weex-devtool) ** 是实现[Chrome调试协议](https://developer.chrome.com/devtools/docs/debugger-protocol)的Weex自定义开发工具,
+** [Weex devtools](https://github.com/weexteam/weex-devtool) ** 是实现[Chrome调试协议](https://developer.chrome.com/devtools/docs/debugger-protocol)的Weex自定义开发工具,
主要用于帮助你快速检查您的应用程序，并在Chrome网页中调试您的JS bundle源代码，支持Android和iOS平台。所以你可以通过`weex-toolkit`使用的`weex-devtool`功能。
#### 用法
@@ -117,7 +117,7 @@ weex debug [we_file|bundles_dir] [options]
#### 参数
-| Option | Description |
+| Option | Description |
| -------- | :----- |
|`-v, --version`| 显示weex-debugger版本信息|
|`-h, --help`| 展示帮助信息 |
@@ -147,7 +147,7 @@ $ weex debugx
##### 链接设备
-请使用[weex playground app](http://weex.apache.org/tools/playground.html)扫码或使用集成了weex-devtool的app进行扫码，集成方法见[集成devtool工具](#集成devtool工具)。有ios模拟器环境的用户也可以通过点击二维码的方式进行模拟器调试（仅限mac用户使用）。
+请使用[weex playground app](/tools/playground.html)扫码或使用集成了weex-devtool的app进行扫码，集成方法见[集成devtool工具](#集成devtool工具)。有ios模拟器环境的用户也可以通过点击二维码的方式进行模拟器调试（仅限mac用户使用）。
@@ -184,15 +184,15 @@ $ weex debug your_weex.vue
##### LogLevel和ElementMode功能
> LogLevel和ElementMode功能用于调整调试工具的输出配置。
-LogLevel分别有 debug/info/warn/log/error五个log等级，切换可输出不同等级的log信息
-ElementMode可以切换Element标签中Domtree显示模式，下图为vdom显示界面，可从标签中看到详细的数据结构：
+LogLevel分别有 debug/info/warn/log/error五个log等级，切换可输出不同等级的log信息
+ElementMode可以切换Element标签中Domtree显示模式，下图为vdom显示界面，可从标签中看到详细的数据结构：
##### Prophet功能（加载时序图）
> Prophet功能用于查看weex的加载时序图和页面性能指标。
-点击右上角Prophet即可查看时序图(iOS暂不支持，性能数据可在log的performance中查看)，如下：
+点击右上角Prophet即可查看时序图(iOS暂不支持，性能数据可在log的performance中查看)，如下：
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/15a0788b/source/guide/index.md
----------------------------------------------------------------------
diff --git a/source/guide/index.md b/source/guide/index.md
index 30520e6..8d69876 100644
--- a/source/guide/index.md
+++ b/source/guide/index.md
@@ -26,7 +26,7 @@ Here is an [example](http://dotwe.org/vue/8da01827631b21150a12dd54d7114380) writ
-This example renders a word "Yo" in the center of the screen. If you want to preview the rendered result on mobile devices, you need to install the [Weex playground app](https://weex-project.io/playground.html) or integrate Weex SDK into your own app. Then scan your page's QR code with your playground app or your own app (with the QR scan feature to load scanned URL with Weex SDK), and you will see the rendered result on your device.
+This example renders a word "Yo" in the center of the screen. If you want to preview the rendered result on mobile devices, you need to install the [Weex playground app](/tools/playground.html) or integrate Weex SDK into your own app. Then scan your page's QR code with your playground app or your own app (with the QR scan feature to load scanned URL with Weex SDK), and you will see the rendered result on your device.
Within the `<template>` of the source code, You must be familiar with the `<div>` which is widely used on the web, and it's also the generic container on Weex. But the `<text>` component is provided by Weex, it's a block-level text container.
@@ -93,7 +93,7 @@ You can read *[Front-End Frameworks](./front-end-frameworks.html)* to learn more
> The following steps assume you have already known the foundational knowledge of Node.js and npm. If you are not familiar with them, you can visit [https://docs.npmjs.com/](https://docs.npmjs.com/) to learn more about npm.
-Weex provide a command line tool, the [weex-toolkit](http://weex-project.io/tools/toolkit.html), to help developers to get start easily. It can help you to create a starter project, setup iOS and Android development environments, debug, install plugins and so on.
+Weex provide a command line tool, the [weex-toolkit](/tools/toolkit.html), to help developers to get start easily. It can help you to create a starter project, setup iOS and Android development environments, debug, install plugins and so on.
Currently, the `weex-toolkit` only supports the creation of Vue.js project. The `rax-cli` maybe helpful if you want to use Rax. Please visit [Rax's official website](https://alibaba.github.io/rax/) for more details.
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/15a0788b/source/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/source/tools/toolkit.md b/source/tools/toolkit.md
index e2cf62b..93d5ffe 100644
--- a/source/tools/toolkit.md
+++ b/source/tools/toolkit.md
@@ -17,7 +17,7 @@ $ npm install -g weex-toolkit
You can use the `weex -v` command to confirm that the installation is successful.
-> If you have never installed node.js, you should go [node.js.org]( https://nodejs.org/en/) to download and install it. The node version needs to be upper 6.0. You can try [n](https://github.com/tj/n) to manage your node versions.
+> If you have never installed node.js, you should go [node.js.org]( https://nodejs.org/en/) to download and install it. The node version needs to be upper 6.0. You can try [n](https://github.com/tj/n) to manage your node versions.
If you meet some errors when installing, please go [weex-toolkit issues](https://github.com/weexteam/weex-toolkit/issues) or [weex-toolkit faq](https://github.com/weexteam/weex-toolkit#faq) to find some solution or have a discuss with us.
@@ -42,7 +42,7 @@ weex-toolkit supports previewing your Weex file(`.vue`) in a watch mode. You onl
$ weex preview src/foo.vue
```
-The browser automatically opens the preview page and you can see the layout and effects of your weex page. If you have a [Playground App](https://weex.apache.org/cn/playground.html) in your mobile devices, you can scan the QR code at the opened page.
+The browser automatically opens the preview page and you can see the layout and effects of your weex page. If you have a [Playground App](/tools/playground.html) in your mobile devices, you can scan the QR code at the opened page.
Try the command below, you’ll preview the whole directory files.
@@ -62,7 +62,7 @@ $ weex compile [source] [dist] [options]
#### options
-| Option | Description |
+| Option | Description |
| -------- | :----- |
|`-w, --watch` | watch we file changes auto build them and refresh debugger page! [default `true`]|
|`-d,--devtool [devtool]` |set webpack devtool mode|
@@ -119,7 +119,7 @@ $ weex run web
weex debug [we_file|bundles_dir] [options]
```
-| Option | Description |
+| Option | Description |
| -------- | :----- |
|`-V, --verbose` | display logs of debugger server|
|`-v, --version` | display version|
@@ -141,7 +141,7 @@ $ weex debug
```
This command will start debug server and launch a chrome opening `DeviceList` page.
-this page will display a QR code, you can use [Playground](https://weex.apache.org/cn/playground.html) scan it for starting debug or integrate [Weex devtools](#Integrate devtool) into your application.
+this page will display a QR code, you can use [Playground](/tools/playground.html) scan it for starting debug or integrate [Weex devtools](#Integrate devtool) into your application.
@@ -150,7 +150,7 @@ this page will display a QR code, you can use [Playground](https://weex.apache.o
```
$ weex debug your_weex.vue
```
-Click the button you can use your app or [weex playground app](http://weex.apache.org/tools/playground.html) to preview your pages.
+Click the button you can use your app or [weex playground app](/tools/playground.html) to preview your pages.
[4/7] incubator-weex-site git commit: Revert unnecessary changes in
relasenote
Posted by ha...@apache.org.
Revert unnecessary changes in relasenote
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/0bee04f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/0bee04f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/0bee04f7
Branch: refs/heads/master
Commit: 0bee04f73cd06c1f977e99a05fff5c66cd2a62ef
Parents: 06f9ee6
Author: Zhenfei You <he...@imyzf.com>
Authored: Thu Mar 22 17:45:55 2018 +0800
Committer: Zhenfei You <he...@imyzf.com>
Committed: Thu Mar 22 17:45:55 2018 +0800
----------------------------------------------------------------------
source/cn/releasenote.md | 6 +++---
source/releasenote.md | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/0bee04f7/source/cn/releasenote.md
----------------------------------------------------------------------
diff --git a/source/cn/releasenote.md b/source/cn/releasenote.md
index ba3ab43..5ead271 100644
--- a/source/cn/releasenote.md
+++ b/source/cn/releasenote.md
@@ -174,7 +174,7 @@ layout: post
The former front-end 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-weight`](https://weex-project.io/references/text-style.html)
+ - [text `font-weight`](https://weex.apache.org/wiki/text-styles.html)
`font-weight` can set to [`normal`|`bold`] or 100-900.
- gradient
like CSS3, now you can use gradient in Weex. For example:
@@ -183,7 +183,7 @@ layout: post
background-image: linear-gradient(to right, blue, white);
```
- [Read more about gradient](https://weex-project.io/references/common-style.html).
+ [Read more about gradient](https://weex.apache.org/wiki/common-styles.html#linear-gradient-v0-10).
- Pseudo class
Currently, Weex supports 4 pseudo classes:`active`, `focus`, `disabled`, `enabled`.
- New BroadcastChannel API
@@ -225,7 +225,7 @@ layout: post
- Has full set of commands for developers to setup android/ios application 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](http://market.weex-project.io) was formally used for developers to publish/download weex plugins.
+ - [Plugin market](https://market.dotwe.org) was formally used for developers to publish/download weex plugins.
## v0.9.4
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/0bee04f7/source/releasenote.md
----------------------------------------------------------------------
diff --git a/source/releasenote.md b/source/releasenote.md
index ba3ab43..5ead271 100644
--- a/source/releasenote.md
+++ b/source/releasenote.md
@@ -174,7 +174,7 @@ layout: post
The former front-end 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-weight`](https://weex-project.io/references/text-style.html)
+ - [text `font-weight`](https://weex.apache.org/wiki/text-styles.html)
`font-weight` can set to [`normal`|`bold`] or 100-900.
- gradient
like CSS3, now you can use gradient in Weex. For example:
@@ -183,7 +183,7 @@ layout: post
background-image: linear-gradient(to right, blue, white);
```
- [Read more about gradient](https://weex-project.io/references/common-style.html).
+ [Read more about gradient](https://weex.apache.org/wiki/common-styles.html#linear-gradient-v0-10).
- Pseudo class
Currently, Weex supports 4 pseudo classes:`active`, `focus`, `disabled`, `enabled`.
- New BroadcastChannel API
@@ -225,7 +225,7 @@ layout: post
- Has full set of commands for developers to setup android/ios application 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](http://market.weex-project.io) was formally used for developers to publish/download weex plugins.
+ - [Plugin market](https://market.dotwe.org) was formally used for developers to publish/download weex plugins.
## v0.9.4
[3/7] incubator-weex-site git commit: Add local file scan and fix to
url validator
Posted by ha...@apache.org.
Add local file scan and fix to url validator
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/8fcc5138
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/8fcc5138
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/8fcc5138
Branch: refs/heads/master
Commit: 8fcc513871610090849dcaf4c3339b14c1d8624f
Parents: ff1c81f
Author: Zhenfei You <he...@imyzf.com>
Authored: Thu Mar 22 17:05:51 2018 +0800
Committer: Zhenfei You <he...@imyzf.com>
Committed: Thu Mar 22 17:06:26 2018 +0800
----------------------------------------------------------------------
package-lock.json | 9 ++++++
package.json | 1 +
test/url-validator.js | 69 ++++++++++++++++++++++++++++++++++++----------
3 files changed, 65 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/8fcc5138/package-lock.json
----------------------------------------------------------------------
diff --git a/package-lock.json b/package-lock.json
index c9344bd..660f566 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6130,6 +6130,15 @@
"limiter": "1.1.2"
}
},
+ "string-similarity": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.0.tgz",
+ "integrity": "sha1-11FTyzg4RjGLejmo2SkrtNtOnDA=",
+ "dev": true,
+ "requires": {
+ "lodash": "4.17.4"
+ }
+ },
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/8fcc5138/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e2ba441..f567920 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
"find-line-column": "^0.5.2",
"glob": "^7.1.2",
"node-fetch": "^2.1.1",
+ "string-similarity": "^1.2.0",
"url-extractor": "^2.0.2"
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/8fcc5138/test/url-validator.js
----------------------------------------------------------------------
diff --git a/test/url-validator.js b/test/url-validator.js
index f020d52..198dc9b 100644
--- a/test/url-validator.js
+++ b/test/url-validator.js
@@ -1,8 +1,10 @@
-const glob = require('glob')
const fs = require('fs')
+const path = require('path')
+const glob = require('glob')
+const chalk = require('chalk')
const fetch = require('node-fetch')
const urlExtractor = require('url-extractor')
-const chalk = require('chalk')
+const similarity = require('string-similarity')
const findLineColumn = require('find-line-column')
const extractUrls = urlExtractor.extractUrls
@@ -32,25 +34,64 @@ glob('source/**/*.md', (err, files) => {
// '//xxx.com' -> 'http://xxx.com'
if (url.match(/^\/\//)) url = 'http:' + url
- // ignore non-http(s)
- if (!url.match(/^https?:\/\//)) return
// ignore whitelist
for (let i = 0; i < whiteList.length; i++) {
if (url.match(whiteList[i])) return
}
- // using fetch to test whether available
- fetch(url)
- .then(res => {
- if (res.status >= 400) {
- log(res.status, url, file, position);
- }
- })
- .catch(err => {
- if (err.code !== 'ECONNREFUSED' && err.code !== 'ECONNRESET') {
- log(err.code, url, file, position)
+ if (url.match(/^https?:\/\//)) {
+ // using fetch to test whether available
+ fetch(url)
+ .then(res => {
+ if (res.status >= 400) {
+ log(res.status, url, file, position);
+ }
+ })
+ .catch(err => {
+ if (err.code !== 'ECONNREFUSED' && err.code !== 'ECONNRESET') {
+ log(err.code, url, file, position)
+ }
+ })
+ } else if (url.match(/^.{0,2}\//)) {
+ // test local path
+ let targetPath
+ if (url.startsWith('/')) {
+ // '/wiki' -> 'source/wiki'
+ targetPath = path.resolve('source', url.substring(1))
+ } else {
+ targetPath = path.resolve(path.dirname(file), url)
+ }
+ // 'a.html#title1' -> '#title1
+ const urlHash = url.split('#')[1] ? '#' + url.split('#')[1] : ''
+ // 'a.html#title1' -> 'a.html' -> 'a.md
+ targetPath = targetPath.replace(/#(.*)/, '').replace('.html', '.md')
+ fs.access(targetPath, err => {
+ if (err) {
+ let patternDir
+ const option = {
+ cwd: 'source'
+ }
+ if (file.indexOf('/cn/') >= 0) {
+ patternDir = 'cn/**/'
+ } else {
+ patternDir = '**/'
+ option.ignore = 'cn/**'
+ }
+ glob(patternDir + path.basename(targetPath), option, (globError, files) => {
+ log(err.code, url, file, position)
+ if (files.length) {
+ console.log(chalk.bgBlue('FOUND'), files)
+ const match = similarity.findBestMatch(url, files)
+ .bestMatch.target.replace('.md', '.html')
+ console.log(chalk.bgGreen('FIXED'), match)
+ text = text.replace(url, `/${match}${urlHash}`)
+ // using sync mehtod to avoid writing a file in the same time.
+ fs.writeFileSync(file, text)
+ }
+ })
}
})
+ }
})
})
})
[6/7] incubator-weex-site git commit: update doc of
input&slider&pickers (#117)
Posted by ha...@apache.org.
update doc of input&slider&pickers (#117)
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/4dedcdfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/4dedcdfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/4dedcdfc
Branch: refs/heads/master
Commit: 4dedcdfc552045799145af07592d9c3609a75c9e
Parents: ff1c81f bc465a5
Author: Hanks <zh...@gmail.com>
Authored: Thu Mar 22 18:03:25 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Thu Mar 22 18:03:25 2018 +0800
----------------------------------------------------------------------
source/cn/references/components/input.md | 10 +++++++++-
source/cn/references/components/slider.md | 4 ++++
source/cn/references/modules/picker.md | 9 +++++++++
source/references/components/input.md | 10 +++++++++-
source/references/components/slider.md | 4 ++++
source/references/modules/picker.md | 9 +++++++++
6 files changed, 44 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4dedcdfc/source/cn/references/components/input.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4dedcdfc/source/cn/references/components/slider.md
----------------------------------------------------------------------
diff --cc source/cn/references/components/slider.md
index ad90222,18feaaf..b230221
--- a/source/cn/references/components/slider.md
+++ b/source/cn/references/components/slider.md
@@@ -25,10 -25,11 +25,14 @@@ version: 2.
- `interval {number}`：值为毫秒数，此值设定 slider 切换时间间隔。当 `auto-play` 值为 `true` 时生效。
- `infinite {boolean}`：循环播放，可选值为 `true`/`false`，默认的是 `true`。
- `offset-x-accuracy {number}`<sup class="wx-v">0.11+</sup>：控制`onscroll`事件触发的频率，默认值为10，表示两次`onscroll`事件之间Slider Page至少滚动了10px。注意，将该值设置为较小的数值会提高滚动事件采样的精度，但同时也会降低页面的性能。
+ - `show-indicators {boolean}`：设置是否显示indicator
+ - `index {number}`：设置显示slider的第几个页面
+ - `scrollable {boolean}`：设置是否可以通过滑动手势来切换slider页面
+ - `keep-index {boolean}`：设置slider中的数据发生变化后是否保持变化前的页面index
+- `index {number}`: 指定当前展示页面的索引
+ [体验一下](http://dotwe.org/vue/58a29d38247e7946a6db44e1b616f082)
+
## 样式
- 通用样式：支持所有通用样式
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4dedcdfc/source/cn/references/modules/picker.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4dedcdfc/source/references/components/input.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4dedcdfc/source/references/components/slider.md
----------------------------------------------------------------------
diff --cc source/references/components/slider.md
index b6bec18,74c8487..d822760
--- a/source/references/components/slider.md
+++ b/source/references/components/slider.md
@@@ -22,10 -22,11 +22,14 @@@ It supports all kinds of weex component
- `interval`: <number> millisecond. This value determines time interval for each page displayed in slider.
- `index`: <number> . This value determines the index of current shown slide. The default value is `0`.
- `offset-x-accuracy {float}`：set the scroll event trigger precision, precision value represents the rolling distance of a page width ratio.
+ - `show-indicators {boolean}`：set whether to display indicator
+ - `infinite {boolean}`：set whether the page in the slider can be scrolled
+ - `scrollable {boolean}`：set whether slider pages can be switched by sliding gestures
+ - `keep-index {boolean}`：set whether to maintain the index of the page after the data changes
+- `index {number}`: specify current page index of slider
+ [try in dotWe](http://dotwe.org/vue/58a29d38247e7946a6db44e1b616f082)
+
## Styles
**common styles**: check out [common styles for components](../common-style.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4dedcdfc/source/references/modules/picker.md
----------------------------------------------------------------------