You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/07/20 07:21:16 UTC
[01/27] incubator-weex git commit: Update write-once.md
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev da562689a -> f102f3fe1
Update write-once.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3d4a52d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3d4a52d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3d4a52d5
Branch: refs/heads/0.16-dev
Commit: 3d4a52d52ba0d24d32ec13703d5dd73ddb65d90d
Parents: 88828c2
Author: Lukasz Balcerzak <lu...@gmail.com>
Authored: Wed Jun 7 10:29:58 2017 +0200
Committer: GitHub <no...@github.com>
Committed: Wed Jun 7 10:29:58 2017 +0200
----------------------------------------------------------------------
doc/source/guide/intro/write-once.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3d4a52d5/doc/source/guide/intro/write-once.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/write-once.md b/doc/source/guide/intro/write-once.md
index 382b7b4..673b302 100644
--- a/doc/source/guide/intro/write-once.md
+++ b/doc/source/guide/intro/write-once.md
@@ -9,15 +9,15 @@ version: 2.1
Weex is a "Write Once, Run Everywhere" solution.
-* First, Weex is based on web dev experience, which including syntax and project management.
-* Second, all components & modules in Weex is discussed by iOS, Android, web developers together to ensure it's common enough to satisfy every platforms.
+* First, Weex is based on web dev experience, which includes syntax and project management.
+* Second, all components & modules in Weex are discussed by iOS, Android, web developers together to ensure it's common enough to satisfy every platforms.
* You only need write the same Weex code for each platforms.
We think about it in these aspects below:
-1. Today for almost mobile apps, one app solves the same problem in different platforms. Weex hope to supply a lightweight way to describe your business logic which works well in all platforms you need.
-2. For the differences of all mobile platforms, we are willing to fill the gap in 2 points:
- 1. Design the same APIs for all platforms to ensure different platforms the same business logic description.
- 2. Implement the APIs with different style or behaviors to ensure the implementation and user experience matching different platforms.
- 3. If there are definitely some different features in different platforms. We also have some environment variables to help developers in certain detail situations.
+1. Today for almost all mobile apps, one app solves the same problem in different platforms. Weex hope to supply a lightweight way to describe your business logic which works well in all platforms you need.
+2. For the differences of all mobile platforms, we are willing to fill the gap in 3 points:
+ 1. Design the same APIs for all platforms to ensure different platforms have the same business logic description.
+ 2. Implement the APIs with different style or behaviors to ensure the implementation and user experience matches different platforms.
+ 3. Platforms obviously differ among each other. We also have some environment variables to help developers in certain situations.
3. We trust (web) standard is the best for all features in all platforms.
[02/27] incubator-weex git commit: * [doc] correct platform
information.x
Posted by cx...@apache.org.
* [doc] correct platform information.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/21a8032f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/21a8032f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/21a8032f
Branch: refs/heads/0.16-dev
Commit: 21a8032fc332e2121488389706e26d5d2266b4e1
Parents: 44e959a
Author: MrRaindrop <te...@gmail.com>
Authored: Fri Jun 30 10:42:21 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Fri Jun 30 10:42:21 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/weex-variable.md | 2 +-
doc/source/references/weex-variable.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/21a8032f/doc/source/cn/references/weex-variable.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/weex-variable.md b/doc/source/cn/references/weex-variable.md
index 4630681..0848441 100644
--- a/doc/source/cn/references/weex-variable.md
+++ b/doc/source/cn/references/weex-variable.md
@@ -19,7 +19,7 @@ has_chapter_content: true
* `weexVersion: string`: Weex sdk 版本。
* `appName: string`: 应用名字。
* `appVersion: string`: 应用版本。
- * `platform: string`: 平台信息，是 iOS、Android 还是 Web。
+ * `platform: string`: 平台信息，是 'iOS'、'android' 还是 'Web'。
* `osVersion: string`: 系统版本。
* `deviceModel: string`: 设备型号 (仅原生应用)。
* `deviceWidth: number`: 设备宽度。Weex 默认以宽度为 750px 做适配渲染，要获得750px下的屏幕高度，可以通过 `height = 750/deviceWidth*deviceHeight` 公式获得，可以使用到 CSS 中，用来设置全屏尺寸
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/21a8032f/doc/source/references/weex-variable.md
----------------------------------------------------------------------
diff --git a/doc/source/references/weex-variable.md b/doc/source/references/weex-variable.md
index b55eef5..c8806af 100644
--- a/doc/source/references/weex-variable.md
+++ b/doc/source/references/weex-variable.md
@@ -18,7 +18,7 @@ This variable contains all the environment information for the current Weex page
+ `WeexVersion: string`: Weex sdk version.
+ `AppName: string`: application name.
+ `AppVersion: string`: app version.
-+ `Platform: string`: platform information, that is iOS, Android or Web.
++ `Platform: string`: platform information, that is 'iOS', 'android' or 'Web'.
+ `OsVersion: string`: system version.
+ `DeviceModel: string`: device model (native application only).
+ `DeviceWidth: number`: device width
[26/27] incubator-weex git commit: *[doc] add color-name file color
block
Posted by cx...@apache.org.
*[doc] add color-name file color block
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a5e0ee7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a5e0ee7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a5e0ee7
Branch: refs/heads/0.16-dev
Commit: 8a5e0ee7819e2c085b17fafc9b2ff6b86a3b4b46
Parents: bf87411
Author: tancy <ro...@gmail.com>
Authored: Wed Jul 19 17:15:49 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Wed Jul 19 17:15:49 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/source/js/common.js | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a5e0ee7/doc/themes/weex/source/js/common.js
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/js/common.js b/doc/themes/weex/source/js/common.js
index 3e92ba4..c3f6631 100644
--- a/doc/themes/weex/source/js/common.js
+++ b/doc/themes/weex/source/js/common.js
@@ -105,6 +105,28 @@
initPickLang()
+ /**
+ * color name
+ */
+
+ function colorname(){
+ if(location.pathname.indexOf('references/color-names.html')>0){
+ var t = document.querySelectorAll("table");
+ Array.prototype.forEach.call(t, function (table) {
+ var d = table.getElementsByTagName("tbody")[0].getElementsByTagName("tr");
+ Array.prototype.forEach.call(d, function (tr) {
+ var r = tr.getElementsByTagName("td")[1];
+ r.innerHTML ='<span style="background:'+ r.innerHTML +';color:'+ r.innerHTML +'"> yy </span> ' + r.innerHTML
+ });
+
+ });
+ }
+ }
+
+ colorname();
+
+
+
/**
* Search
*/
[18/27] incubator-weex git commit: Update set-up-env.md
Posted by cx...@apache.org.
Update set-up-env.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5fcb08da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5fcb08da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5fcb08da
Branch: refs/heads/0.16-dev
Commit: 5fcb08dae572405c147d0268780f0ae9e1ad9c9e
Parents: 87dac9f
Author: Denny <de...@gmail.com>
Authored: Fri Jul 7 20:41:54 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Fri Jul 7 20:41:54 2017 -0500
----------------------------------------------------------------------
doc/source/guide/set-up-env.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5fcb08da/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 6aac518..f8ac41a 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -19,7 +19,7 @@ $ nvm install 6.10.0
$ nvm use 6.10.0
```
-Node.js comes with npm, which lets you install the Weex Cli.
+Node.js comes with npm, which lets you install the Weex CLI.
Run the following command in a Terminal:
@@ -35,13 +35,13 @@ weex-previewer : v1.3.4
**NOTE: ** If you get an error like "permission error", try installing with `sudo`.
-Then you can use the weex command to verify that the installation is successful:
+Then you can use the Weex command to verify that the installation is successful:
### Generate a new Weex project
-You can use CLI to generate a Weex project called "awesome-project". Run the following command in a Terminal:
+You can use the CLI to generate a Weex project called "awesome-project". Run the following command in a Terminal:
```bash
$ weex init awesome-project
[05/27] incubator-weex git commit: Merge branch 'dev' of
https://github.com/MrRaindrop/incubator-weex into dev
Posted by cx...@apache.org.
Merge branch 'dev' of https://github.com/MrRaindrop/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cf0bff04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cf0bff04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cf0bff04
Branch: refs/heads/0.16-dev
Commit: cf0bff04a750f94d6285d329087e2955b1d1d292
Parents: a53deeb 21a8032
Author: tancy <ro...@gmail.com>
Authored: Fri Jun 30 11:21:51 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Fri Jun 30 11:21:51 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/weex-variable.md | 2 +-
doc/source/references/weex-variable.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[22/27] incubator-weex git commit: * [doc] update docsearch apiKey
Posted by cx...@apache.org.
* [doc] update docsearch apiKey
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/081b7a3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/081b7a3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/081b7a3d
Branch: refs/heads/0.16-dev
Commit: 081b7a3de3dd5c6d472773cd07b436bd09328449
Parents: 4742d5d
Author: parryworld <pa...@gmail.com>
Authored: Thu Jul 13 10:56:59 2017 +0800
Committer: parryworld <pa...@gmail.com>
Committed: Thu Jul 13 10:56:59 2017 +0800
----------------------------------------------------------------------
doc/_config.yml | 6 ++++--
doc/_config_cn.yml | 6 ++++--
doc/themes/weex/layout/layout.ejs | 6 +++---
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/081b7a3d/doc/_config.yml
----------------------------------------------------------------------
diff --git a/doc/_config.yml b/doc/_config.yml
index dd564d7..e262984 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -125,8 +125,10 @@ autoprefixer:
# docsearch
docsearch:
enable: true
- en: weex
- cn: weex_cn
+ index_name_en: weex
+ index_name_cn: weex_cn
+ api_key_en: a6896fe3619315a7f04e9a76bbbbbfcb
+ api_key_cn: db5b2379e5ffbc33509585c35ccabba8
alias:
doc/index.html: index.html
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/081b7a3d/doc/_config_cn.yml
----------------------------------------------------------------------
diff --git a/doc/_config_cn.yml b/doc/_config_cn.yml
index c98a00b..ef5679f 100644
--- a/doc/_config_cn.yml
+++ b/doc/_config_cn.yml
@@ -123,8 +123,10 @@ autoprefixer:
# docsearch
docsearch:
enable: true
- en: weex_io
- cn: weex_io_cn
+ index_name_en: weex_io
+ index_name_cn: weex_io_cn
+ api_key_en: e487bb3d17e4fa1787db9976b086792c
+ api_key_cn: ce50ba9d18b3295d568b305a7171ceef
alias:
doc/index.html: index.html
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/081b7a3d/doc/themes/weex/layout/layout.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/layout.ejs b/doc/themes/weex/layout/layout.ejs
index 9e5ee1f..df3b12b 100644
--- a/doc/themes/weex/layout/layout.ejs
+++ b/doc/themes/weex/layout/layout.ejs
@@ -14,12 +14,12 @@
<%- js('js/reqwest.js') %>
<%- js('js/common.js') %>
<% if (config.docsearch.enable){ %>
- <% index_name = page.path.indexOf('cn/') === 0 ? config.docsearch.cn : config.docsearch.en %>
+ <% index_name = page.path.indexOf('cn/') === 0 ? config.docsearch.index_name_cn : config.docsearch.index_name_en %>
+ <% api_key = page.path.indexOf('cn/') === 0 ? config.docsearch.api_key_cn : config.docsearch.api_key_en %>
<%- js('js/docsearch.min.js') %>
<script type="text/javascript">
docsearch({
- appId: '2BE9FVK6FX',
- apiKey: '4879a7b2e4f3a664bd3b219340657475',
+ apiKey: "<%= api_key %>",
indexName: "<%= index_name %>",
inputSelector: '#search-input-header',
algoliaOptions: {
[15/27] incubator-weex git commit: Merge branch 'dev' of
https://github.com/cxfeng1/incubator-weex into dev
Posted by cx...@apache.org.
Merge branch 'dev' of https://github.com/cxfeng1/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/515b003b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/515b003b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/515b003b
Branch: refs/heads/0.16-dev
Commit: 515b003ba769a9e153461d6f01017f33845eb8bd
Parents: 96ef64c e26e4a7
Author: tancy <ro...@gmail.com>
Authored: Tue Jul 4 16:47:23 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jul 4 16:47:23 2017 +0800
----------------------------------------------------------------------
doc/source/references/components/list.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[16/27] incubator-weex git commit: Update common-style.md
Posted by cx...@apache.org.
Update common-style.md
文案校对
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4bcf7cc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4bcf7cc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4bcf7cc8
Branch: refs/heads/0.16-dev
Commit: 4bcf7cc8d2bc19fbb7fe24c34f23abaa16cda48a
Parents: 92399a4
Author: miyalee <mi...@outlook.com>
Authored: Thu Jul 6 11:27:57 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Jul 6 11:27:57 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bcf7cc8/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/common-style.md b/doc/source/cn/references/common-style.md
index 8ba1a8a..a36d2cd 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -343,11 +343,11 @@ transform 属性向元素应用 2D 转换。该属性允许我们对元素进行
Weex 支持四种伪类：`active`, `focus`, `disabled`, `enabled`
-所有组件都支持 `active`, 但只有 `input` 组件和 `textarea` 组件支持 `focus`, `enabled`, `diabled`。
+所有组件都支持 `active`, 但只有 `input` 组件和 `textarea` 组件支持 `focus`, `enabled`, `disabled`。
### 规则
-- 同时生效生效的时候，优先级高覆盖优先级低
+- 同时生效的时候，优先级高覆盖优先级低
- 例如：`input:active:enabled` 和 `input:active` 同时生效，前者覆盖后者
[12/27] incubator-weex git commit: *[doc]update site navigation
Posted by cx...@apache.org.
*[doc]update site navigation
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af2267e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af2267e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af2267e9
Branch: refs/heads/0.16-dev
Commit: af2267e92a90725c1360ccd4b03c9e2ba201ec4c
Parents: 26b638c
Author: tancy <ro...@gmail.com>
Authored: Tue Jul 4 10:48:12 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jul 4 10:48:12 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/cn.yml | 5 +++--
doc/themes/weex/languages/en.yml | 3 ++-
doc/themes/weex/layout/_partial/header.ejs | 23 ++++++++++++-----------
3 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af2267e9/doc/themes/weex/languages/cn.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/cn.yml b/doc/themes/weex/languages/cn.yml
index 67d0266..3796d04 100644
--- a/doc/themes/weex/languages/cn.yml
+++ b/doc/themes/weex/languages/cn.yml
@@ -82,14 +82,15 @@ menu:
references: 手册
doc: 文档
faq: FAQ
- note: 参考
+ note: 说明
releasenote: 版本说明
index: 首页
blog: 博客
showcase: 示例
download: 下载
resources: 资源
- tools: 工具和服务
+ tools: 工具
+ invovled: 参与
advanced: 高阶知识
github: GitHub
legacy: 旧语法文档
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af2267e9/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index dae9090..12cec69 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -89,7 +89,8 @@ menu:
showcase: Showcase
download: Download
resources: Resources
- tools: Services & Tools
+ tools: Tools
+ invovled: Get Invovled
advanced: Advanced
github: GitHub
legacy: Old Syntax Doc
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af2267e9/doc/themes/weex/layout/_partial/header.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/header.ejs b/doc/themes/weex/layout/_partial/header.ejs
index 6922437..4c7d92d 100644
--- a/doc/themes/weex/layout/_partial/header.ejs
+++ b/doc/themes/weex/layout/_partial/header.ejs
@@ -7,17 +7,7 @@
<ul class="links">
<li><a href="<%= url_for_lang('guide') %>"><%= _p('menu.guide') %></a></li>
<li><a href="<%= url_for_lang('references') %>"><%= _p('menu.references') %></a></li>
- <li class="dropdown">
- <a href="javascript:;"><%= _p('menu.note') %></a>
- <ul class="dropdown-menu subnav">
- <li>
- <a href="<%= url_for_lang('faq.html') %>"><%= _p('menu.faq') %></a>
- </li>
- <li>
- <a href="<%= url_for_lang('releasenote.html') %>"><%= _p('menu.releasenote') %></a>
- </li>
- </ul>
- </li>
+ <li><a href="<%= url_for_lang('guide/contributing.html') %>"><%= _p('menu.invovled') %></a></li>
<li class="dropdown">
<a href="javascript:;"><%= _p('menu.tools') %></a>
<ul class="dropdown-menu subnav">
@@ -35,6 +25,17 @@
</li>
</ul>
</li>
+ <li class="dropdown">
+ <a href="javascript:;"><%= _p('menu.note') %></a>
+ <ul class="dropdown-menu subnav">
+ <li>
+ <a href="<%= url_for_lang('faq.html') %>"><%= _p('menu.faq') %></a>
+ </li>
+ <li>
+ <a href="<%= url_for_lang('releasenote.html') %>"><%= _p('menu.releasenote') %></a>
+ </li>
+ </ul>
+ </li>
</ul>
<ul class="info">
<li><a href="https://github.com/apache/incubator-weex/" target="_blank"><span class="btn-github iconfont icon-github"></span></a></li>
[07/27] incubator-weex git commit: closes #169: invalid.
Posted by cx...@apache.org.
closes #169: invalid.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1a957f1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1a957f1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1a957f1d
Branch: refs/heads/0.16-dev
Commit: 1a957f1dfb4dc6a595f465ffc1d917bd7f6e843e
Parents: dd60d65
Author: MrRaindrop <te...@gmail.com>
Authored: Fri Jun 30 17:50:30 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Fri Jun 30 17:50:30 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[21/27] incubator-weex git commit: Merge branch 'miyalee-patch-1' of
https://github.com/miyalee/incubator-weex into dev
Posted by cx...@apache.org.
Merge branch 'miyalee-patch-1' of https://github.com/miyalee/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4742d5d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4742d5d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4742d5d0
Branch: refs/heads/0.16-dev
Commit: 4742d5d098823120d2313016276cc5a27929a822
Parents: 1794375 4bcf7cc
Author: tancy <ro...@gmail.com>
Authored: Mon Jul 10 14:14:18 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Mon Jul 10 14:14:18 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[10/27] incubator-weex git commit: Closes #10: invalid.
Posted by cx...@apache.org.
Closes #10: invalid.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5f96a2ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5f96a2ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5f96a2ce
Branch: refs/heads/0.16-dev
Commit: 5f96a2ceb656aaa2df1690af9d325922fee3d851
Parents: efc74a4
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Jul 3 11:49:36 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Jul 3 11:49:36 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/27] incubator-weex git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Posted by cx...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a53deeb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a53deeb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a53deeb1
Branch: refs/heads/0.16-dev
Commit: a53deeb15b42712aa0b0249a9124ecce1c21817f
Parents: 825c6e3 44e959a
Author: tancy <ro...@gmail.com>
Authored: Fri Jun 30 11:09:09 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Fri Jun 30 11:09:09 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7575352 -> 7570504 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12130116 -> 12121924 bytes
.../java/com/taobao/weex/ComponentObserver.java | 50 ++++++++
.../java/com/taobao/weex/WXSDKInstance.java | 16 +++
.../taobao/weex/ui/component/WXComponent.java | 14 +++
.../ui/component/list/BasicListComponent.java | 16 ++-
examples/vue/index.vue | 1 +
examples/vue/modules/websocket.vue | 116 +++++++++++++++++++
html5/render/vue/README.md | 19 ++-
html5/render/vue/components/input.js | 52 +++++++--
.../components/scrollable/loading-indicator.js | 11 +-
.../render/vue/components/slider/slideMixin.js | 24 ++--
html5/render/vue/core/style.js | 31 +++--
html5/render/vue/env/weex.js | 3 +
html5/render/vue/mixins/scrollable.js | 38 +++---
html5/render/vue/modules/index.js | 2 +
html5/render/vue/modules/websocket/index.js | 26 +++++
html5/render/vue/modules/websocket/websocket.js | 60 ++++++++++
html5/render/vue/utils/style.js | 44 +++++++
html5/test/render/vue/modules/websocket.js | 11 ++
.../Sources/Component/WXCycleSliderComponent.m | 7 ++
package.json | 2 +-
packages/weex-vue-render/package.json | 2 +-
test/pages/components/textarea-maxlength.vue | 10 +-
.../components/textarea-maxlength.test.js | 6 +-
test/scripts/util.js | 2 +-
26 files changed, 491 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
[27/27] incubator-weex git commit: Merge branch 'dev' into 0.16-dev
Posted by cx...@apache.org.
Merge branch 'dev' into 0.16-dev
Conflicts:
doc/source/cn/references/weex-variable.md
doc/source/references/weex-variable.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f102f3fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f102f3fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f102f3fe
Branch: refs/heads/0.16-dev
Commit: f102f3fe1f08541ba34190c2b8f0f8185a10a553
Parents: da56268 8a5e0ee
Author: cxfeng <cx...@apache.org>
Authored: Thu Jul 20 15:21:07 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Jul 20 15:21:07 2017 +0800
----------------------------------------------------------------------
doc/_config.yml | 6 +-
doc/_config_cn.yml | 6 +-
doc/source/_posts/coreml.md | 79 ++++++++++++++++++++
doc/source/_posts/hello_world.md | 3 +-
doc/source/_posts/test.md | 14 ++++
.../cn/references/advanced/extend-to-android.md | 15 +++-
doc/source/cn/references/bubble.md | 4 +-
doc/source/cn/references/common-style.md | 4 +-
doc/source/cn/references/components/image.md | 2 +-
doc/source/cn/references/components/input.md | 34 +++++----
doc/source/cn/references/components/list.md | 8 +-
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/cn/references/weex-variable.md | 2 +-
doc/source/cn/v-0.10/references/bubble.md | 6 +-
doc/source/guide/intro/write-once.md | 14 ++--
doc/source/guide/set-up-env.md | 22 +++---
.../references/advanced/extend-to-android.md | 14 ++++
doc/source/references/bubble.md | 4 +-
doc/source/references/components/image.md | 2 +-
doc/source/references/components/input.md | 34 +++++----
doc/source/references/components/list.md | 7 +-
doc/source/references/components/scroller.md | 4 +-
doc/source/v-0.10/references/bubble.md | 8 +-
doc/themes/weex/languages/cn.yml | 5 +-
doc/themes/weex/languages/en.yml | 3 +-
doc/themes/weex/layout/_partial/footer.ejs | 2 +-
doc/themes/weex/layout/_partial/header.ejs | 23 +++---
.../weex/layout/_partial/post/summary.ejs | 6 ++
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/layout.ejs | 6 +-
doc/themes/weex/source/css/index.scss | 2 +
doc/themes/weex/source/css/partial/footer.scss | 5 +-
doc/themes/weex/source/css/partial/summary.scss | 6 ++
doc/themes/weex/source/js/common.js | 38 ++++++++++
34 files changed, 286 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f102f3fe/doc/source/cn/references/weex-variable.md
----------------------------------------------------------------------
diff --cc doc/source/cn/references/weex-variable.md
index 0de2b37,0848441..ac2c332
--- a/doc/source/cn/references/weex-variable.md
+++ b/doc/source/cn/references/weex-variable.md
@@@ -19,8 -19,7 +19,8 @@@ has_chapter_content: tru
* `weexVersion: string`: Weex sdk 版本。
* `appName: string`: 应用名字。
* `appVersion: string`: 应用版本。
- * `platform: string`: 平台信息，是 'iOS'、'android' 还是 'Web'。
+ * `platform: string`: 平台信息，是 iOS、Android 还是 Web。
- + `osName: string`: iOS或者android，表示操作系统的名称.
++ * `osName: string`: iOS或者android，表示操作系统的名称.
* `osVersion: string`: 系统版本。
* `deviceModel: string`: 设备型号 (仅原生应用)。
* `deviceWidth: number`: 设备宽度。Weex 默认以宽度为 750px 做适配渲染，要获得750px下的屏幕高度，可以通过 `height = 750/deviceWidth*deviceHeight` 公式获得，可以使用到 CSS 中，用来设置全屏尺寸
[20/27] incubator-weex git commit: Merge branch 'master' of
https://github.com/dennythecoder/incubator-weex into dev
Posted by cx...@apache.org.
Merge branch 'master' of https://github.com/dennythecoder/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/17943752
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/17943752
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/17943752
Branch: refs/heads/0.16-dev
Commit: 179437521b97d2a2a703edb8910763f3d302e15f
Parents: a4931a6 5fcb08d
Author: tancy <ro...@gmail.com>
Authored: Mon Jul 10 11:24:48 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Mon Jul 10 11:24:48 2017 +0800
----------------------------------------------------------------------
doc/source/guide/set-up-env.md | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[17/27] incubator-weex git commit: Updated grammar in set-up-env.md
Posted by cx...@apache.org.
Updated grammar in set-up-env.md
Updated grammar in set-up-env.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/87dac9fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/87dac9fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/87dac9fe
Branch: refs/heads/0.16-dev
Commit: 87dac9fed6dd3f8b90904d7fed0a4bb75865a9f7
Parents: 6d395f5
Author: Denny <de...@gmail.com>
Authored: Fri Jul 7 20:34:03 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Fri Jul 7 20:34:03 2017 -0500
----------------------------------------------------------------------
doc/source/guide/set-up-env.md | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/87dac9fe/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 702c347..6aac518 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -8,11 +8,11 @@ has_chapter_content: true
# Set up development environment
-Use dotWe is a good choice, But if you want to develop locally on your own machine, you will set up your development environment.
+Using [dotWe](http://dotwe.org/vue) is a good choice, but if you want to develop locally on your own machine, you will need to set up your development environment.
-You will need Node.js and the [Weex CLi](https://github.com/weexteam/weex-toolkit).
+You will need Node.js and the [Weex CLI](https://github.com/weexteam/weex-toolkit).
-You can installing Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm:
+You can install Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm:
```bash
$ nvm install 6.10.0
@@ -41,13 +41,13 @@ Then you can use the weex command to verify that the installation is successful:
### Generate a new Weex project
-You can use CLi to generate a Weex project called "awesome-project". Run the following command in a Terminal:
+You can use CLI to generate a Weex project called "awesome-project". Run the following command in a Terminal:
```bash
$ weex init awesome-project
```
-Then we enter the awesome-project folder, the CLi has been for us to generate a standard project structure.
+Then enter the awesome-project folder, the CLI has been for us to generate a standard project structure.
### Usage
@@ -57,7 +57,7 @@ We enter the awesome-project folder and install dependencies with the following
npm install
```
-Then we run `npm run dev` and `npm run serve` to start watch mode and static server.
+Then run `npm run dev` and `npm run serve` to start watch mode and static server.
Finally, we can see the Weex page in `http://localhost:8080/index.html`.
@@ -66,8 +66,8 @@ You can modify this page in `src/foo.vue`. The code is shown below:
```html
<template>
<div class="wrapper">
- <text class="weex">Hello Weex !</text>
- <text class="vue">Hello Vue !</text>
+ <text class="weex">Hello Weex!</text>
+ <text class="vue">Hello Vue!</text>
</div>
</template>
@@ -90,4 +90,4 @@ You can modify this page in `src/foo.vue`. The code is shown below:
</style>
```
-If you're curious to learn more about technical details, continue on to the next. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime.
+If you're curious to learn more about technical details, continue on to the next section. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime.
[08/27] incubator-weex git commit: Closes #169: invalid
Posted by cx...@apache.org.
Closes #169: invalid
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/26b638ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/26b638ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/26b638ca
Branch: refs/heads/0.16-dev
Commit: 26b638ca984a99d7b86a75aeaf0d2e188311d14a
Parents: 1a957f1
Author: MrRaindrop <te...@gmail.com>
Authored: Fri Jun 30 18:03:12 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Fri Jun 30 18:03:12 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/27] incubator-weex git commit: *[doc update footer link style]
Posted by cx...@apache.org.
*[doc update footer link style]
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/96ef64cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/96ef64cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/96ef64cc
Branch: refs/heads/0.16-dev
Commit: 96ef64cc73f191de970d583df7520362d41f119f
Parents: af2267e
Author: tancy <ro...@gmail.com>
Authored: Tue Jul 4 14:29:44 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jul 4 14:29:44 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/source/css/partial/footer.scss | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/96ef64cc/doc/themes/weex/source/css/partial/footer.scss
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/css/partial/footer.scss b/doc/themes/weex/source/css/partial/footer.scss
index 71d263f..922eb0b 100644
--- a/doc/themes/weex/source/css/partial/footer.scss
+++ b/doc/themes/weex/source/css/partial/footer.scss
@@ -6,7 +6,9 @@
margin: 0;
background: $bg-white;
border-top: 1px solid #DDDDDD;
-
+ a{
+ text-decoration: underline
+ }
.ali-logo {
width: 83px;
height: 41px;
[24/27] incubator-weex git commit: + [doc] update doc for proguard
rules
Posted by cx...@apache.org.
+ [doc] update doc for proguard rules
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3b9b5a54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3b9b5a54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3b9b5a54
Branch: refs/heads/0.16-dev
Commit: 3b9b5a54258a753ac3cc5337cb2ae360b4095e6e
Parents: b397774
Author: misakuo <mi...@apache.org>
Authored: Mon Jul 17 10:51:44 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Jul 17 10:51:44 2017 +0800
----------------------------------------------------------------------
.../cn/references/advanced/extend-to-android.md | 15 ++++++++++++++-
doc/source/cn/references/components/image.md | 2 +-
doc/source/cn/references/components/list.md | 6 +-----
doc/source/references/advanced/extend-to-android.md | 14 ++++++++++++++
doc/source/references/components/image.md | 2 +-
5 files changed, 31 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b9b5a54/doc/source/cn/references/advanced/extend-to-android.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/advanced/extend-to-android.md b/doc/source/cn/references/advanced/extend-to-android.md
index e2d654c..61a5bbf 100644
--- a/doc/source/cn/references/advanced/extend-to-android.md
+++ b/doc/source/cn/references/advanced/extend-to-android.md
@@ -185,4 +185,17 @@ public class ImageAdapter implements IWXImgLoaderAdapter {
</script>
```
-注:工程要添加依赖 `compile 'com.squareup.picasso:picasso:2.5.2'`
\ No newline at end of file
+注:工程要添加依赖 `compile 'com.squareup.picasso:picasso:2.5.2'`
+
+#### SDK混淆规则
+若要在APP中使用混淆，请在相应的配置文件中添加如下规则：
+
+```java
+-keep class com.taobao.weex.WXDebugTool{*;}
+-keep class com.taobao.weex.devtools.common.LogUtil{*;}
+-keep public class * extends com.taobao.weex.ui.component.WXComponent{*;}
+-keep public class * extends com.taobao.weex.common.WXModule{*;}
+-keepclassmembers class ** {
+ @com.taobao.weex.ui.component.WXComponentProp public *;
+}
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b9b5a54/doc/source/cn/references/components/image.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/image.md b/doc/source/cn/references/components/image.md
index 7755618..bc675cb 100644
--- a/doc/source/cn/references/components/image.md
+++ b/doc/source/cn/references/components/image.md
@@ -82,7 +82,7 @@ version: 2.1
## 事件
-- `load`: <sup class="api-version">v0.8+</sup>：当图片加载完成时触发。目前在 Android、iOS 上支持，H5 暂不支持。[示例](http://dotwe.org/vue/98ee340348d7cc3e6fbfe68dbaef1eed)
+- `load`: <sup class="api-version">v0.8+</sup>：当图片加载完成时触发。目前在 Android、iOS 上支持，H5 暂不支持。[示例](http://dotwe.org/vue/e291159ac60b35dcd4994638a78d54ad)
- 事件对象
- `success`: 当图片成功加载时为`true`，否则为`false`
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b9b5a54/doc/source/cn/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/list.md b/doc/source/cn/references/components/list.md
index be14d06..8e1e63c 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -62,7 +62,7 @@ version: 2.1
## 事件
- `loadmore` <sup class="wx-v">0.5+</sup>：如果列表滚动到底部将会立即触发这个事件，你可以在这个事件的处理函数中加载下一页的列表项。
-- `onscroll` <sup class="wx-v">0.11+</sup>: 列表发生滚动时将会触发该事件，事件的默认抽样率为10px，即列表每滚动10px触发一次，可通过属性`offset-accuracy`设置抽样率。
+- `scroll` <sup class="wx-v">0.11+</sup>: 列表发生滚动时将会触发该事件，事件的默认抽样率为10px，即列表每滚动10px触发一次，可通过属性`offset-accuracy`设置抽样率。
事件中 event 对象属性：
- `contentSize {Object}`：列表的内容尺寸
@@ -74,10 +74,6 @@ version: 2.1
[体验一下](http://dotwe.org/bc445ede8746a31360e3607d210304c5)
-- `scroll` <sup class="wx-v">0.12+</sup>：列表滚动时触发这个事件。此事件回调中会给出当前`contentOffset`值。参见 [scroll event demo](http://dotwe.org/vue/9ef0e52bacaa20182a693f2187d851aa)。
-
- [体验一下](http://dotwe.org/weex/7ba3b6222d912b4b0b4aafb8248ca22f)
-
- 通用事件
支持所有通用事件：
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b9b5a54/doc/source/references/advanced/extend-to-android.md
----------------------------------------------------------------------
diff --git a/doc/source/references/advanced/extend-to-android.md b/doc/source/references/advanced/extend-to-android.md
index e10b906..2ec4bc5 100644
--- a/doc/source/references/advanced/extend-to-android.md
+++ b/doc/source/references/advanced/extend-to-android.md
@@ -203,3 +203,17 @@ public class ImageAdapter implements IWXImgLoaderAdapter {
}
</script>
```
+
+#### Proguard Rules
+
+If you want to using proguard to protect your source code, please add the following rules to your profile:
+
+```java
+-keep class com.taobao.weex.WXDebugTool{*;}
+-keep class com.taobao.weex.devtools.common.LogUtil{*;}
+-keep public class * extends com.taobao.weex.ui.component.WXComponent{*;}
+-keep public class * extends com.taobao.weex.common.WXModule{*;}
+-keepclassmembers class ** {
+ @com.taobao.weex.ui.component.WXComponentProp public *;
+}
+```
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b9b5a54/doc/source/references/components/image.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/image.md b/doc/source/references/components/image.md
index aac1735..cd8c59b 100644
--- a/doc/source/references/components/image.md
+++ b/doc/source/references/components/image.md
@@ -42,7 +42,7 @@ This component supports no child components.
- support `click` event. Check out [common events](../common-event.html)
- support `appear` / `disappear` event. Check out [common events](../common-event.html)
-- `load`<sup class="api-version">v0.8+</sup> event. The `load` event fires on an image has been loaded. Only Android and iOS are supported currently. [example](http://dotwe.org/vue/98ee340348d7cc3e6fbfe68dbaef1eed)
+- `load`<sup class="api-version">v0.8+</sup> event. The `load` event fires on an image has been loaded. Only Android and iOS are supported currently. [example](http://dotwe.org/vue/e291159ac60b35dcd4994638a78d54ad)
- event object
- `success` : `true` if the image was loaded successfully, otherwise `false`
- `size` : the original size of image, contains two parameters: `naturalWidth` representing the original width of image in pixels, `naturalHeight` representing the original height of image in pixels. default value. The default value for both parameters is `0`.
[03/27] incubator-weex git commit: * [doc] update title style
Posted by cx...@apache.org.
* [doc] update title style
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/825c6e30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/825c6e30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/825c6e30
Branch: refs/heads/0.16-dev
Commit: 825c6e308effbb652c29369ab946e13754a6929d
Parents: 2510206
Author: tancy <ro...@gmail.com>
Authored: Fri Jun 30 11:08:30 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Fri Jun 30 11:08:30 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/source/css/index.scss | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/825c6e30/doc/themes/weex/source/css/index.scss
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/css/index.scss b/doc/themes/weex/source/css/index.scss
index e1e744b..7d8614c 100644
--- a/doc/themes/weex/source/css/index.scss
+++ b/doc/themes/weex/source/css/index.scss
@@ -124,6 +124,7 @@
top: 70px;
left: 50%;
margin-left: -250px;
+ line-height: 120%;
}
.btn-group {
@@ -226,6 +227,7 @@
.left-text h2 {
width: 300px;
text-align: left;
+ line-height: 120%;
}
.left-text p {
[19/27] incubator-weex git commit: Merge branch 'patch-1' of
https://github.com/lukaszb/incubator-weex into dev
Posted by cx...@apache.org.
Merge branch 'patch-1' of https://github.com/lukaszb/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a4931a68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a4931a68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a4931a68
Branch: refs/heads/0.16-dev
Commit: a4931a68abedede5ef0fb62f4ad578c8f0273b52
Parents: 515b003 3d4a52d
Author: tancy <ro...@gmail.com>
Authored: Mon Jul 10 11:10:56 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Mon Jul 10 11:10:56 2017 +0800
----------------------------------------------------------------------
doc/source/guide/intro/write-once.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[09/27] incubator-weex git commit: Closes #81: invalid.
Posted by cx...@apache.org.
Closes #81: invalid.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/efc74a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/efc74a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/efc74a49
Branch: refs/heads/0.16-dev
Commit: efc74a49713c844da88ed9e06f35b222b05d17b4
Parents: 25d52bd
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Jul 3 11:47:25 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Jul 3 11:47:25 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[25/27] incubator-weex git commit: * [doc] update input components
document & bubble document
Posted by cx...@apache.org.
* [doc] update input components document & bubble document
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bf874113
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bf874113
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bf874113
Branch: refs/heads/0.16-dev
Commit: bf874113e47186bf11903db829d1a77765ad18c3
Parents: 3b9b5a5
Author: tancy <ro...@gmail.com>
Authored: Wed Jul 19 15:12:22 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Wed Jul 19 15:12:22 2017 +0800
----------------------------------------------------------------------
doc/source/_posts/coreml.md | 79 +++++++++++++++++++++++
doc/source/_posts/hello_world.md | 3 +-
doc/source/_posts/test.md | 14 ++++
doc/source/cn/references/bubble.md | 4 +-
doc/source/cn/references/components/input.md | 34 +++++-----
doc/source/cn/v-0.10/references/bubble.md | 6 +-
doc/source/references/bubble.md | 4 +-
doc/source/references/components/input.md | 34 +++++-----
doc/source/v-0.10/references/bubble.md | 8 +--
9 files changed, 142 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/_posts/coreml.md
----------------------------------------------------------------------
diff --git a/doc/source/_posts/coreml.md b/doc/source/_posts/coreml.md
new file mode 100644
index 0000000..c628fb3
--- /dev/null
+++ b/doc/source/_posts/coreml.md
@@ -0,0 +1,79 @@
+title: Weex ❤️ iOS 11 系列之一：Core ML 初探
+type: blog
+date: 2017-06-21 15:46:44
+
+---
+
+## 背景
+
+WWDC 2017 有一个非常明确的信号：**端上机器学习将会是未来苹果的一个重要发力点，同时开发者的使用门槛在不断降低**。
+
+Core ML 是今年 WWDC 上苹果发布的机器学习框架。它允许开发者在自己开发的 app 上使用机器学习，同时不需要收集用户数据。 有了 Core ML，你可以将自己训练得到的模型，借助苹果提供的转换工具，转化成 Core ML 类型的模型文件，你可以非常轻松地直接实现模型和 app 数据的互通。
+
+WWDC 上展示了一张简单的架构图：
+
+
+
+最底层的 Accelerate 和 MPS，其实是苹果去年推出的接口，前者可以直接调用 CPU，后者则直接调用 GPU。 Core ML 会自行决定到底使用 CPU 还是 GPU 来进行运算，可以最大程度地利用硬件资源来处理模型数据。
+
+而 Core ML 往上一层则是应用层。Vision 主要负责图像相关的人工智能处理，如人脸识别、面部追踪、文字识别等等；NLP 则提供语义分析相关 API。这部分内容在以前版本的 SDK 中也存在，这次被集成到了新框架当中。好处在于，开发者拥有了更大的自由度。在以前，开发者的 app 调用这些高级接口，对底层的实现细节的掌控力度非常小。现在，你可以通过自定义底层所使用的机器学习模型，从而实现更个性化的需求。
+
+## Weex-ML
+
+Weex 交互视觉能力小结中提到，**Weex 最大的特别之处在于其 native 的能力， 我们要最大化利用 native 的特性， 而不是去模仿它**。
+
+作为本次 iOS 11 的一个重要 native 能力，我也第一时间尝试将 Core ML 透传到了 Weex 上。所有代码和 Demo 都已开源到 [Github](https://github.com/cxfeng1/Weex-ML)，后续也会将机器学习相关的Weex 模块统一放到 Weex Market 上。
+
+得益于 Core ML API 的简洁，在 Weex 上使用 Core ML 相关能力变得非常简单:
+
+```javascript
+let imageRecognition = weex.requireModule('imageRecognition')
+imageRecognition.predictWithImage(this.$refs.image.ref, (results)=>{
+ this.results = results.slice(0,5);
+})
+```
+
+通过调用透传的 module `imageRecognition` , 并传入 image 组件的 ref 作为参数，就可以实现图片识别的功能，最后提取出识别结果中 confidence 最高的 5 个结果。
+
+## Demo
+
+### imageRecognition
+
+
+
+使用 [Inceptionv3](https://github.com/fchollet/keras/blob/0bb4e0fad5b4bb3743c8a7d03c260b62a35e7045/keras/applications/inception_v3.py) 作为模型，能够高效识别， 该模型已经在 [keras](https://github.com/fchollet/keras) 中被训练好并通过苹果提供的工具转换成 **mlmodel** 文件， 只需拖拽的方式就可以集成到 iOS 开发环境中， 上述 demo 输出了对一张图片分类最大可能的5个预测结果， 对于 Weex 来说，几行代码就能搞定。
+
+
+
+### digitDetect
+
+
+
+上述 demo 首先使用 [weex-gcanvas](http://market.dotwe.org/ext/list.htm#6) 插件做了一个简单的绘制板，然后使用 MNIST model 完成了对手写数字的识别。
+
+### faceDetect
+
+
+
+这个 demo 没有加载任何 model，使用了 iOS 11 内置的 Vision Framework，顾名思义，Vision 可以让开发者运行计算机视觉相关的任务，它相当于 Core ML 的 High-Level Solution， 它可以做很多事情:
+
+- 脸部识别，会返回一个矩形数组来表示每一个脸部
+- 脸部更精细识别，比如眼睛和鼻子的具体位置、头部的形状等，上述 demo 就是拿到这些信息以后使用 gcanvas 绘制出了面部精细轮廓
+- 图片中的矩形探测
+- 图片中的文字探测
+- 二维码/条形码探测
+- 视频中跟踪移动的物体
+
+## 总结
+
+这次 Core ML 的推出，同时得益于苹果对软硬件的全面掌控，使得从系统级到第三方开发者，都具备了在端上就可以进行机器学习模型处理的能力。所有代码和 Demo 都已上传到 [Github](https://github.com/cxfeng1/Weex-ML)，欢迎贡献和交流。
+
+当然在实际研究过程中，也发现了 Core ML 的一些限制：
+
+- 无法在端上进行模型的训练，所有模型必须提前训练好再转换成 Core ML 的格式
+- 无法动态下载和更新模型，对于需要经常重新训练的模型不太友好
+- 目前看只支持监督学习的模型，不支持非监督学习。
+
+Weex 未来在提供更多功能透传的同时，也会继续探索更深层次的结合。
+
+最后，本文是 Weex 和 iOS 11 结合系列的第一篇文章，后续将会有更多有意思的iOS 11 feature (如 ARKit、 drag & drop 等) 和大家一起探讨。
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/_posts/hello_world.md
----------------------------------------------------------------------
diff --git a/doc/source/_posts/hello_world.md b/doc/source/_posts/hello_world.md
index 07f4223..803ef70 100644
--- a/doc/source/_posts/hello_world.md
+++ b/doc/source/_posts/hello_world.md
@@ -1,6 +1,7 @@
title: Hello World
type: blog
-order: 1
+
---
# Hello world
+
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/_posts/test.md
----------------------------------------------------------------------
diff --git a/doc/source/_posts/test.md b/doc/source/_posts/test.md
new file mode 100644
index 0000000..afaa8ec
--- /dev/null
+++ b/doc/source/_posts/test.md
@@ -0,0 +1,14 @@
+title: test
+type: blog
+
+---
+
+
+# test
+
+asdfadfasdfasdfadfadsf
+asdfasdfadsf
+adsfadsfadsf
+
+## sdfasdfasdf
+sdfsdfsdf
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/cn/references/bubble.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/bubble.md b/doc/source/cn/references/bubble.md
index 4b63cad..6f8f0ed 100644
--- a/doc/source/cn/references/bubble.md
+++ b/doc/source/cn/references/bubble.md
@@ -11,7 +11,7 @@ Weex 2.0 实现了 W3C 标准的事件冒泡机制。
### 使用
-```javascript
+```html
<template>
<div class="root" @click="rootClick" bubble="true">
<text style="font-size: 40px;">{{rootText}}</text>
@@ -81,7 +81,7 @@ Weex 2.0 实现了 W3C 标准的事件冒泡机制。
在事件处理函数中，可以使用 `e.stopPropagation()` 方法，来阻止本次事件向上的传递过程。注意，`e.stopPropagation()` 与 `bubble="true"` 不同，前者只会影响当前元素以及父元素的传播，不会影响子元素的传播；后者是为了版本兼容而增加的开关机制，会全局关闭或者开启冒泡机制，两者可以共同存在使用，如下：
-```javascript
+```html
<template>
<div class="root" @click="rootClick" bubble="true">
<text style="font-size: 40px;">{{rootText}}</text>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/cn/references/components/input.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/input.md b/doc/source/cn/references/components/input.md
index a0aecf8..3cf83fd 100644
--- a/doc/source/cn/references/components/input.md
+++ b/doc/source/cn/references/components/input.md
@@ -135,13 +135,15 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
<text style="font-size: 40px">oninput: {{txtInput}}</text>
<text style="font-size: 40px">onchange: {{txtChange}}</text>
<text style="font-size: 40px">onreturntype: {{txtReturnType}}</text>
+ <text style="font-size: 40px">selection: {{txtSelection}}</text>
+
</div>
<scroller>
<div>
<div style="background-color: #286090">
<text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = text</text>
</div>
- <input type="text" placeholder="Input Text" class="input" :autofocus=true value="" @change="onchange" @input="oninput" @focus="onfocus" @blur="onblur"/>
+ <input type="text" placeholder="Input Text" class="input" :autofocus=true value="" @change="onchange" @input="oninput"/>
</div>
<div>
@@ -181,6 +183,13 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
<div>
<div style="background-color: #286090">
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = number</text>
+ </div>
+ <input type="number" placeholder="Input number" class="input" @change="onchange" @input="oninput"/>
+ </div>
+
+ <div>
+ <div style="background-color: #286090">
<text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = date</text>
</div>
<input type="date" placeholder="Input Date" class="input" @change="onchange" @input="oninput" max="2017-12-12" min="2015-01-01"/>
@@ -248,6 +257,7 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
</div>
<div style="flex-direction: row;margin-bottom: 16px;justify-content: space-between">
<text class="button" value="setRange" type="primary" @click="setRange"></text>
+ <text class="button" value="getSelectionRange" type="primary" @click="getSelectionRange"></text>
</div>
<input type="text" ref="inputselection" placeholder="please input" value="123456789" class="input" @change="onchange" @return = "onreturn" @input="oninput"/>
</div>
@@ -280,7 +290,6 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
</style>
<script>
- const modal = weex.requireModule('modal')
module.exports = {
data: function () {
return {
@@ -320,23 +329,16 @@ Weex 内置的 `<input>` 组件用来创建接收用户输入字符的输入组
console.log(this.$refs["inputselection"]);
this.$refs["inputselection"].setSelectionRange(2, 6);
},
- onfocus () {
- console.log('onfocus:');
- modal.toast({
- message: 'onfocus',
- duration: 0.8
- })
- },
- onblur () {
- console.log('onblur:');
- modal.toast({
- message: 'input blur',
- duration: 0.8
- })
+ getSelectionRange: function() {
+ console.log(this.$refs["inputselection"]);
+ var self = this;
+ this.$refs["inputselection"].getSelectionRange(function(e) {
+ self.txtSelection = e.selectionStart +'-' + e.selectionEnd;
+ });
}
}
};
</script>
```
-[体验一下](http://dotwe.org/vue/dd83d941d2364f2849e45dc3c5d91ab4)
+[体验一下](http://dotwe.org/vue/3470e4d0194f3879a72d38e2ab02cc9f)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/cn/v-0.10/references/bubble.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/v-0.10/references/bubble.md b/doc/source/cn/v-0.10/references/bubble.md
index cb25e05..74b7e98 100644
--- a/doc/source/cn/v-0.10/references/bubble.md
+++ b/doc/source/cn/v-0.10/references/bubble.md
@@ -2,7 +2,7 @@
title: 事件冒泡
type: references
order: 1.3
-version: 2.1
+version: 0.10
---
# 事件冒泡 <span class="api-version">v0.13+</span>
@@ -11,7 +11,7 @@ Weex 1.0 实现了 W3C 标准的事件冒泡机制。
### 使用
-```javascript
+```html
<template>
<div class="root" onclick="rootClick" bubble="true">
<div>
@@ -83,7 +83,7 @@ Weex 1.0 实现了 W3C 标准的事件冒泡机制。
在事件处理函数中，可以使用 `e.stopPropagation()` 方法，来阻止本次事件向上的传递过程。注意，`e.stopPropagation()` 与 `bubble="true"` 不同，前者只会影响当前元素以及父元素的传播，不会影响子元素的传播；后者是为了版本兼容而增加的开关机制，会全局关闭或者开启冒泡机制，两者可以共同存在使用，如下：
-```javascript
+```html
<template>
<div class="root" onclick="rootClick" bubble="true">
<div>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/references/bubble.md
----------------------------------------------------------------------
diff --git a/doc/source/references/bubble.md b/doc/source/references/bubble.md
index c66d9b9..8d2470c 100644
--- a/doc/source/references/bubble.md
+++ b/doc/source/references/bubble.md
@@ -11,7 +11,7 @@ Weex 2.0 implements the W3C standard event bubbling mechanism.
### Usage
-```javascript
+```html
<template>
<div class="root" @click="rootClick" bubble="true">
<text style="font-size: 40px;">{{rootText}}</text>
@@ -81,7 +81,7 @@ One thing should be noticed: **For compatibility with previous versions, Weex do
In the event handler function, you can use the `e.stopPropagation()` method to prevent the event from escalating. Note that `e.stopPropagation()` differs from `bubble = "true"`, which affects only the current elements and the propagation of parent elements, without affecting the propagation of child elements; the latter is a switching mechanism that is added for compatibility, Will be a global shutdown or open the bubble mechanism, the two can co-exist, as follows:
-```javascript
+```html
<template>
<div class="root" @click="rootClick" bubble="true">
<text style="font-size: 40px;">{{rootText}}</text>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/references/components/input.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/input.md b/doc/source/references/components/input.md
index 8eea2ad..fdd4d0a 100644
--- a/doc/source/references/components/input.md
+++ b/doc/source/references/components/input.md
@@ -113,13 +113,15 @@ does not support the common-event 'click'. Please listen to the 'input' or '
<text style="font-size: 40px">oninput: {{txtInput}}</text>
<text style="font-size: 40px">onchange: {{txtChange}}</text>
<text style="font-size: 40px">onreturntype: {{txtReturnType}}</text>
+ <text style="font-size: 40px">selection: {{txtSelection}}</text>
+
</div>
<scroller>
<div>
<div style="background-color: #286090">
<text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = text</text>
</div>
- <input type="text" placeholder="Input Text" class="input" :autofocus=true value="" @change="onchange" @input="oninput" @focus="onfocus" @blur="onblur"/>
+ <input type="text" placeholder="Input Text" class="input" :autofocus=true value="" @change="onchange" @input="oninput"/>
</div>
<div>
@@ -159,6 +161,13 @@ does not support the common-event 'click'. Please listen to the 'input' or '
<div>
<div style="background-color: #286090">
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = number</text>
+ </div>
+ <input type="number" placeholder="Input number" class="input" @change="onchange" @input="oninput"/>
+ </div>
+
+ <div>
+ <div style="background-color: #286090">
<text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = date</text>
</div>
<input type="date" placeholder="Input Date" class="input" @change="onchange" @input="oninput" max="2017-12-12" min="2015-01-01"/>
@@ -226,6 +235,7 @@ does not support the common-event 'click'. Please listen to the 'input' or '
</div>
<div style="flex-direction: row;margin-bottom: 16px;justify-content: space-between">
<text class="button" value="setRange" type="primary" @click="setRange"></text>
+ <text class="button" value="getSelectionRange" type="primary" @click="getSelectionRange"></text>
</div>
<input type="text" ref="inputselection" placeholder="please input" value="123456789" class="input" @change="onchange" @return = "onreturn" @input="oninput"/>
</div>
@@ -258,7 +268,6 @@ does not support the common-event 'click'. Please listen to the 'input' or '
</style>
<script>
- const modal = weex.requireModule('modal')
module.exports = {
data: function () {
return {
@@ -298,23 +307,16 @@ does not support the common-event 'click'. Please listen to the 'input' or '
console.log(this.$refs["inputselection"]);
this.$refs["inputselection"].setSelectionRange(2, 6);
},
- onfocus () {
- console.log('onfocus:');
- modal.toast({
- message: 'onfocus',
- duration: 0.8
- })
- },
- onblur () {
- console.log('onblur:');
- modal.toast({
- message: 'input blur',
- duration: 0.8
- })
+ getSelectionRange: function() {
+ console.log(this.$refs["inputselection"]);
+ var self = this;
+ this.$refs["inputselection"].getSelectionRange(function(e) {
+ self.txtSelection = e.selectionStart +'-' + e.selectionEnd;
+ });
}
}
};
</script>
```
-[try it](http://dotwe.org/vue/dd83d941d2364f2849e45dc3c5d91ab4)
+[try it](http://dotwe.org/vue/3470e4d0194f3879a72d38e2ab02cc9f)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf874113/doc/source/v-0.10/references/bubble.md
----------------------------------------------------------------------
diff --git a/doc/source/v-0.10/references/bubble.md b/doc/source/v-0.10/references/bubble.md
index 849ab36..ba59a90 100644
--- a/doc/source/v-0.10/references/bubble.md
+++ b/doc/source/v-0.10/references/bubble.md
@@ -2,16 +2,16 @@
title: Event Bubble
type: references
order: 1.3
-version: 2.1
+version: 0.10
---
# Event Bubble <span class="api-version">v0.13+</span>
-Weex 2.0 implements the W3C standard event bubbling mechanism.
+Weex 1.0 implements the W3C standard event bubbling mechanism.
### Usage
-```javascript
+```html
<template>
<div class="root" onclick="rootClick" bubble="true">
<div>
@@ -83,7 +83,7 @@ One thing should be noticed: **For compatibility with previous versions, Weex do
In the event handler function, you can use the `e.stopPropagation()` method to prevent the event from escalating. Note that `e.stopPropagation()` differs from `bubble = "true"`, which affects only the current elements and the propagation of parent elements, without affecting the propagation of child elements; the latter is a switching mechanism that is added for compatibility, Will be a global shutdown or open the bubble mechanism, the two can co-exist, as follows:
-```javascript
+```html
<template>
<div class="root" onclick="rootClick" bubble="true">
<div>
[06/27] incubator-weex git commit: * [doc] Add scroll event demo.
Posted by cx...@apache.org.
* [doc] Add scroll event demo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dd60d656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dd60d656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dd60d656
Branch: refs/heads/0.16-dev
Commit: dd60d6566767418802450f6dd13e3fdfb16f28ac
Parents: cf0bff0
Author: yinfeng <cx...@apache.org>
Authored: Fri Jun 30 17:09:53 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Fri Jun 30 17:09:53 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/list.md | 4 ++--
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/references/components/list.md | 4 +---
doc/source/references/components/scroller.md | 4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd60d656/doc/source/cn/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/list.md b/doc/source/cn/references/components/list.md
index 2175bfc..be14d06 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -63,7 +63,7 @@ version: 2.1
- `loadmore` <sup class="wx-v">0.5+</sup>：如果列表滚动到底部将会立即触发这个事件，你可以在这个事件的处理函数中加载下一页的列表项。
- `onscroll` <sup class="wx-v">0.11+</sup>: 列表发生滚动时将会触发该事件，事件的默认抽样率为10px，即列表每滚动10px触发一次，可通过属性`offset-accuracy`设置抽样率。
-
+
事件中 event 对象属性：
- `contentSize {Object}`：列表的内容尺寸
- `width {number}`: 列表内容宽度
@@ -74,7 +74,7 @@ version: 2.1
[体验一下](http://dotwe.org/bc445ede8746a31360e3607d210304c5)
-- `scroll` <sup class="wx-v">0.12+</sup>：列表滚动时触发这个事件。此事件回调中会给出当前`contentOffset`值。
+- `scroll` <sup class="wx-v">0.12+</sup>：列表滚动时触发这个事件。此事件回调中会给出当前`contentOffset`值。参见 [scroll event demo](http://dotwe.org/vue/9ef0e52bacaa20182a693f2187d851aa)。
[体验一下](http://dotwe.org/weex/7ba3b6222d912b4b0b4aafb8248ca22f)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd60d656/doc/source/cn/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/scroller.md b/doc/source/cn/references/components/scroller.md
index dd74525..acac227 100644
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@ -62,7 +62,7 @@ version: 2.1
## 事件
- `loadmore` <sup class="wx-v">v0.5+</sup>：如果滚动到底部将会立即触发这个事件，你可以在这个事件的处理函数中加载下一页的列表项。
-- `scroll` <sup class="wx-v">0.11+</sup>: 列表发生滚动时将会触发该事件，事件的默认抽样率为10px，即列表每滚动10px触发一次，可通过属性`offset-accuracy`设置抽样率。
+- `scroll` <sup class="wx-v">0.11+</sup>: 列表发生滚动时将会触发该事件，事件的默认抽样率为10px，即列表每滚动10px触发一次，可通过属性`offset-accuracy`设置抽样率。 参见 [scroll event demo](http://dotwe.org/vue/9ef0e52bacaa20182a693f2187d851aa)。
事件中 event 对象属性：
- `contentSize {Object}`：列表的内容尺寸
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd60d656/doc/source/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/list.md b/doc/source/references/components/list.md
index 1e69b94..12a62ee 100644
--- a/doc/source/references/components/list.md
+++ b/doc/source/references/components/list.md
@@ -91,9 +91,7 @@ common styles: check out [common styles for components](../common-style.html)
onloadmore 0.5 used with loadmoreoffset attribute. if the view has less than loadmoreoffset to scroll down, the onloadmore event will be triggered.
-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.
-
-[try](http://dotwe.org/weex/7ba3b6222d912b4b0b4aafb8248ca22f)
+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)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd60d656/doc/source/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/scroller.md b/doc/source/references/components/scroller.md
index 6778bd6..4218757 100644
--- a/doc/source/references/components/scroller.md
+++ b/doc/source/references/components/scroller.md
@@ -48,9 +48,9 @@ common styles: check out [common styles for components](../common-style.html)
## Events
-onloadmore used with loadmoreoffset attribute. if the view has less than loadmoreoffset to scroll down, the onloadmore event will be triggered.
+`loadmore` used with loadmoreoffset attribute. if the view has less than loadmoreoffset to scroll down, the onloadmore event will be triggered.
-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.
+`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)
[23/27] incubator-weex git commit: add weex-project.io website host
by aliyun
Posted by cx...@apache.org.
add weex-project.io website host by aliyun
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b397774a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b397774a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b397774a
Branch: refs/heads/0.16-dev
Commit: b397774a8570c981c8a51c0eebb5ac8feb6e2591
Parents: 081b7a3
Author: tancy <ro...@gmail.com>
Authored: Fri Jul 14 17:37:15 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Fri Jul 14 17:37:15 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/layout/_partial/footer.ejs | 2 +-
doc/themes/weex/layout/_partial/post/summary.ejs | 6 ++++++
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/source/css/partial/footer.scss | 1 +
doc/themes/weex/source/css/partial/summary.scss | 6 ++++++
doc/themes/weex/source/js/common.js | 16 ++++++++++++++++
6 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/layout/_partial/footer.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/footer.ejs b/doc/themes/weex/layout/_partial/footer.ejs
index 289cfb8..0cbe7b2 100644
--- a/doc/themes/weex/layout/_partial/footer.ejs
+++ b/doc/themes/weex/layout/_partial/footer.ejs
@@ -27,4 +27,4 @@
<div class="row clearfix">
<div></div>
</div>
-</footer>
\ No newline at end of file
+</footer>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/layout/_partial/post/summary.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/post/summary.ejs b/doc/themes/weex/layout/_partial/post/summary.ejs
index f6c6313..e81308d 100644
--- a/doc/themes/weex/layout/_partial/post/summary.ejs
+++ b/doc/themes/weex/layout/_partial/post/summary.ejs
@@ -1,5 +1,6 @@
<% var result = page.path.match(/(v-)(\d+(\.\d+))/) %>
<% var version = result ? +result[2] : 2.1 %>
+
<div class="doc-nav-version">
<select class="versionBtn" stype="<%- url_for_lang(page.type) %>">
<% if (version == 2.1) { %>
@@ -45,4 +46,9 @@
<% }) %>
</ul>
+</div>
+<div class="hostbyaliyun">
+ <a href="https://render.alipay.com/p/s/taobaonpm_click/weex_banner_click">
+ <img src="https://render.alipay.com/p/s/taobaonpm_click/weex_banner" alt="" width="180px">
+ </a>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/layout/_partial/slider.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/slider.ejs b/doc/themes/weex/layout/_partial/slider.ejs
index f35c58f..6ddf55e 100644
--- a/doc/themes/weex/layout/_partial/slider.ejs
+++ b/doc/themes/weex/layout/_partial/slider.ejs
@@ -6,7 +6,7 @@
<h1 class="page-title"><%= _p('index.page_title') %></h1>
<div class="btn-group">
<a href="<%= url_for_lang('guide/index.html') %>" class="button get-started"><%= _p('index.get_started') %></a>
- <a href="https://github.com/apache/incubator-weex/" class="button get-started" target="_blank"><%= _p('menu.github') %></a>
+ <a href="<%= url_for_lang('guide/contributing.html') %>" class="button get-started"><%= _p('menu.invovled') %></a>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/source/css/partial/footer.scss
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/css/partial/footer.scss b/doc/themes/weex/source/css/partial/footer.scss
index 922eb0b..1bc4c69 100644
--- a/doc/themes/weex/source/css/partial/footer.scss
+++ b/doc/themes/weex/source/css/partial/footer.scss
@@ -71,3 +71,4 @@
margin-bottom: 10px;
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/source/css/partial/summary.scss
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/css/partial/summary.scss b/doc/themes/weex/source/css/partial/summary.scss
index 1b78b55..d9d4609 100644
--- a/doc/themes/weex/source/css/partial/summary.scss
+++ b/doc/themes/weex/source/css/partial/summary.scss
@@ -45,4 +45,10 @@
.lang-en .summary h3.chapter-title{
font-weight: 600;
+}
+
+.hostbyaliyun {
+ width: 180px;
+ z-index: 99;
+ display: none;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b397774a/doc/themes/weex/source/js/common.js
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/js/common.js b/doc/themes/weex/source/js/common.js
index d45df41..3e92ba4 100644
--- a/doc/themes/weex/source/js/common.js
+++ b/doc/themes/weex/source/js/common.js
@@ -273,6 +273,22 @@
}
initSearch()
+
+
+ function hostbyaliyun(){
+ if(location.hostname === "weex-project.io" || location.hostname === 'localhost'){
+ var hosts = document.querySelectorAll('.hostbyaliyun');
+ hosts.forEach(function (i) {
+ i.style.display = 'block'
+ })
+
+ }
+ }
+
+ hostbyaliyun()
+
+
+
/*
* LANDINGPAGE
*/
[14/27] incubator-weex git commit: * [doc] remove unsupported
scroll-direction attribute in list documentation
Posted by cx...@apache.org.
* [doc] remove unsupported scroll-direction attribute in list documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e26e4a7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e26e4a7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e26e4a7d
Branch: refs/heads/0.16-dev
Commit: e26e4a7d5e09a1246879fc158d43d6099d6cdad9
Parents: dd60d65
Author: yinfeng <cx...@apache.org>
Authored: Tue Jul 4 15:40:29 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Tue Jul 4 15:40:29 2017 +0800
----------------------------------------------------------------------
doc/source/references/components/list.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e26e4a7d/doc/source/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/list.md b/doc/source/references/components/list.md
index 12a62ee..0a0a174 100644
--- a/doc/source/references/components/list.md
+++ b/doc/source/references/components/list.md
@@ -62,7 +62,7 @@ It can provide excellent experience and performance while still maintaining smoo
Notes: The list now supports the following child components: cell, header, refresh, loading and fixed-position components. Other kinds of components will not be guaranteed to be displayed correctly.
-* cell 0.6.1 defines the attributes and behavior of the cells that appear in list.
+* cell 0.6.1 defines the attributes and behavior of the cells that appear in list.
* header 0.6.1 sticks to the top when it reaches the top of the screen.
* refresh 0.6.1 used inside list to add pull-down-to-refresh functionality.
* loading 0.6.1 used inside list to add pull-up-to-load-more functionality.
@@ -71,7 +71,6 @@ Notes: The list now supports the following child components: cell, header, refre
### Attributes
* show-scrollbar: true/false whether show the scroll bar or not, default value is true
-* scroll-direction: <string> define scroll direction of component, horizontal or vertical
* loadmoreoffset : <number> default value is 0. The loadmore event will be triggered when the list is loadmoreoffset left to reach the bottom of the list view. e.g. a list has total content length of 1000, and the loadmoreoffset is set to 400, the loadmore event will be triggered when 600 has beed scrolled and there is less than 400 left.
* loadmoreretry : <number> default value 0，whether to reset loadmore related UI when loadmore failed, will be deprecated in further release.
* offset-accuracy：<number> default value is 0, the vertical offset distance required to trigger the scroll event.
[11/27] incubator-weex git commit: Closes #169: invalid.
Posted by cx...@apache.org.
Closes #169: invalid.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6d395f5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6d395f5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6d395f5d
Branch: refs/heads/0.16-dev
Commit: 6d395f5d5df06fe6971c22cf070d72411e11bb5a
Parents: 5f96a2c
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Jul 3 11:53:02 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Jul 3 11:53:02 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------