You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/04/24 03:51:03 UTC
[29/50] [abbrv] incubator-weex git commit: * [html5] fix transition
defaults.
* [html5] fix transition defaults.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb79187c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb79187c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb79187c
Branch: refs/heads/0.12-dev
Commit: eb79187ced7ecf314900bb9f11e6c1a9dc17cb2f
Parents: 7932b23
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Apr 17 11:13:11 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Apr 17 11:13:11 2017 +0800
----------------------------------------------------------------------
html5/render/vue/modules/animation.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb79187c/html5/render/vue/modules/animation.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/modules/animation.js b/html5/render/vue/modules/animation.js
index 9efc4ba..a294896 100644
--- a/html5/render/vue/modules/animation.js
+++ b/html5/render/vue/modules/animation.js
@@ -19,8 +19,8 @@
import { nextFrame, toCSSText, autoPrefix, camelizeKeys, normalizeStyle } from '../utils'
function transitionOnce (vnode, config, callback) {
- const duration = config.duration || 1000 // ms
- const timing = config.timingFunction || 'ease'
+ const duration = config.duration || 0 // ms
+ const timing = config.timingFunction || 'linear'
const delay = config.delay || 0 // ms
// TODO: parse transition properties