* [html5] fix indicator & slider when there's no children.

apache · Jun 15, 2017 · 569d333 · 569d333
1 parent f6fe550
commit 569d333
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/html5/render/vue/components/slider/indicator.js b/html5/render/vue/components/slider/indicator.js
@@ -58,9 +58,6 @@ function getIndicatorItemStyle (spec, isActive) {
 function _render (context, h) {
   const children = []
   const mergedStyle = extractComponentStyle(context)
-  // const mergedStyle = context._getComponentStyle(context.$vnode.data)
-  // context.$vnode.data.cached = {}
-  // extendKeys(context.$vnode.data.cached, mergedStyle, ['width', 'height'])
   const indicatorSpecStyle = extendKeys(
       {},
       mergedStyle,
@@ -173,14 +170,11 @@ export default {
       active: 0
     }
   },
-  // props: {
-  //   count: [Number, String],
-  //   active: [Number, String]
-  // },
   render (createElement) {
     const { count, active } = this.$vnode.data.attrs || {}
     this.count = count
     this.active = active
+    if (!this.count) { return }
     this._renderHook()
     return _render(this, createElement)
   },

diff --git a/html5/render/vue/components/slider/slideMixin.js b/html5/render/vue/components/slider/slideMixin.js
@@ -52,10 +52,13 @@ export default {
     const children = this.$children
     const len = children && children.length
     if (children && len > 0) {
-      const indicator = children[len - 1]
-      if (indicator.$options._componentTag === 'indicator'
-        || indicator.$vnode.data.ref === 'indicator') {
-        indicator._watcher.get()
+      for (let i = 0; i < len; i++) {
+        const vm = children[i]
+        if (vm.$options._componentTag === 'indicator'
+          || vm.$vnode.data.ref === 'indicator') {
+          vm._watcher.get()
+          break
+        }
       }
     }
     fireLazyload(this.$el, true)