You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/25 07:13:02 UTC
[01/18] incubator-weex git commit: *[doc] add ga
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 2abe322f2 -> f6a8c1b22
*[doc] add ga
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a52c861e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a52c861e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a52c861e
Branch: refs/heads/0.16-dev
Commit: a52c861e11b6f89cce78ae172f3578efa5e98ac2
Parents: 778c0f6
Author: tancy <ro...@gmail.com>
Authored: Mon Aug 14 16:39:41 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Mon Aug 14 16:39:41 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/layout/_partial/after-footer.ejs | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a52c861e/doc/themes/weex/layout/_partial/after-footer.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/after-footer.ejs b/doc/themes/weex/layout/_partial/after-footer.ejs
index babfb3c..b945034 100644
--- a/doc/themes/weex/layout/_partial/after-footer.ejs
+++ b/doc/themes/weex/layout/_partial/after-footer.ejs
@@ -1,3 +1,13 @@
<div style="display: none;">
<script src="//s95.cnzz.com/z_stat.php?id=1261496509&web_id=1261496509" language="JavaScript"></script>
+ <script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-104559823-1', 'auto');
+ ga('send', 'pageview');
+
+</script>
</div>
[17/18] incubator-weex git commit: * [test] bugfix index tc
Posted by ac...@apache.org.
* [test] bugfix index tc
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9d339284
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9d339284
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9d339284
Branch: refs/heads/0.16-dev
Commit: 9d339284c73a104d76d6a269f106bfc003741e49
Parents: 995bece
Author: gurisxie <27...@qq.com>
Authored: Fri Aug 25 14:38:29 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Aug 25 14:38:29 2017 +0800
----------------------------------------------------------------------
test/scripts/index.test.js | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9d339284/test/scripts/index.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/index.test.js b/test/scripts/index.test.js
index 3fe93fb..3df2b6b 100644
--- a/test/scripts/index.test.js
+++ b/test/scripts/index.test.js
@@ -32,25 +32,15 @@ describe('weex mobile index', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/index.js'))
+ .waitForElementByName('hello world.',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
return util.quit(driver);
})
-
- it('#1 Index', () => {
- return driver
- .waitForElementById('title',util.getGETActionWaitTimeMills(),1000)
- .text()
- .then((text)=>{
- assert.equal(text,'hello world.')
- })
- })
-
- it('#2 Click Button', () => {
+ it('#1 Click Button', () => {
return driver
- .waitForElementById('title',util.getGETActionWaitTimeMills(),1000)
.elementById('button')
.click()
.elementById('status')
@@ -60,9 +50,8 @@ describe('weex mobile index', function () {
})
})
- it('#3 Input Blur', () => {
+ it('#2 Input Blur', () => {
return driver
- .waitForElementById('title',util.getGETActionWaitTimeMills(),1000)
.elementById('input')
.click()
.elementById('button2')
@@ -73,6 +62,4 @@ describe('weex mobile index', function () {
assert.equal(text,'input blur.')
})
})
-
-
});
[08/18] incubator-weex git commit: * [doc] update doc for idea plugin
Posted by ac...@apache.org.
* [doc] update doc for idea plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7e9d5326
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7e9d5326
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7e9d5326
Branch: refs/heads/0.16-dev
Commit: 7e9d5326332cb8536e1f70346ff89a8888769828
Parents: 28fe948
Author: misakuo <mi...@apache.org>
Authored: Wed Aug 23 10:18:41 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Aug 23 10:18:41 2017 +0800
----------------------------------------------------------------------
doc/_config.yml | 2 ++
doc/_config_cn.yml | 2 ++
doc/source/cn/guide/tools/index.md | 2 +-
doc/source/guide/tools/index.md | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/_config.yml
----------------------------------------------------------------------
diff --git a/doc/_config.yml b/doc/_config.yml
index e262984..ff70324 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -335,3 +335,5 @@ alias:
cn/guide/tools/weexpack.html: cn/guide/tools/toolkit.html
guide/tools/devtools.html: guide/tools/toolkit.html
guide/tools/weexpack.html: guide/tools/toolkit.html
+ cn/guide/tools/plugin.html: cn/giude/tools/plugin.html
+ guide/tools/plugin.html: guide/tools/plugin.html
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/_config_cn.yml
----------------------------------------------------------------------
diff --git a/doc/_config_cn.yml b/doc/_config_cn.yml
index ef5679f..93eff7d 100644
--- a/doc/_config_cn.yml
+++ b/doc/_config_cn.yml
@@ -333,3 +333,5 @@ alias:
cn/guide/tools/weexpack.html: cn/guide/tools/toolkit.html
guide/tools/devtools.html: guide/tools/toolkit.html
guide/tools/weexpack.html: guide/tools/toolkit.html
+ cn/guide/tools/plugin.html: cn/giude/tools/plugin.html
+ guide/tools/plugin.html: guide/tools/plugin.html
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/source/cn/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/index.md b/doc/source/cn/guide/tools/index.md
index 6dacd4c..2abb520 100644
--- a/doc/source/cn/guide/tools/index.md
+++ b/doc/source/cn/guide/tools/index.md
@@ -8,4 +8,4 @@ version: 2.1
# 周边工具
- [weex-toolkit](./toolkit.html)
-- [Weex Language Support插件](./plugin.md)
+- [Weex Language Support插件](./plugin.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/source/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/index.md b/doc/source/guide/tools/index.md
index 74f8373..356bf98 100644
--- a/doc/source/guide/tools/index.md
+++ b/doc/source/guide/tools/index.md
@@ -8,4 +8,4 @@ version: 2.1
# Tools
- [weex-toolkit](./toolkit.html)
-- [IDEA / WebStorm Plugin](./plugin.md)
+- [IDEA / WebStorm Plugin](./plugin.html)
[12/18] incubator-weex git commit: * [doc] update document about
integration
Posted by ac...@apache.org.
* [doc] update document about integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fa820893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fa820893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fa820893
Branch: refs/heads/0.16-dev
Commit: fa820893b55fd72e2eb243e6bed4ca3b2e09d4b2
Parents: 9eda7b7
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 24 23:01:44 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 24 23:01:44 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/integrate-to-your-app.md | 6 +++---
doc/source/guide/integrate-to-your-app.md | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fa820893/doc/source/cn/guide/integrate-to-your-app.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/integrate-to-your-app.md b/doc/source/cn/guide/integrate-to-your-app.md
index 22f632a..318301c 100644
--- a/doc/source/cn/guide/integrate-to-your-app.md
+++ b/doc/source/cn/guide/integrate-to-your-app.md
@@ -256,8 +256,8 @@ WXSample地址
[WXAppConfiguration setAppName:@"WeexDemo"];
[WXAppConfiguration setAppVersion:@"1.0.0"];
-//init sdk enviroment
-[WXSDKEngine initSDKEnviroment];
+//init sdk environment
+[WXSDKEngine initSDKEnvironment];
//register custom module and component，optional
[WXSDKEngine registerComponent:@"MyView" withClass:[MyViewComponent class]];
@@ -298,7 +298,7 @@ Weex 支持整体页面渲染和部分渲染两种模式，你需要做的事情
_instance.renderFinish = ^ (UIView *view) {
//process renderFinish
};
- NSURL *url = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"js"]
+ NSURL *url = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"js"];
[_instance renderWithURL:url options:@{@"bundleUrl":[self.url absoluteString]} data:nil];
}
```
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fa820893/doc/source/guide/integrate-to-your-app.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/integrate-to-your-app.md b/doc/source/guide/integrate-to-your-app.md
index 402ebe3..d458ac0 100644
--- a/doc/source/guide/integrate-to-your-app.md
+++ b/doc/source/guide/integrate-to-your-app.md
@@ -224,8 +224,8 @@ In the AppDelegate.m file to do the initialization operation, usually in the did
[WXAppConfiguration setAppGroup:@"AliApp"];
[WXAppConfiguration setAppName:@"WeexDemo"];
[WXAppConfiguration setAppVersion:@"1.0.0"];
-//init sdk enviroment
-[WXSDKEngine initSDKEnviroment];
+//init sdk environment
+[WXSDKEngine initSDKEnvironment];
//register custom module and component，optional
[WXSDKEngine registerComponent:@"MyView" withClass:[MyViewComponent class]];
[WXSDKEngine registerModule:@"event" withClass:[WXEventModule class]];
@@ -259,7 +259,7 @@ Weex supports both full page rendering and partial rendering. What you need to d
_instance.renderFinish = ^ (UIView *view) {
//process renderFinish
};
- NSURL *url = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"js"]
+ NSURL *url = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"js"];
[_instance renderWithURL:url options:@{@"bundleUrl":[self.url absoluteString]} data:nil];
}
```
[16/18] incubator-weex git commit: * [test] update text tc
Posted by ac...@apache.org.
* [test] update text tc
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/995bece0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/995bece0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/995bece0
Branch: refs/heads/0.16-dev
Commit: 995bece0c0060376a9a85dde5604350a4dc398bc
Parents: 1e4d2a6
Author: gurisxie <27...@qq.com>
Authored: Fri Aug 25 14:01:21 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Aug 25 14:01:21 2017 +0800
----------------------------------------------------------------------
test/scripts/components/text.test.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/995bece0/test/scripts/components/text.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/text.test.js b/test/scripts/components/text.test.js
index a3d050d..91f9de2 100644
--- a/test/scripts/components/text.test.js
+++ b/test/scripts/components/text.test.js
@@ -18,7 +18,6 @@ describe('weex text @ignore-ios', function () {
return util.init(driver)
.get(util.getPage('/components/text-layout.js'))
.sleep(2000)
- .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.getWindowSize()
.then(size => {
screenWidth = size.width
@@ -32,6 +31,7 @@ describe('weex text @ignore-ios', function () {
it('#2 Text Content', () => {
return driver
+ .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.elementById('text-only')
.text()
.then((text) => {
@@ -41,6 +41,7 @@ describe('weex text @ignore-ios', function () {
it('#3 Line Height', () => {
return driver
+ .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.elementById('lines')
.getRect()
.then(rect => {
@@ -52,6 +53,7 @@ describe('weex text @ignore-ios', function () {
it('#4 Font Size', () => {
return driver
+ .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.elementById('font')
.getRect()
.then(rect => {
@@ -63,6 +65,7 @@ describe('weex text @ignore-ios', function () {
it('#5 Fixed-Size', () => {
return driver
+ .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.elementById('fixed-size')
.getRect()
.then(rect => {
@@ -74,6 +77,7 @@ describe('weex text @ignore-ios', function () {
it('#6 flex:1; align-Items: stretch; flex-direction:row', () => {
return driver
+ .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.elementById('flexgrow-alignitems')
.getRect()
.then(rect => {
@@ -85,6 +89,7 @@ describe('weex text @ignore-ios', function () {
it('#7 flex:1; align-Items: center; flex-direction:row', () => {
return driver
+ .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.elementById('flexgrow')
.getRect()
.then(rect => {
[09/18] incubator-weex git commit: Merge branch 'dev' of
https://github.com/doumafang/incubator-weex into dev
Posted by ac...@apache.org.
Merge branch 'dev' of https://github.com/doumafang/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/0401b9c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0401b9c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0401b9c3
Branch: refs/heads/0.16-dev
Commit: 0401b9c33517ad5bfe259fbee848b18a25f5be49
Parents: 7e9d532 8a4dacc
Author: tancy <ro...@gmail.com>
Authored: Wed Aug 23 10:31:35 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Wed Aug 23 10:31:35 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 40 +++++++++++-----------
doc/source/cn/references/modules/animation.md | 40 +++++++++++-----------
doc/source/references/common-style.md | 40 +++++++++++-----------
doc/source/references/modules/animation.md | 30 ++++++++--------
4 files changed, 75 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
[14/18] incubator-weex git commit: * [test] Merge commit
'fa820893b55fd72e2eb243e6bed4ca3b2e09d4b2' into 0.16-dev
Posted by ac...@apache.org.
* [test] Merge commit 'fa820893b55fd72e2eb243e6bed4ca3b2e09d4b2' into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1b57d4b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1b57d4b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1b57d4b6
Branch: refs/heads/0.16-dev
Commit: 1b57d4b6906d734729b191b21a582da9c7b2a1d5
Parents: 712fa69 fa82089
Author: gurisxie <27...@qq.com>
Authored: Fri Aug 25 12:04:04 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Aug 25 12:04:04 2017 +0800
----------------------------------------------------------------------
doc/_config.yml | 2 +
doc/_config_cn.yml | 2 +
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/tools/index.md | 1 +
doc/source/cn/guide/tools/plugin.md | 77 ++++++++++++++++++++
doc/source/cn/references/common-style.md | 59 ++++++++++++++-
doc/source/cn/references/modules/animation.md | 37 +++++-----
doc/source/guide/integrate-to-your-app.md | 6 +-
doc/source/guide/tools/index.md | 1 +
doc/source/guide/tools/plugin.md | 68 +++++++++++++++++
doc/source/references/common-style.md | 57 +++++++++++++++
doc/source/references/modules/animation.md | 46 ++++++------
doc/themes/weex/languages/en.yml | 2 +-
.../weex/layout/_partial/after-footer.ejs | 10 +++
doc/themes/weex/layout/_partial/header.ejs | 3 +
doc/themes/weex/layout/_partial/sidebar.ejs | 3 +
doc/themes/weex/source/css/index.scss | 42 ++++++++---
17 files changed, 364 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1b57d4b6/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1b57d4b6/doc/source/references/common-style.md
----------------------------------------------------------------------
[04/18] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr623' into apache-dev
Posted by ac...@apache.org.
Merge remote-tracking branch 'upstream/pr623' into apache-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f76aa069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f76aa069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f76aa069
Branch: refs/heads/0.16-dev
Commit: f76aa0690cfb7624a84445151e0370fd9de2308e
Parents: a52c861 6e36b07
Author: misakuo <mi...@apache.org>
Authored: Mon Aug 21 12:25:58 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Aug 21 12:25:58 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/tools/index.md | 1 +
doc/source/cn/guide/tools/plugin.md | 70 ++++++++++++++++++++++++
doc/source/guide/tools/index.md | 1 +
doc/source/guide/tools/plugin.md | 61 +++++++++++++++++++++
doc/themes/weex/layout/_partial/sidebar.ejs | 3 +
5 files changed, 136 insertions(+)
----------------------------------------------------------------------
[05/18] incubator-weex git commit: *[doc]fix css style
Posted by ac...@apache.org.
*[doc]fix css 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/ee892fb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee892fb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee892fb3
Branch: refs/heads/0.16-dev
Commit: ee892fb32ee19d9cd9a024537c5ecec5b09fb6fc
Parents: f76aa06
Author: tancy <ro...@gmail.com>
Authored: Mon Aug 21 13:52:54 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Mon Aug 21 13:52:54 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/source/css/index.scss | 42 +++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee892fb3/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 7d8614c..c8ad8a0 100644
--- a/doc/themes/weex/source/css/index.scss
+++ b/doc/themes/weex/source/css/index.scss
@@ -13,15 +13,17 @@
height: 100%;
height: calc(100% - 72px);
- &:nth-child(even) {
- background: $bg-gray;
- color: $text-blue;
- }
+ // &:nth-child(even) {
+ // background: $bg-blue;
+ // color: $text-white;
+ // }
- &:nth-child(odd) {
- background: $bg-blue;
- color: $text-white;
- }
+ // &:nth-child(odd) {
+
+
+ // background: $bg-gray;
+ // color: $text-blue;
+ // }
h2 {
font-family: "Gill Sans";
@@ -77,6 +79,8 @@
.header {
height: 100%;
position: relative;
+ background: $bg-blue;
+ color: $text-white;
#slider {
margin-top: 73px;
@@ -159,6 +163,9 @@
.edge {
+ background: $bg-gray;
+ color: $text-blue;
+
.scene-container {
.textbox {
flex: 3;
@@ -210,6 +217,8 @@
}
.feature {
+ background: $bg-blue;
+ color: $text-white;
.feature-content {
height: 100%;
max-width: $content-max-width;
@@ -295,6 +304,10 @@
}
.cross-platform {
+
+ background: $bg-gray;
+ color: $text-blue;
+
.sketch-content {
flex: 5;
}
@@ -330,7 +343,8 @@
}
.supporting-vue {
- color: #fff;
+ background: $bg-blue;
+ color: $text-white;
.sketch-content.imgbox {
background: url("../images/vue.png") 50% 50% / contain no-repeat;
@@ -350,6 +364,10 @@
}
.schematic {
+
+ background: $bg-gray;
+ color: $text-blue;
+
.textbox p {
color: $text-light-black;
}
@@ -361,6 +379,10 @@
}
.users {
+
+ background: $bg-blue;
+ color: $text-white;
+
.sketch-content {
display: flex;
flex-flow: row wrap;
@@ -490,6 +512,8 @@
}
.feedback {
+ background: $bg-gray;
+ color: $text-blue;
.sketch-content {
display: flex;
flex-flow: row wrap;
[15/18] incubator-weex git commit: * [test] add test stabilize
Posted by ac...@apache.org.
* [test] add test stabilize
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1e4d2a68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1e4d2a68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1e4d2a68
Branch: refs/heads/0.16-dev
Commit: 1e4d2a680152c7db3c6f4f859f35904b4c28da6b
Parents: 1b57d4b
Author: gurisxie <27...@qq.com>
Authored: Fri Aug 25 12:55:04 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Aug 25 12:55:04 2017 +0800
----------------------------------------------------------------------
test/scripts/attributes/compositing.test.js | 2 +-
test/scripts/components/scroll-event.test.js | 7 ++++---
test/scripts/components/scroller-fixed.test.js | 2 +-
test/scripts/components/slider-common.test.js | 4 +++-
test/scripts/components/slider-infinite.test.js | 2 +-
test/scripts/components/text.test.js | 1 +
test/scripts/components/textarea-maxlength.test.js | 3 +--
test/scripts/css/border.test.js | 3 +--
test/scripts/dom.test.js | 7 ++++---
test/scripts/index.test.js | 5 +++--
test/scripts/modules/globalEvent.test.js | 2 +-
test/scripts/modules/timer.test.js | 5 ++++-
12 files changed, 25 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/attributes/compositing.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/attributes/compositing.test.js b/test/scripts/attributes/compositing.test.js
index ac9419e..ee1d25e 100644
--- a/test/scripts/attributes/compositing.test.js
+++ b/test/scripts/attributes/compositing.test.js
@@ -35,7 +35,6 @@ describe('compositing test', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/attributes/compositing.js'))
- .waitForElementById('test-text',util.getGETActionWaitTimeMills() + 2000,1000)
});
afterEach(function () {
@@ -45,6 +44,7 @@ describe('compositing test', function () {
it('#1 compositing screenshot diff', () => {
return driver
+ .waitForElementById('test-text',util.getGETActionWaitTimeMills() + 2000,1000)
.takeScreenshot()
.then(imgData => {
var newImg = new Buffer(imgData, 'base64');
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/components/scroll-event.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/scroll-event.test.js b/test/scripts/components/scroll-event.test.js
index 1be94d8..108a559 100644
--- a/test/scripts/components/scroll-event.test.js
+++ b/test/scripts/components/scroll-event.test.js
@@ -32,7 +32,6 @@ describe('list scroll event', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/list-scroll.js'))
- .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
@@ -42,6 +41,8 @@ describe('list scroll event', function () {
it('#1 Drag list', () => {
return driver
+ .sleep(1000)
+ .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
.dragUp(200)
.dragUp(200)
.elementById('status')
@@ -60,16 +61,16 @@ describe('scroller scroll event', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/scroller-scroll.js'))
- .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
- // return util.quit(driver)
+ return util.quit(driver)
})
it('#1 Drag scroller', () => {
return driver
+ .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
.dragUp(200)
.dragUp(200)
.elementById('status')
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/components/scroller-fixed.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/scroller-fixed.test.js b/test/scripts/components/scroller-fixed.test.js
index cc5a807..c41986d 100644
--- a/test/scripts/components/scroller-fixed.test.js
+++ b/test/scripts/components/scroller-fixed.test.js
@@ -32,7 +32,6 @@ describe('scroller fixed position item ', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/components/scroller-fixed.js'))
- .waitForElementById('div_1',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
@@ -42,6 +41,7 @@ describe('scroller fixed position item ', function () {
it('#1 position:fixed items', () => {
return driver
+ .waitForElementById('div_1',util.getGETActionWaitTimeMills(),1000)
.dragUpAndDown()
.sleep(1000)
.elementById('text_1')
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/components/slider-common.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/slider-common.test.js b/test/scripts/components/slider-common.test.js
index 66a9352..b8a7e1d 100644
--- a/test/scripts/components/slider-common.test.js
+++ b/test/scripts/components/slider-common.test.js
@@ -32,7 +32,6 @@ describe('slider common', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/components/slider-common.js'))
- .waitForElementById('slider_1', util.getGETActionWaitTimeMills(), 1000)
});
afterEach(function () {
@@ -43,6 +42,7 @@ describe('slider common', function () {
it('#1 OnScroll & onChange Event', () => {
return driver
.sleep(3000)
+ .waitForElementById('slider_1', util.getGETActionWaitTimeMills(), 1000)
.elementById('s1_page1')
.click()
.elementById('s1_p')
@@ -76,6 +76,7 @@ describe('slider common', function () {
it('#2 Infinite scroll = true', () => {
return driver.sleep(3000)
+ .waitForElementById('slider_1', util.getGETActionWaitTimeMills(), 1000)
.elementById('s2_switch')
.click()
.sleep(5000)
@@ -88,6 +89,7 @@ describe('slider common', function () {
it('#3 Infinite scroll = false', () => {
return driver.sleep(3000)
+ .waitForElementById('slider_1', util.getGETActionWaitTimeMills(), 1000)
.elementById('s3_switch')
.click()
.sleep(5000)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/components/slider-infinite.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/slider-infinite.test.js b/test/scripts/components/slider-infinite.test.js
index c9a98a1..0d1c62d 100644
--- a/test/scripts/components/slider-infinite.test.js
+++ b/test/scripts/components/slider-infinite.test.js
@@ -32,7 +32,6 @@ describe('slider infinite scroll', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/slider-infinite.js'))
- .waitForElementById('txt1',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
@@ -43,6 +42,7 @@ describe('slider infinite scroll', function () {
it('#1 waiting for auto play', () => {
return driver
.sleep(5000)
+ .waitForElementById('txt1',util.getGETActionWaitTimeMills(),1000)
.elementById('txt1')
.text()
.then((text)=>{
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/components/text.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/text.test.js b/test/scripts/components/text.test.js
index af392f3..a3d050d 100644
--- a/test/scripts/components/text.test.js
+++ b/test/scripts/components/text.test.js
@@ -17,6 +17,7 @@ describe('weex text @ignore-ios', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/components/text-layout.js'))
+ .sleep(2000)
.waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
.getWindowSize()
.then(size => {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/components/textarea-maxlength.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/textarea-maxlength.test.js b/test/scripts/components/textarea-maxlength.test.js
index 3b3c99f..c1c4301 100644
--- a/test/scripts/components/textarea-maxlength.test.js
+++ b/test/scripts/components/textarea-maxlength.test.js
@@ -32,7 +32,6 @@ describe('@ignore-android textarea maxlength vue test2 ', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/components/textarea-maxlength.js'))
- .waitForElementById('textarea',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
@@ -41,7 +40,7 @@ describe('@ignore-android textarea maxlength vue test2 ', function () {
it('#1 textarea maxlenght', () => {
return driver
- .elementById('textarea')
+ .waitForElementById('textarea',util.getGETActionWaitTimeMills(),1000)
.sendKeys('12345678')
.sleep(3000)
.source()
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/css/border.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/css/border.test.js b/test/scripts/css/border.test.js
index 6ca6174..ae4e6a0 100644
--- a/test/scripts/css/border.test.js
+++ b/test/scripts/css/border.test.js
@@ -31,16 +31,15 @@ describe('border test', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/css/border.js'))
- .waitForElementById('test-text',util.getGETActionWaitTimeMills() + 2000,1000)
});
afterEach(function () {
return util.quit(driver);
})
-
it('#1 border screenshot diff', () => {
return driver
+ .waitForElementById('test-text',util.getGETActionWaitTimeMills() + 2000,1000)
.sleep(10000)
.takeScreenshot()
.then(imgData => {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/dom.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/dom.test.js b/test/scripts/dom.test.js
index 125f9b4..484f732 100644
--- a/test/scripts/dom.test.js
+++ b/test/scripts/dom.test.js
@@ -32,7 +32,6 @@ describe('dom-operation', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/dom-operation.js'))
- .waitForElementById('status',util.getGETActionWaitTimeMills(),1000);
});
afterEach(function () {
@@ -41,6 +40,7 @@ describe('dom-operation', function () {
it('#1 Repeat', ()=>{
return driver
+ .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
.elementById("item5")
.then((elem)=>{
assert.notEqual(elem ,undefined)
@@ -53,6 +53,7 @@ describe('dom-operation', function () {
it('#2 Add new item', ()=>{
return driver
+ .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
.elementById("btn1")
.click()
.sleep(2000)
@@ -68,7 +69,7 @@ describe('dom-operation', function () {
it('#3 Remove item', ()=>{
return driver
- .elementById("status")
+ .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
.click()
.sleep(2000)
.elementById("item6")
@@ -83,7 +84,7 @@ describe('dom-operation', function () {
it('#4 Update DOM attr', ()=>{
return driver
- .elementById("status")
+ .waitForElementById('status',util.getGETActionWaitTimeMills(),1000)
.click()
.sleep(2000)
.elementById("status2")
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/index.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/index.test.js b/test/scripts/index.test.js
index 35c7735..3fe93fb 100644
--- a/test/scripts/index.test.js
+++ b/test/scripts/index.test.js
@@ -32,7 +32,6 @@ describe('weex mobile index', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/index.js'))
- .waitForElementById('title',util.getGETActionWaitTimeMills(),1000);
});
afterEach(function () {
@@ -42,7 +41,7 @@ describe('weex mobile index', function () {
it('#1 Index', () => {
return driver
- .elementById('title')
+ .waitForElementById('title',util.getGETActionWaitTimeMills(),1000)
.text()
.then((text)=>{
assert.equal(text,'hello world.')
@@ -51,6 +50,7 @@ describe('weex mobile index', function () {
it('#2 Click Button', () => {
return driver
+ .waitForElementById('title',util.getGETActionWaitTimeMills(),1000)
.elementById('button')
.click()
.elementById('status')
@@ -62,6 +62,7 @@ describe('weex mobile index', function () {
it('#3 Input Blur', () => {
return driver
+ .waitForElementById('title',util.getGETActionWaitTimeMills(),1000)
.elementById('input')
.click()
.elementById('button2')
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/modules/globalEvent.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/modules/globalEvent.test.js b/test/scripts/modules/globalEvent.test.js
index 71d84ee..438ca49 100644
--- a/test/scripts/modules/globalEvent.test.js
+++ b/test/scripts/modules/globalEvent.test.js
@@ -31,7 +31,6 @@ describe('weex mobile index', function () {
beforeEach(function () {
return util.init(driver)
.get(util.getPage('/modules/globalEvent.js'))
- .waitForElementById('button',util.getGETActionWaitTimeMills(),1000)
});
afterEach(function () {
@@ -40,6 +39,7 @@ describe('weex mobile index', function () {
it('#0 fireEvent & received event',()=>{
return driver
+ .waitForElementById('button',util.getGETActionWaitTimeMills(),1000)
.elementById("button")
.click()
.sleep(2000)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4d2a68/test/scripts/modules/timer.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/modules/timer.test.js b/test/scripts/modules/timer.test.js
index b3fb079..9230bd2 100644
--- a/test/scripts/modules/timer.test.js
+++ b/test/scripts/modules/timer.test.js
@@ -17,7 +17,6 @@ function do_test(test_title, url) {
beforeEach(function () {
return util.init(driver)
.get(util.getPage(url))
- .waitForElementById("interval", util.getGETActionWaitTimeMills(), 1000)
});
afterEach(function () {
@@ -26,6 +25,7 @@ function do_test(test_title, url) {
it('#1 SetTimeOut', () => {
return driver
+ .waitForElementById("interval", util.getGETActionWaitTimeMills(), 1000)
.elementById('setTimeout')
.click()
.sleep(4000)
@@ -40,6 +40,7 @@ function do_test(test_title, url) {
it('#2 SetTimeOut Double click', () => {
return driver
+ .waitForElementById("interval", util.getGETActionWaitTimeMills(), 1000)
.elementById('setTimeout')
.click()
.click()
@@ -53,6 +54,7 @@ function do_test(test_title, url) {
it('#3 ClearTimeOut', () => {
return driver
+ .waitForElementById("interval", util.getGETActionWaitTimeMills(), 1000)
.elementById('setTimeout')
.click()
.elementById('clearTimeout')
@@ -68,6 +70,7 @@ function do_test(test_title, url) {
let previous = 0
it('#4 SetInterval ClearInterval', () => {
return driver
+ .waitForElementById("interval", util.getGETActionWaitTimeMills(), 1000)
.elementById('setInterval')
.click()
.sleep(7000)
[10/18] incubator-weex git commit: *[doc]add Weex Language Plugin
Posted by ac...@apache.org.
*[doc]add Weex Language Plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a7f8c310
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a7f8c310
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a7f8c310
Branch: refs/heads/0.16-dev
Commit: a7f8c310af9c3d491b054cb86891c593bcd6d6fe
Parents: 0401b9c
Author: tancy <ro...@gmail.com>
Authored: Wed Aug 23 10:48:18 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Wed Aug 23 10:48:18 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/tools/plugin.md | 7 +++++++
doc/source/guide/tools/plugin.md | 7 +++++++
doc/themes/weex/layout/_partial/header.ejs | 3 +++
doc/themes/weex/layout/_partial/sidebar.ejs | 2 +-
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a7f8c310/doc/source/cn/guide/tools/plugin.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/plugin.md b/doc/source/cn/guide/tools/plugin.md
index 467b890..539bcb0 100644
--- a/doc/source/cn/guide/tools/plugin.md
+++ b/doc/source/cn/guide/tools/plugin.md
@@ -1,3 +1,10 @@
+---
+title: Weex语法支持插件
+type: guide
+order: 5.1
+version: 2.1
+---
+
# Weex语法支持插件
[Weex Language Support](https://plugins.jetbrains.com/plugin/9189-weex-language-support) 插件是官方提供的一个工具，你可以使用它在IntelliJ IDEA，WebStorm等一系列IDE上对Weex DSL进行语法高亮，自动补全和错误检查等操作。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a7f8c310/doc/source/guide/tools/plugin.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/plugin.md b/doc/source/guide/tools/plugin.md
index 8ca1731..a74d866 100644
--- a/doc/source/guide/tools/plugin.md
+++ b/doc/source/guide/tools/plugin.md
@@ -1,3 +1,10 @@
+---
+title: Weex Language Support Plugin
+type: guide
+order: 5.1
+version: 2.1
+---
+
# Weex Language Support Plugin
[Weex Language Support](https://plugins.jetbrains.com/plugin/9189-weex-language-support) is a official tools to code highlight, automatic completion，lint and other functions in IDEA, WebStorm or the others IDEs.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a7f8c310/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 5b5701f..a6d57e0 100644
--- a/doc/themes/weex/layout/_partial/header.ejs
+++ b/doc/themes/weex/layout/_partial/header.ejs
@@ -23,6 +23,9 @@
<li>
<a href="https://market.dotwe.org" target="_blank">Market</a>
</li>
+ <li>
+ <a href="<%= url_for_lang('guide/tools/plugin.html') %>">Weex Language Plugin</a>
+ </li>
</ul>
</li>
<li class="dropdown">
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a7f8c310/doc/themes/weex/layout/_partial/sidebar.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/sidebar.ejs b/doc/themes/weex/layout/_partial/sidebar.ejs
index 9a9e2cf..f227a81 100644
--- a/doc/themes/weex/layout/_partial/sidebar.ejs
+++ b/doc/themes/weex/layout/_partial/sidebar.ejs
@@ -42,7 +42,7 @@
<a href="https://market.dotwe.org" target="_blank">Market</a>
</li>
<li>
- <a href="<%= url_for_lang('guide/tools/plugin.html') %>">Weex WebStorm Plugin</a>
+ <a href="<%= url_for_lang('guide/tools/plugin.html') %>">Weex Language Plugin</a>
</li>
</ul>
</li>
[02/18] incubator-weex git commit: * [ios] add doc about transition
Posted by ac...@apache.org.
* [ios] add doc about transition
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/840f6f7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/840f6f7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/840f6f7c
Branch: refs/heads/0.16-dev
Commit: 840f6f7cf5d1bcdad37db81b29dbf8743992f617
Parents: a52c861
Author: doumafang <do...@gmail.com>
Authored: Thu Aug 17 13:58:34 2017 +0800
Committer: doumafang <do...@gmail.com>
Committed: Thu Aug 17 15:00:30 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 59 +++++++++++++++++++++-
doc/source/cn/references/modules/animation.md | 41 +++++++--------
doc/source/references/common-style.md | 57 +++++++++++++++++++++
doc/source/references/modules/animation.md | 46 ++++++++---------
4 files changed, 159 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/840f6f7c/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 a36d2cd..9092066 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -339,6 +339,63 @@ transform 属性向元素应用 2D 转换。该属性允许我们对元素进行
</style>
```
+
+
+## transition <span class="api-version">v0.16.0+</span>
+
+现在您可以在CSS中使用transition属性来提升您应用的交互性与视觉感受，transition中包括布局动画，即LayoutAnimation，现在布局产生变化的同时也能使用transition带来的流畅动画。transition允许CSS的属性值在一定的时间区间内平滑地过渡。
+
+### 参数
+
+- ``transition-property``:允许过渡动画的属性名，设置不同样式transition效果的键值对，默认值为空，表示不执行任何transition，下表列出了所有合法的参数属性：
+
+ | 参数名 | 描述 |
+ | --------------- | ------------------------------ |
+ | width | transition过渡执行的时候是否组件的宽度参与动画 |
+ | height | transition过渡执行的时候是否组件的高度参与动画 |
+ | top | transition过渡执行的时候是否组件的顶部距离参与动画 |
+ | bottom | transition过渡执行的时候是否组件的底部距离参与动画 |
+ | left | transition过渡执行的时候是否组件的左侧距离参与动画 |
+ | right | transition过渡执行的时候是否组件的右侧距离参与动画 |
+ | backgroundColor | transition过渡执行的时候是否组件的背景颜色参与动画 |
+ | opacity | transition过渡执行的时候是否组件的不透明度参与动画 |
+ | transform | transition过渡执行的时候是否组件的变换类型参与动画 |
+
+- ``transition-duration``:指定transition过渡的持续时间 (单位是毫秒)，默认值是 `0`，表示没有动画效果。
+
+- ``transition-delay``:指定请求transition过渡操作到执行transition过渡之间的时间间隔 (单位是毫秒或者秒)，默认值是 `0`，表示没有延迟，在请求后立即执行transition过渡。
+
+- ``transition-timing-function``:描述transition过渡执行的速度曲线，用于使transition过渡更为平滑。默认值是 `ease`。下表列出了所有合法的属性：
+
+ | 属性名 | 描述 |
+ | ------------------------------ | ---------------------------------------- |
+ | ``ease`` | transition过渡逐渐变慢的过渡效果 |
+ | `ease-in` | transition过渡慢速开始，然后变快的过渡效果 |
+ | `ease-out` | transition过渡快速开始，然后变慢的过渡效果 |
+ | `ease-in-out` | transition过渡慢速开始，然后变快，然后慢速结束的过渡效果 |
+ | `linear` | transition过渡以匀速变化 |
+ | `cubic-bezier(x1, y1, x2, y2)` | 使用三阶贝塞尔函数中自定义transition变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
+
+### 示例
+
+```
+<style scoped>
+ .panel {
+ margin: 10px;
+ top:10px;
+ align-items: center;
+ justify-content: center;
+ border: solid;
+ border-radius: 10px;
+
+ transition-property: width,height,backgroundColor;
+ transition-duration: 0.3s;
+ transition-delay: 0s;
+ transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+ }
+</style>
+```
+
## 伪类 <span class="api-version">v0.9.5+</span>
Weex 支持四种伪类：`active`, `focus`, `disabled`, `enabled`
@@ -355,7 +412,7 @@ Weex 支持四种伪类：`active`, `focus`, `disabled`, `enabled`
-### Example
+### 示例
```html
<template>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/840f6f7c/doc/source/cn/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/animation.md b/doc/source/cn/references/modules/animation.md
index 38f9bec..882a455 100644
--- a/doc/source/cn/references/modules/animation.md
+++ b/doc/source/cn/references/modules/animation.md
@@ -21,34 +21,35 @@ version: 2.1
* `options.delay {number}`：指定请求动画操作到执行动画之间的时间间隔 (单位是毫秒)，默认值是 `0`，表示没有延迟，在请求后立即执行动画。
* `options.timingFunction {string}`：描述动画执行的速度曲线，用于使动画变化更为平滑。默认值是 `linear`，表示动画从开始到结束都拥有同样的速度。下表列出了所有合法的属性：
-| 属性名 | 描述 | 示例 |
-| ---- | ---- | ---- |
-| `linear` | 动画从头到尾的速度是相同的 |
-| `ease-in` | 动画速度由慢到快 |
-| `ease-out` | 动画速度由快到慢 |
-| `ease-in-out` | 动画先加速到达中间点后减速到达终点 |
-| `cubic-bezier(x1, y1, x2, y2)` | 在三次贝塞尔函数中定义变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
+| 属性名 | 描述 | 示例 |
+| ------------------------------ | ---------------------------------------- | ---- |
+| `linear` | 动画从头到尾的速度是相同的 | |
+| `ease-in` | 动画速度由慢到快 | |
+| `ease-out` | 动画速度由快到慢 | |
+| `ease-in-out` | 动画先加速到达中间点后减速到达终点 | |
+| `cubic-bezier(x1, y1, x2, y2)` | 在三次贝塞尔函数中定义变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). | |
* `options.styles {Object}`：设置不同样式过渡效果的键值对，下表列出了所有合法的参数：
-| 参数名 | 描述 | 值类型 | 默认值 | 示例 |
-| ---- | ---- | ---- | ---- |---- |
-| width | 动画执行后应用到组件上的宽度值 | length | 无 |
-| height | 动画执行后应用到组件上的高度值 | length | 无 |
-| backgroundColor | 动画执行后应用到组件上的背景颜色 | string | none |
-| opacity | 动画执行后应用到组件上的不透明度值 | 介于 0 到 1 间的数值 | `1` |
-| transformOrigin | 定义变化过程的中心点. 参数 `x-aris` 可能的值为 `left`、`center`、`right`、长度值或百分比值, 参数 `y-axis` 可能的值为 `top`、`center`、`bottom`、长度值或百分比值 | `x-axis y-axis` | `center center` |
-| transform | 定义应用在元素上的变换类型，支持下表列出的属性 | object | 无 |
+| 参数名 | 描述 | 值类型 | 默认值 | 示例 |
+| --------------- | ---------------------------------------- | --------------- | --------------- | ---- |
+| width | 动画执行后应用到组件上的宽度值 | length | 无 | |
+| height | 动画执行后应用到组件上的高度值 | length | 无 | |
+| backgroundColor | 动画执行后应用到组件上的背景颜色 | string | none | |
+| opacity | 动画执行后应用到组件上的不透明度值 | 介于 0 到 1 间的数值 | `1` | |
+| transformOrigin | 定义变化过程的中心点. 参数 `x-aris` 可能的值为 `left`、`center`、`right`、长度值或百分比值, 参数 `y-axis` 可能的值为 `top`、`center`、`bottom`、长度值或百分比值 | `x-axis y-axis` | `center center` | |
+| transform | 定义应用在元素上的变换类型，支持下表列出的属性 | object | 无 | |
`transform`属性的合法值:
-| 名称 | 描述 | 值类型 | 默认值 | 示例 |
-| ---- | ---- | ---- | ---- | ---- |
-| `translate`/`translateX`/`translateY` | 指定元素要移动到的位置 | 像素值或百分比 | 无 |
-| `rotate` | 指定元素将被旋转的角度，单位是度 | number | 无 |
-| `scale`/`scaleX`/`scaleY` | 按比例放大或缩小元素 | number | 无 |
+| 名称 | 描述 | 值类型 | 默认值 | 示例 |
+| ------------------------------------- | ---------------- | ------- | ---- | ---- |
+| `translate`/`translateX`/`translateY` | 指定元素要移动到的位置 | 像素值或百分比 | 无 | |
+| `rotate` | 指定元素将被旋转的角度，单位是度 | number | 无 | |
+| `scale`/`scaleX`/`scaleY` | 按比例放大或缩小元素 | number | 无 | |
* `callback {Function}`：动画执行完毕之后的回调
+* `needLayout（boolean）`：节点动画执行时是否产生布局动画即LayoutAnimation
## Example
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/840f6f7c/doc/source/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/references/common-style.md b/doc/source/references/common-style.md
index 4250fec..3556fb6 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -228,6 +228,63 @@ Currently supported format:
</style>
```
+## transition <span class="api-version">v0.16.0+</span>
+
+Now you can use the transition attribute in CSS to enhance the interactivity and visual experience of your application. The transition includes the layout animation, that is, LayoutAnimation, which now changes the layout and uses the fluent animation of the transition. Transition allows the CSS attribute values to transition smoothly over a certain time interval.
+
+### Property
+
+- ``transition-property``:Allows the name of the transitional animation to set the value of the different styles transition effect, the default value is empty, that does not perform any transition, the following table lists all the legitimate parameters of the property:
+
+ | Property | Description |
+ | --------------- | ---------------------------------------- |
+ | width | The transition is performed when the width of the component is involved in the animation |
+ | height | The transition is performed when the height of the component is involved in the animation |
+ | top | The transition is performed when the top of the component is involved in the animation |
+ | bottom | The transition is performed when the bottom of the component is involved in the animation |
+ | left | The transition is performed when the left of the component is involved in the animation |
+ | right | The transition is performed when the right of the component is involved in the animation |
+ | backgroundColor | The transition is performed when the backgroundColor of the component is involved in the animation |
+ | opacity | The transition is performed when the opacity of the component is involved in the animation |
+ | transform | The transition is performed when the transform of the component is involved in the animation |
+
+- ``transition-duration``:Specifies the duration of the transition transition (in milliseconds). The default value is 0, indicating that there is no animation.
+
+- ``transition-delay``:Specifies the time interval (in milliseconds or seconds) between the request transition transition and the transition transition. The default value is 0, indicating that there is no delay, and the transition transition is performed immediately after the request.
+
+- ``transition-timing-function``:Describes the velocity curve of the transition transition, which is used to make the transition transition smoother. The default is ease. The following table lists all the valid attributes:
+
+ | Property | Description |
+ | ------------------------------ | ---------------------------------------- |
+ | ``ease`` | The transition gradually slow down the transition effect |
+| `ease-in` | The transition starts slowly and then becomes faster for the transition effect |
+| `ease-out` | The transition starts quickly and then slows the transition effect |
+| `ease-in-out` | The transition starts slowly, then goes fast and then slowly ends the transition effect |
+| `linear` | The transition changes at constant speed |
+| `cubic-bezier(x1, y1, x2, y2)` | Using the custom transition in the third-order Bessel function, the parameter values of the function must be between 0 and 1. For more information on three times Bessel, see [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
+
+### Example
+
+```
+<style scoped>
+ .panel {
+ margin: 10px;
+ top:10px;
+ align-items: center;
+ justify-content: center;
+ border: solid;
+ border-radius: 10px;
+
+ transition-property: width,height,backgroundColor;
+ transition-duration: 0.3s;
+ transition-delay: 0s;
+ transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+ }
+</style>
+```
+
+
+
## Pseudo class <span class="api-version">v0.9.5+</span>
Weex support four pseudo-classes: `active`, `focus`, `disabled`, `enabled`
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/840f6f7c/doc/source/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/animation.md b/doc/source/references/modules/animation.md
index 29de02b..539191f 100644
--- a/doc/source/references/modules/animation.md
+++ b/doc/source/references/modules/animation.md
@@ -28,37 +28,37 @@ Smooth and meaningful animation is very effective for enhancing the user experie
- `delay` (number): Specifies the amount of milliseconds to wait between a change being requested to a property that is to be transitioned and the start of the transition effect. The default value is `0`.
- `timingFunction` (string): Used to describe how the intermediate values of the styles being affected by a transition effect are calculated, default value is `linear`, the allowed attributes are listed in the following table:
-|name|description|example|
-|:--|:--|:--|
-|`linear`|Specifies a transition effect with the same speed from start to end|
-|`ease-in`|Specifies a transition effect with a slow start|
-|`ease-out`|Specifies a transition effect with a slow end|
-|`ease-in-out`|Specifies a transition effect with a slow start and end|
-|`cubic-bezier(x1, y1, x2, y2)`|Define your own values in the cubic-bezier function. Possible values are parameter values from 0 to 1. More information about cubic-bezier please visit [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve).|
+| name | description | example |
+| :----------------------------- | :--------------------------------------- | :------ |
+| `linear` | Specifies a transition effect with the same speed from start to end | |
+| `ease-in` | Specifies a transition effect with a slow start | |
+| `ease-out` | Specifies a transition effect with a slow end | |
+| `ease-in-out` | Specifies a transition effect with a slow start and end | |
+| `cubic-bezier(x1, y1, x2, y2)` | Define your own values in the cubic-bezier function. Possible values are parameter values from 0 to 1. More information about cubic-bezier please visit [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). | |
- `styles` (object): Specify the names and values of styles to which a transition effect should be applied. The allowed attributes are listed in the following table:
-| name | description | value type | default value |example|
-| :--- | :--- | :--- | :--- |:---|
-|width|The width applied to the component after the animation finished.|length|none|
-|height|The height applied to the component after the animation finished.|length|none|
-|backgroundColor|The background color applied to the component after the animation finished.|string|none|
-|opacity|The opacity applied to the component after the animation finished.|number between 0 to 1|`1`|
-|transformOrigin|The povit of transition. The possible values for `x-aris` are `left`/`center`/`right`/length or percent, and possible values of `y-axis` are `top`/`center`/`bottom`/ length or percent|`x-axis y-axis`|`center center`|
-|transform|Transform function to be applied to the element. The properties in the following table are supported|object|none|
+| name | description | value type | default value | example |
+| :-------------- | :--------------------------------------- | :-------------------- | :-------------- | :------ |
+| width | The width applied to the component after the animation finished. | length | none | |
+| height | The height applied to the component after the animation finished. | length | none | |
+| backgroundColor | The background color applied to the component after the animation finished. | string | none | |
+| opacity | The opacity applied to the component after the animation finished. | number between 0 to 1 | `1` | |
+| transformOrigin | The povit of transition. The possible values for `x-aris` are `left`/`center`/`right`/length or percent, and possible values of `y-axis` are `top`/`center`/`bottom`/ length or percent | `x-axis y-axis` | `center center` | |
+| transform | Transform function to be applied to the element. The properties in the following table are supported | object | none | |
properties of `transform`:
-| name | description | value type | default value |
-| :--- | :--- | :--- | :--- |
-|translate/translateX/translateY|Specifies the location of which the element will be translated to.|pixel or percent|none|
-|rotate|Specifies the angle of which the element will be rotated, the unit is degree.|number|none|
-|scale/scaleX/scaleY|Stretch or shrink the element.|number|none|
+| name | description | value type | default value |
+| :------------------------------ | :--------------------------------------- | :--------------- | :------------ |
+| translate/translateX/translateY | Specifies the location of which the element will be translated to. | pixel or percent | none |
+| rotate | Specifies the angle of which the element will be rotated, the unit is degree. | number | none |
+| scale/scaleX/scaleY | Stretch or shrink the element. | number | none |
-##### callback
-**type:** function
+- `callback`(function): Callback which is called after the completion of transition.
-**position:** Callback which is called after the completion of transition.
+
+- `needLayout`(boolean)：Whether or not the layout animation occurs when animation is executed
### Example
[13/18] incubator-weex git commit: * [test] add pic shot when after
test
Posted by ac...@apache.org.
* [test] add pic shot when after test
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/712fa692
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/712fa692
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/712fa692
Branch: refs/heads/0.16-dev
Commit: 712fa692bdacb31e81f4d58929efcb46c5ba3356
Parents: 4797325
Author: gurisxie <27...@qq.com>
Authored: Fri Aug 25 11:49:29 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Aug 25 11:49:29 2017 +0800
----------------------------------------------------------------------
test/mocha.opts | 2 --
test/pages/components/hyperlink.vue | 31 -----------------
test/pages/components/hyperlink_target.vue | 23 -------------
test/scripts/components/a-src.test.js | 30 +++++++++--------
test/scripts/components/hyperlink.test.js | 44 -------------------------
test/scripts/util.js | 21 ++++++++----
6 files changed, 32 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/712fa692/test/mocha.opts
----------------------------------------------------------------------
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index f8baf14..0000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1,2 +0,0 @@
---recursive
---bail
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/712fa692/test/pages/components/hyperlink.vue
----------------------------------------------------------------------
diff --git a/test/pages/components/hyperlink.vue b/test/pages/components/hyperlink.vue
deleted file mode 100644
index 7183f4f..0000000
--- a/test/pages/components/hyperlink.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
- <div class="wrapper">
- <a test-id='a-itself' class="button" href="hyperlink_target.js?_wxpage=true">
- <text test-id='content-inside-a' class="text">Jump</text>
- </a>
- </div>
-</template>
-<style>
- .wrapper {
- flex-direction: column;
- justify-content: center;
- }
-
- .button {
- width: 450px;
- margin-top: 30px;
- margin-left: 150px;
- padding-top: 20px;
- padding-bottom: 20px;
- border-width: 2px;
- border-style: solid;
- border-color: #DDDDDD;
- background-color: #F5F5F5
- }
-
- .text {
- font-size: 60px;
- color: #666666;
- text-align: center;
- }
-</style>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/712fa692/test/pages/components/hyperlink_target.vue
----------------------------------------------------------------------
diff --git a/test/pages/components/hyperlink_target.vue b/test/pages/components/hyperlink_target.vue
deleted file mode 100644
index 9aab5c0..0000000
--- a/test/pages/components/hyperlink_target.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
- <div>
- <text style="font-size:100px;" test-id='just_text' @click="jump_back">You just clicked A tag.</text>
- </div>
-</template>
-
-<script>
- var navigator = weex.requireModule('navigator')
- var modal = weex.requireModule('modal')
- export default {
- methods: {
- jump_back(event) {
- navigator.pop({
- animated: "true"
- }, event => {
- modal.toast({
- message: 'callback: ' + event
- })
- })
- }
- }
- };
-</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/712fa692/test/scripts/components/a-src.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/a-src.test.js b/test/scripts/components/a-src.test.js
index bbc8b99..082ab54 100644
--- a/test/scripts/components/a-src.test.js
+++ b/test/scripts/components/a-src.test.js
@@ -21,21 +21,25 @@ describe('a-src-test', function () {
return util.quit(driver);
})
- click_a_tag('#1 Click A tag itself', 'a-itself')
- click_a_tag('#2 Click some content inside a', 'content-inside-a')
+ it('#1 Click A tag itself', () => {
+ return driver
+ .waitForElementById('a-itself', maxWt, 2000)
+ .click()
+ .waitForElementByName('a-support-href1', maxWt, 2000)
+ .waitForElementByName('jump_back', maxWt, 2000)
+ .click();
+ })
- function click_a_tag(title, id) {
- it(title, () => {
- return driver
- .waitForElementById(id, maxWt, 2000)
- .click()
- .waitForElementByName('a-support-href1', maxWt, 2000)
- .waitForElementByName('jump_back', maxWt, 2000)
- .click();
- })
- }
+ it('#2 Click some content inside a', () => {
+ return driver
+ .waitForElementByName('Jump', maxWt, 2000)
+ .click()
+ .waitForElementByName('a-support-href1', maxWt, 2000)
+ .waitForElementByName('jump_back', maxWt, 2000)
+ .click();
+ })
- it('change src', () => {
+ it('#3 change src', () => {
return driver
.waitForElementByName('changeSrc', maxWt, 2000)
.click()
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/712fa692/test/scripts/components/hyperlink.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/hyperlink.test.js b/test/scripts/components/hyperlink.test.js
deleted file mode 100644
index 686edf5..0000000
--- a/test/scripts/components/hyperlink.test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict';
-
-var _ = require('macaca-utils');
-var assert = require('chai').assert
-var wd = require('weex-wd')
-var path = require('path');
-var os = require('os');
-var util = require("../util.js");
-
-describe('weex a test', function () {
- this.timeout(util.getTimeoutMills());
- var driver = util.createDriver(wd);
-
- beforeEach(function () {
- return util.init(driver)
- .get(util.getPage('/components/hyperlink.js'))
- .waitForElementById("content-inside-a", util.getGETActionWaitTimeMills(), 2000)
- });
-
- afterEach(function () {
- return util.quit(driver);
- })
-
- click_a_tag('#1 Click A tag itself', 'a-itself')
- click_a_tag('#2 Click some content inside a', 'content-inside-a')
-
- function click_a_tag(title, id) {
- it(title, () => {
- return driver
- .elementById(id)
- .click()
- .sleep(2000)
- .waitForElementById('just_text', util.getGETActionWaitTimeMills(), 2000)
- .elementById('just_text')
- .text()
- .then(text => {
- assert.equal(text, 'You just clicked A tag.')
- })
- .elementById('just_text')
- .click()
- .sleep(2000)
- })
- }
-});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/712fa692/test/scripts/util.js
----------------------------------------------------------------------
diff --git a/test/scripts/util.js b/test/scripts/util.js
index b56f934..64e99a8 100644
--- a/test/scripts/util.js
+++ b/test/scripts/util.js
@@ -223,11 +223,19 @@ module.exports = {
.sleep(1000)
})
})
- driver = driverFactory.initPromiseChain();
- driver.configureHttp({
- timeout: 100000
- });
- global._wxDriver = driver;
+ driverFactory.addPromiseChainMethod('saveShot', function(filepath){
+ return this.takeScreenshot()
+ .then(imgData => {
+ var newImg = new Buffer(imgData, 'base64');
+ fs.writeFileSync(filepath, newImg);
+ return this;
+ })
+ });
+ driver = driverFactory.initPromiseChain();
+ driver.configureHttp({
+ timeout: 100000
+ });
+ global._wxDriver = driver;
}
return driver;
@@ -243,6 +251,7 @@ module.exports = {
quit:function(driver){
if(browser)
return driver.quit()
- return driver.sleep(1000).back().sleep(1000);
+ var filepath = path.resolve(__dirname,'../../last.png');
+ return driver.saveShot(filepath).sleep(1000).back().sleep(1000);
}
}
[18/18] incubator-weex git commit: Merge commit
'2abe322f26ed2069076de25a8176d0455fb0f2bc' into 0.16-dev
Posted by ac...@apache.org.
Merge commit '2abe322f26ed2069076de25a8176d0455fb0f2bc' into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f6a8c1b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f6a8c1b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f6a8c1b2
Branch: refs/heads/0.16-dev
Commit: f6a8c1b22bd51a14d51354c14232a50965fb6d0e
Parents: 9d33928 2abe322
Author: gurisxie <27...@qq.com>
Authored: Fri Aug 25 15:09:17 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Fri Aug 25 15:09:17 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXAComponent.m | 2 +-
.../Sources/Component/WXComponent_internal.h | 4 +--
.../Sources/Component/WXSwitchComponent.m | 1 +
.../Sources/Component/WXTextAreaComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 -
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 ++++++++++----------
6 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[03/18] incubator-weex git commit: * [doc] add doc of idea plugin
Posted by ac...@apache.org.
* [doc] add doc of idea plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e36b074
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e36b074
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e36b074
Branch: refs/heads/0.16-dev
Commit: 6e36b0749f667c02107037ebde407d278ec6ac83
Parents: 9db8054
Author: misakuo <mi...@apache.org>
Authored: Mon Aug 21 12:22:04 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Aug 21 12:22:04 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/tools/index.md | 1 +
doc/source/cn/guide/tools/plugin.md | 70 ++++++++++++++++++++++++
doc/source/guide/tools/index.md | 1 +
doc/source/guide/tools/plugin.md | 61 +++++++++++++++++++++
doc/themes/weex/layout/_partial/sidebar.ejs | 3 +
5 files changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/source/cn/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/index.md b/doc/source/cn/guide/tools/index.md
index cd2c226..6dacd4c 100644
--- a/doc/source/cn/guide/tools/index.md
+++ b/doc/source/cn/guide/tools/index.md
@@ -8,3 +8,4 @@ version: 2.1
# 周边工具
- [weex-toolkit](./toolkit.html)
+- [Weex Language Support插件](./plugin.md)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/source/cn/guide/tools/plugin.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/plugin.md b/doc/source/cn/guide/tools/plugin.md
new file mode 100644
index 0000000..467b890
--- /dev/null
+++ b/doc/source/cn/guide/tools/plugin.md
@@ -0,0 +1,70 @@
+# Weex语法支持插件
+
+[Weex Language Support](https://plugins.jetbrains.com/plugin/9189-weex-language-support) 插件是官方提供的一个工具，你可以使用它在IntelliJ IDEA，WebStorm等一系列IDE上对Weex DSL进行语法高亮，自动补全和错误检查等操作。
+
+### 支持的IDE
+你可以在任何操作系统上的下列IDE上安装和使用Weex Language Support插件：
+**IntelliJ IDEA Ultimate, PhpStorm, WebStorm, PyCharm, RubyMine, AppCode, CLion, Gogland, Rider**
+
+### 安装
+在IDE的插件仓库中搜索`Weex Language Support`来安装该插件，安装完毕后重启IDE即可激活插件相关功能
+
+
+### 配置
+打开`Preferences -> Other Settings -> Weex language support`可配置插件的相关功能
+
+- Target Weex Version: 配置插件以哪一个版本的语法规则来对DSL进行提示及检查，默认值`LATEST`表示总是应用最行新版本weex的语法规则
+- Vue Support: 配置插件是否支持Weex 2.0版本的DSL(.vue文件)，开启后重启生效（注意：如果IDE内有其他支持Vue语法的插件，则需要关闭相应的插件后Weex插件才能生效）
+- Custom Rules: 引入自定义的Weex DSL规则，如果你在native中定义了自己的Module或Component，可通过自定义规则引入插件中来提供相应的提示和补全支持，自定义规则的格式将在后文列出
+- Global Weex Components: 默认地，插件会解析当前工程及npm root路径下的`node_modules`目录，解析其中包含的Weex Components并对其提供补全支持。如果你的项目中引用了这两个路径以外的Components，可以在此处将其添加到搜索路径中，插件将会将其中的Components载入，并在编写DSL时为相应的标签提供补全支持
+
+### 自定义规则格式
+自定义规则包含在一个json文件中，json文件的根节点为数组类型，数组中的每一个元素对应DSL中的一个标签。
+我们以`<loading>`标签的规则来举例：
+```js
+{
+ "tag": "loading", //标签名，不可为空
+ "attrs": [ //标签属性列表，可为空
+ {
+ "name": "display", //属性名，不可为空
+ "valuePattern": null, //属性值的正则表达式，用于检测值是否合法，可为空
+ "valueEnum": [ //属性值枚举，可为空
+ "show",
+ "hide"
+ ],
+ "valueType": "var", //属性值类型，必须是var或function，决定该从数据列表还是函数列表中查找属性值补全的候选值，不可为空
+ "since": 0, //该属性何时被添加到sdk中，例如0.11，默认为0
+ "weexOnly": false //该属性是否仅在1.0语法中可用，默认为false
+ }
+ ],
+ "events": [ //事件列表。可为空
+ {
+ "name": "loading", //事件名称，不可为空
+ "since": 0 //该事件何时被添加到sdk中
+ }
+ ],
+ "parents": [ //该标签允许被作为哪些标签的子元素，空表示可以作为任意元素的子元素
+ "list",
+ "scroller"
+ ],
+ "childes": [ //该标签允许哪些元素作为自己的子元素，空表示任意元素都可作为子元素
+ "text",
+ "image",
+ "loading-indicator"
+ ],
+ "document": "/references/components/loading.html" //文档地址，配置该属性之后可在编辑界面中对应的标签上直接打开文档
+ }
+```
+
+### 使用
+插件的绝大部分功能被集成到编辑器上下文中，会随用户输入在需要补全，提示或Lint时被触发，无需特殊干预。下列功能需要用户手动触发：
+#### 文档搜索
+打开IDE右侧工具栏的`Weex Documents`即可对文档进行搜索，搜索结果与官网保持同步，勾选 `EN` 可切换搜索结果为英文内容
+
+
+#### 打开标签对应的文档
+将光标定位到标签上，并通过`Show Intention Actions`操作（OSX上默认键为 option + enter，可通过Keymap查看）打开Intenion菜单，选择`Open Document`可打开标签对应的文档
+
+
+### 参与插件建设
+请将Issues及Pull Requests提交到[weex-language-support](https://github.com/misakuo/weex-language-support)项目中
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/source/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/index.md b/doc/source/guide/tools/index.md
index 83ce4dc..74f8373 100644
--- a/doc/source/guide/tools/index.md
+++ b/doc/source/guide/tools/index.md
@@ -8,3 +8,4 @@ version: 2.1
# Tools
- [weex-toolkit](./toolkit.html)
+- [IDEA / WebStorm Plugin](./plugin.md)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/source/guide/tools/plugin.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/plugin.md b/doc/source/guide/tools/plugin.md
new file mode 100644
index 0000000..8ca1731
--- /dev/null
+++ b/doc/source/guide/tools/plugin.md
@@ -0,0 +1,61 @@
+# Weex Language Support Plugin
+
+[Weex Language Support](https://plugins.jetbrains.com/plugin/9189-weex-language-support) is a official tools to code highlight, automatic completion，lint and other functions in IDEA, WebStorm or the others IDEs.
+
+### Supported IDEs
+You can install and use this plugin on the following IDEs on any operating system:
+**IntelliJ IDEA Ultimate, PhpStorm, WebStorm, PyCharm, RubyMine, AppCode, CLion, Gogland, Rider**
+
+### Install
+Just searching the `Weex Language Support` in plugin repo to install, next you need restart IDE to enable it.
+
+
+### Configurations
+Open `Preferences -> Other Settings -> Weex language support` to configuration plugin
+
+- Target Weex Version: Config the version of Weex that your current project in use, default is `LATEST`, it means always using the latest version
+- Vue Support: Config whether to support Vue, you need to restart IDE after turning on or off the set to take effect
+- Custom Rules: Import the custom Weex DSL rules, The format of the custom rules will be listed later
+- Global Weex Components: Sets the location of the module that is applied in the project, in particular, the `node_modules` directory in current project and npm root will be automatically included, you do not need to add them here
+
+
+### Format of Custom DSL Rules
+Custom rules are included in a json file, the root node of the json file is an array, each element in the array corresponds to a label in the DSL.
+Let's take the example of the `loading>` tag:
+```js
+{
+ "tag": "loading", //tag name, not null
+ "attrs": [ //attributes of tag, can be null
+ {
+ "name": "display", //attribute name, not null
+ "valuePattern": null, //pattern expression to check the attribute value, can be null
+ "valueEnum": [ //attribute value enumeration, can be null
+ "show",
+ "hide"
+ ],
+ "valueType": "var", //type of attribute value, must be var or function
+ "since": 0, //which version the attribute is added to sdk, such as 0.11
+ "weexOnly": false //whether the attribute is available only in 1.0 syntax, default is false
+ }
+ ],
+ "events": [ //events list, can be null
+ {
+ "name": "loading", //event name, not null
+ "since": 0 //which version the event is added to sdk
+ }
+ ],
+ "parents": [ //The tag is allowed to be a child of which tags, null means no restrictions
+ "list",
+ "scroller"
+ ],
+ "childes": [ //which tags are allowed as their own child tags, null means no restrictions
+ "text",
+ "image",
+ "loading-indicator"
+ ],
+ "document": "/references/components/loading.html" //document link
+ }
+```
+
+### Contribution
+Please commiting Issues and Pull Requests into the [weex-language-support](https://github.com/misakuo/weex-language-support) project
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/themes/weex/layout/_partial/sidebar.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/sidebar.ejs b/doc/themes/weex/layout/_partial/sidebar.ejs
index 3074b4a..9a9e2cf 100644
--- a/doc/themes/weex/layout/_partial/sidebar.ejs
+++ b/doc/themes/weex/layout/_partial/sidebar.ejs
@@ -41,6 +41,9 @@
<li>
<a href="https://market.dotwe.org" target="_blank">Market</a>
</li>
+ <li>
+ <a href="<%= url_for_lang('guide/tools/plugin.html') %>">Weex WebStorm Plugin</a>
+ </li>
</ul>
</li>
<li>
[06/18] incubator-weex git commit: Merge branch 'doc-transition' of
https://github.com/doumafang/incubator-weex into dev
Posted by ac...@apache.org.
Merge branch 'doc-transition' of https://github.com/doumafang/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/28fe9489
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28fe9489
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28fe9489
Branch: refs/heads/0.16-dev
Commit: 28fe94890529decd0a3f09a9ee426eb8376c5b26
Parents: ee892fb 840f6f7
Author: tancy <ro...@gmail.com>
Authored: Tue Aug 22 15:13:28 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Aug 22 15:13:28 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 59 +++++++++++++++++++++-
doc/source/cn/references/modules/animation.md | 41 +++++++--------
doc/source/references/common-style.md | 57 +++++++++++++++++++++
doc/source/references/modules/animation.md | 46 ++++++++---------
4 files changed, 159 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[07/18] incubator-weex git commit: * [doc] fix transition table can
not show bug
Posted by ac...@apache.org.
* [doc] fix transition table can not show bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a4dacce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a4dacce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a4dacce
Branch: refs/heads/0.16-dev
Commit: 8a4dacce864634f882ad75f124041c9ab0eae114
Parents: 840f6f7
Author: doumafang <do...@gmail.com>
Authored: Tue Aug 22 16:41:42 2017 +0800
Committer: doumafang <do...@gmail.com>
Committed: Tue Aug 22 16:41:42 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 40 +++++++++++-----------
doc/source/cn/references/modules/animation.md | 40 +++++++++++-----------
doc/source/references/common-style.md | 40 +++++++++++-----------
doc/source/references/modules/animation.md | 30 ++++++++--------
4 files changed, 75 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4dacce/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 9092066..0d40e69 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -349,17 +349,17 @@ transform 属性向元素应用 2D 转换。该属性允许我们对元素进行
- ``transition-property``:允许过渡动画的属性名，设置不同样式transition效果的键值对，默认值为空，表示不执行任何transition，下表列出了所有合法的参数属性：
- | 参数名 | 描述 |
- | --------------- | ------------------------------ |
- | width | transition过渡执行的时候是否组件的宽度参与动画 |
- | height | transition过渡执行的时候是否组件的高度参与动画 |
- | top | transition过渡执行的时候是否组件的顶部距离参与动画 |
- | bottom | transition过渡执行的时候是否组件的底部距离参与动画 |
- | left | transition过渡执行的时候是否组件的左侧距离参与动画 |
- | right | transition过渡执行的时候是否组件的右侧距离参与动画 |
- | backgroundColor | transition过渡执行的时候是否组件的背景颜色参与动画 |
- | opacity | transition过渡执行的时候是否组件的不透明度参与动画 |
- | transform | transition过渡执行的时候是否组件的变换类型参与动画 |
+| 参数名 | 描述 |
+| --------------- | ------------------------------ |
+| width | transition过渡执行的时候是否组件的宽度参与动画 |
+| height | transition过渡执行的时候是否组件的高度参与动画 |
+| top | transition过渡执行的时候是否组件的顶部距离参与动画 |
+| bottom | transition过渡执行的时候是否组件的底部距离参与动画 |
+| left | transition过渡执行的时候是否组件的左侧距离参与动画 |
+| right | transition过渡执行的时候是否组件的右侧距离参与动画 |
+| backgroundColor | transition过渡执行的时候是否组件的背景颜色参与动画 |
+| opacity | transition过渡执行的时候是否组件的不透明度参与动画 |
+| transform | transition过渡执行的时候是否组件的变换类型参与动画 |
- ``transition-duration``:指定transition过渡的持续时间 (单位是毫秒)，默认值是 `0`，表示没有动画效果。
@@ -367,18 +367,18 @@ transform 属性向元素应用 2D 转换。该属性允许我们对元素进行
- ``transition-timing-function``:描述transition过渡执行的速度曲线，用于使transition过渡更为平滑。默认值是 `ease`。下表列出了所有合法的属性：
- | 属性名 | 描述 |
- | ------------------------------ | ---------------------------------------- |
- | ``ease`` | transition过渡逐渐变慢的过渡效果 |
- | `ease-in` | transition过渡慢速开始，然后变快的过渡效果 |
- | `ease-out` | transition过渡快速开始，然后变慢的过渡效果 |
- | `ease-in-out` | transition过渡慢速开始，然后变快，然后慢速结束的过渡效果 |
- | `linear` | transition过渡以匀速变化 |
- | `cubic-bezier(x1, y1, x2, y2)` | 使用三阶贝塞尔函数中自定义transition变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
+| 属性名 | 描述 |
+| ------------------------------ | ---------------------------------------- |
+| ease | transition过渡逐渐变慢的过渡效果 |
+| ease-in | transition过渡慢速开始，然后变快的过渡效果 |
+| ease-out | transition过渡快速开始，然后变慢的过渡效果 |
+| ease-in-out | transition过渡慢速开始，然后变快，然后慢速结束的过渡效果 |
+| linear | transition过渡以匀速变化 |
+| cubic-bezier(x1, y1, x2, y2) | 使用三阶贝塞尔函数中自定义transition变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
### 示例
-```
+```html
<style scoped>
.panel {
margin: 10px;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4dacce/doc/source/cn/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/animation.md b/doc/source/cn/references/modules/animation.md
index 882a455..f50bea3 100644
--- a/doc/source/cn/references/modules/animation.md
+++ b/doc/source/cn/references/modules/animation.md
@@ -21,32 +21,32 @@ version: 2.1
* `options.delay {number}`：指定请求动画操作到执行动画之间的时间间隔 (单位是毫秒)，默认值是 `0`，表示没有延迟，在请求后立即执行动画。
* `options.timingFunction {string}`：描述动画执行的速度曲线，用于使动画变化更为平滑。默认值是 `linear`，表示动画从开始到结束都拥有同样的速度。下表列出了所有合法的属性：
-| 属性名 | 描述 | 示例 |
-| ------------------------------ | ---------------------------------------- | ---- |
-| `linear` | 动画从头到尾的速度是相同的 | |
-| `ease-in` | 动画速度由慢到快 | |
-| `ease-out` | 动画速度由快到慢 | |
-| `ease-in-out` | 动画先加速到达中间点后减速到达终点 | |
-| `cubic-bezier(x1, y1, x2, y2)` | 在三次贝塞尔函数中定义变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). | |
+| 属性名 | 描述 |
+| ------------------------------ | ---------------------------------------- |
+| `linear` | 动画从头到尾的速度是相同的 |
+| `ease-in` | 动画速度由慢到快 |
+| `ease-out` | 动画速度由快到慢 |
+| `ease-in-out` | 动画先加速到达中间点后减速到达终点 |
+| `cubic-bezier(x1, y1, x2, y2)` | 在三次贝塞尔函数中定义变化过程，函数的参数值必须处于 0 到 1 之间。更多关于三次贝塞尔的信息请参阅 [cubic-bezier](http://cubic-bezier.com/) 和 [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
* `options.styles {Object}`：设置不同样式过渡效果的键值对，下表列出了所有合法的参数：
-| 参数名 | 描述 | 值类型 | 默认值 | 示例 |
-| --------------- | ---------------------------------------- | --------------- | --------------- | ---- |
-| width | 动画执行后应用到组件上的宽度值 | length | 无 | |
-| height | 动画执行后应用到组件上的高度值 | length | 无 | |
-| backgroundColor | 动画执行后应用到组件上的背景颜色 | string | none | |
-| opacity | 动画执行后应用到组件上的不透明度值 | 介于 0 到 1 间的数值 | `1` | |
-| transformOrigin | 定义变化过程的中心点. 参数 `x-aris` 可能的值为 `left`、`center`、`right`、长度值或百分比值, 参数 `y-axis` 可能的值为 `top`、`center`、`bottom`、长度值或百分比值 | `x-axis y-axis` | `center center` | |
-| transform | 定义应用在元素上的变换类型，支持下表列出的属性 | object | 无 | |
+| 参数名 | 描述 | 值类型 | 默认值 |
+| --------------- | ---------------------------------------- | --------------- | --------------- |
+| width | 动画执行后应用到组件上的宽度值 | length | 无 |
+| height | 动画执行后应用到组件上的高度值 | length | 无 |
+| backgroundColor | 动画执行后应用到组件上的背景颜色 | string | none |
+| opacity | 动画执行后应用到组件上的不透明度值 | 介于 0 到 1 间的数值 | `1` |
+| transformOrigin | 定义变化过程的中心点. 参数 `x-aris` 可能的值为 `left`、`center`、`right`、长度值或百分比值, 参数 `y-axis` 可能的值为 `top`、`center`、`bottom`、长度值或百分比值 | `x-axis y-axis` | `center center` |
+| transform | 定义应用在元素上的变换类型，支持下表列出的属性 | object | 无 |
`transform`属性的合法值:
-| 名称 | 描述 | 值类型 | 默认值 | 示例 |
-| ------------------------------------- | ---------------- | ------- | ---- | ---- |
-| `translate`/`translateX`/`translateY` | 指定元素要移动到的位置 | 像素值或百分比 | 无 | |
-| `rotate` | 指定元素将被旋转的角度，单位是度 | number | 无 | |
-| `scale`/`scaleX`/`scaleY` | 按比例放大或缩小元素 | number | 无 | |
+| 名称 | 描述 | 值类型 | 默认值 |
+| ------------------------------------- | ---------------- | ------- | ---- |
+| `translate`/`translateX`/`translateY` | 指定元素要移动到的位置 | 像素值或百分比 | 无 |
+| `rotate` | 指定元素将被旋转的角度，单位是度 | number | 无 |
+| `scale`/`scaleX`/`scaleY` | 按比例放大或缩小元素 | number | 无 |
* `callback {Function}`：动画执行完毕之后的回调
* `needLayout（boolean）`：节点动画执行时是否产生布局动画即LayoutAnimation
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4dacce/doc/source/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/references/common-style.md b/doc/source/references/common-style.md
index 3556fb6..c0bd084 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -236,17 +236,17 @@ Now you can use the transition attribute in CSS to enhance the interactivity and
- ``transition-property``:Allows the name of the transitional animation to set the value of the different styles transition effect, the default value is empty, that does not perform any transition, the following table lists all the legitimate parameters of the property:
- | Property | Description |
- | --------------- | ---------------------------------------- |
- | width | The transition is performed when the width of the component is involved in the animation |
- | height | The transition is performed when the height of the component is involved in the animation |
- | top | The transition is performed when the top of the component is involved in the animation |
- | bottom | The transition is performed when the bottom of the component is involved in the animation |
- | left | The transition is performed when the left of the component is involved in the animation |
- | right | The transition is performed when the right of the component is involved in the animation |
- | backgroundColor | The transition is performed when the backgroundColor of the component is involved in the animation |
- | opacity | The transition is performed when the opacity of the component is involved in the animation |
- | transform | The transition is performed when the transform of the component is involved in the animation |
+| Property | Description |
+| --------------- | ---------------------------------------- |
+| width | The transition is performed when the width of the component is involved in the animation |
+| height | The transition is performed when the height of the component is involved in the animation |
+| top | The transition is performed when the top of the component is involved in the animation |
+| bottom | The transition is performed when the bottom of the component is involved in the animation |
+| left | The transition is performed when the left of the component is involved in the animation |
+| right | The transition is performed when the right of the component is involved in the animation |
+| backgroundColor | The transition is performed when the backgroundColor of the component is involved in the animation |
+| opacity | The transition is performed when the opacity of the component is involved in the animation |
+| transform | The transition is performed when the transform of the component is involved in the animation |
- ``transition-duration``:Specifies the duration of the transition transition (in milliseconds). The default value is 0, indicating that there is no animation.
@@ -254,18 +254,18 @@ Now you can use the transition attribute in CSS to enhance the interactivity and
- ``transition-timing-function``:Describes the velocity curve of the transition transition, which is used to make the transition transition smoother. The default is ease. The following table lists all the valid attributes:
- | Property | Description |
- | ------------------------------ | ---------------------------------------- |
- | ``ease`` | The transition gradually slow down the transition effect |
-| `ease-in` | The transition starts slowly and then becomes faster for the transition effect |
-| `ease-out` | The transition starts quickly and then slows the transition effect |
-| `ease-in-out` | The transition starts slowly, then goes fast and then slowly ends the transition effect |
-| `linear` | The transition changes at constant speed |
-| `cubic-bezier(x1, y1, x2, y2)` | Using the custom transition in the third-order Bessel function, the parameter values of the function must be between 0 and 1. For more information on three times Bessel, see [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
+| Property | Description |
+| ------------------------------ | ---------------------------------------- |
+| ease | The transition gradually slow down the transition effect |
+| ease-in | The transition starts slowly and then becomes faster for the transition effect |
+| ease-out | The transition starts quickly and then slows the transition effect |
+| ease-in-out | The transition starts slowly, then goes fast and then slowly ends the transition effect |
+| linear | The transition changes at constant speed |
+| cubic-bezier(x1, y1, x2, y2) | Using the custom transition in the third-order Bessel function, the parameter values of the function must be between 0 and 1. For more information on three times Bessel, see [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
### Example
-```
+```html
<style scoped>
.panel {
margin: 10px;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4dacce/doc/source/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/animation.md b/doc/source/references/modules/animation.md
index 539191f..6ea5cbd 100644
--- a/doc/source/references/modules/animation.md
+++ b/doc/source/references/modules/animation.md
@@ -28,24 +28,24 @@ Smooth and meaningful animation is very effective for enhancing the user experie
- `delay` (number): Specifies the amount of milliseconds to wait between a change being requested to a property that is to be transitioned and the start of the transition effect. The default value is `0`.
- `timingFunction` (string): Used to describe how the intermediate values of the styles being affected by a transition effect are calculated, default value is `linear`, the allowed attributes are listed in the following table:
-| name | description | example |
-| :----------------------------- | :--------------------------------------- | :------ |
-| `linear` | Specifies a transition effect with the same speed from start to end | |
-| `ease-in` | Specifies a transition effect with a slow start | |
-| `ease-out` | Specifies a transition effect with a slow end | |
-| `ease-in-out` | Specifies a transition effect with a slow start and end | |
-| `cubic-bezier(x1, y1, x2, y2)` | Define your own values in the cubic-bezier function. Possible values are parameter values from 0 to 1. More information about cubic-bezier please visit [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). | |
+| name | description |
+| :----------------------------- | :--------------------------------------- |
+| `linear` | Specifies a transition effect with the same speed from start to end |
+| `ease-in` | Specifies a transition effect with a slow start |
+| `ease-out` | Specifies a transition effect with a slow end |
+| `ease-in-out` | Specifies a transition effect with a slow start and end |
+| `cubic-bezier(x1, y1, x2, y2)` | Define your own values in the cubic-bezier function. Possible values are parameter values from 0 to 1. More information about cubic-bezier please visit [cubic-bezier](http://cubic-bezier.com/) and [Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve). |
- `styles` (object): Specify the names and values of styles to which a transition effect should be applied. The allowed attributes are listed in the following table:
-| name | description | value type | default value | example |
-| :-------------- | :--------------------------------------- | :-------------------- | :-------------- | :------ |
-| width | The width applied to the component after the animation finished. | length | none | |
-| height | The height applied to the component after the animation finished. | length | none | |
-| backgroundColor | The background color applied to the component after the animation finished. | string | none | |
-| opacity | The opacity applied to the component after the animation finished. | number between 0 to 1 | `1` | |
-| transformOrigin | The povit of transition. The possible values for `x-aris` are `left`/`center`/`right`/length or percent, and possible values of `y-axis` are `top`/`center`/`bottom`/ length or percent | `x-axis y-axis` | `center center` | |
-| transform | Transform function to be applied to the element. The properties in the following table are supported | object | none | |
+| name | description | value type | default value |
+| :-------------- | :--------------------------------------- | :-------------------- | :-------------- |
+| width | The width applied to the component after the animation finished. | length | none |
+| height | The height applied to the component after the animation finished. | length | none |
+| backgroundColor | The background color applied to the component after the animation finished. | string | none |
+| opacity | The opacity applied to the component after the animation finished. | number between 0 to 1 | `1` |
+| transformOrigin | The povit of transition. The possible values for `x-aris` are `left`/`center`/`right`/length or percent, and possible values of `y-axis` are `top`/`center`/`bottom`/ length or percent | `x-axis y-axis` | `center center` |
+| transform | Transform function to be applied to the element. The properties in the following table are supported | object | none |
properties of `transform`:
[11/18] incubator-weex git commit: Fix typo in involved
Posted by ac...@apache.org.
Fix typo in involved
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9eda7b7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9eda7b7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9eda7b7e
Branch: refs/heads/0.16-dev
Commit: 9eda7b7e454faf10f541bd3877e8dcd80345cc03
Parents: a7f8c31
Author: Adam Altman <ad...@rebilly.com>
Authored: Wed Aug 23 13:33:26 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Wed Aug 23 13:33:26 2017 -0500
----------------------------------------------------------------------
doc/themes/weex/languages/en.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9eda7b7e/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index 12cec69..f0e5270 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -90,7 +90,7 @@ menu:
download: Download
resources: Resources
tools: Tools
- invovled: Get Invovled
+ invovled: Get Involved
advanced: Advanced
github: GitHub
legacy: Old Syntax Doc