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:42 UTC
[27/27] incubator-weex git commit: Merge branch 'dev' into 0.16-dev
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 中，用来设置全屏尺寸