You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/22 05:27:50 UTC
[45/50] [abbrv] incubator-weex git commit: * [html5] update
* [html5] update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/76ab14b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/76ab14b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/76ab14b9
Branch: refs/heads/dev
Commit: 76ab14b92b94f76f1b27812cbb01647da967ab1d
Parents: 40a6f13
Author: MrRaindrop <te...@gmail.com>
Authored: Wed Jun 21 17:44:23 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Wed Jun 21 17:44:23 2017 +0800
----------------------------------------------------------------------
html5/render/vue/components/scrollable/loading-indicator.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/76ab14b9/html5/render/vue/components/scrollable/loading-indicator.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/components/scrollable/loading-indicator.js b/html5/render/vue/components/scrollable/loading-indicator.js
index d2746a5..37129fd 100644
--- a/html5/render/vue/components/scrollable/loading-indicator.js
+++ b/html5/render/vue/components/scrollable/loading-indicator.js
@@ -181,10 +181,10 @@ function processStyle (vm) {
const style = extractComponentStyle(vm)
const color = style.color
const rgb = color && getRgb(color)
- if (!rgb) {
- return
+ if (rgb) {
+ setKeyframeColor(vm, rgb)
}
- setKeyframeColor(vm, rgb)
+ return style
}
export default {