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/05/25 02:46:11 UTC

[29/50] incubator-weex git commit: * [html5] release v0.11.29 & fix slider index.

* [html5] release v0.11.29 & fix slider index.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0eb40607
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0eb40607
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0eb40607

Branch: refs/heads/0.13-dev
Commit: 0eb406074383bd5c77a37bad00051085cbd6bfb9
Parents: 56b455a
Author: MrRaindrop <te...@gmail.com>
Authored: Mon May 15 16:43:27 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon May 15 16:43:27 2017 +0800

----------------------------------------------------------------------
 html5/render/vue/components/slider/index.js      | 14 +++++++++++---
 html5/render/vue/components/slider/slideMixin.js | 15 +++++++++------
 package.json                                     |  2 +-
 packages/weex-vue-render/package.json            |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0eb40607/html5/render/vue/components/slider/index.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/components/slider/index.js b/html5/render/vue/components/slider/index.js
index 3c3360f..ce74db0 100644
--- a/html5/render/vue/components/slider/index.js
+++ b/html5/render/vue/components/slider/index.js
@@ -51,6 +51,10 @@ const _css = `
 export default {
   mixins: [slideMixin],
   props: {
+    index: {
+      type: [String, Number],
+      default: 0
+    },
     'auto-play': {
       type: [String, Boolean],
       default: false
@@ -63,13 +67,18 @@ export default {
       type: [String, Boolean],
       default: true
     }
+  },
 
+  watch: {
+    index () {
+      this.currentIndex = this.normalizeIndex(this.index)
+    }
   },
 
   data () {
     return {
-      currentIndex: 0,
-      frameCount: 0
+      frameCount: 0,
+      currentIndex: this.index
     }
   },
 
@@ -119,7 +128,6 @@ export default {
 
   created () {
     this.weexType = 'slider'
-    this.currentIndex = 0
     this.innerOffset = 0
     this._indicator = null
     this.$nextTick(() => {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0eb40607/html5/render/vue/components/slider/slideMixin.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/components/slider/slideMixin.js b/html5/render/vue/components/slider/slideMixin.js
index 154ed45..a11a519 100644
--- a/html5/render/vue/components/slider/slideMixin.js
+++ b/html5/render/vue/components/slider/slideMixin.js
@@ -64,13 +64,12 @@ export default {
       // nextFrame()
 
       if (newIndex !== this.currentIndex) {
-        this.currentIndex = newIndex
         // replace $el with { attr, style } is a legacy usage. Is it necessary to
         // do this ? Or just tell devers to use inline functions to access attrs ?
         this.$emit('change', createEvent(this.$el, 'change', {
           index: this.currentIndex
         }))
-        setTimeout(() => { this.reorder() }, TRANSITION_TIME)
+        setTimeout(() => { this.reorder(newIndex) }, TRANSITION_TIME)
       }
     },
     order () {
@@ -84,7 +83,10 @@ export default {
         // this.reorder()
       })
     },
-    reorder () {
+    reorder (newIndex) {
+      if (!newIndex && newIndex !== 0) {
+        newIndex = this.currentIndex
+      }
       // dir: 'current' | 'prev' | 'next'
       const setPosition = (elm, dir) => {
         const scale = window.weex.config.env.scale
@@ -144,11 +146,11 @@ export default {
           return
         }
         const lastPrev = this._prevElm
-        const prevIndex = this.normalizeIndex(this.currentIndex - 1)
-        const nextIndex = this.normalizeIndex(this.currentIndex + 1)
+        const prevIndex = this.normalizeIndex(newIndex - 1)
+        const nextIndex = this.normalizeIndex(newIndex + 1)
         let prevElm = this._prevElm = this._cells[prevIndex].elm
         const nextElm = this._cells[nextIndex].elm
-        const currentElm = this._cells[this.currentIndex].elm
+        const currentElm = this._cells[newIndex].elm
 
         // put current slide on the top.
         setPosition(currentElm, 'current')
@@ -168,6 +170,7 @@ export default {
 
         setPosition(prevElm, 'prev')
         setPosition(nextElm, 'next')
+        this.currentIndex = newIndex
       })
     },
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0eb40607/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 8132ed9..c5db963 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "subversion": {
     "browser": "0.5.0",
     "framework": "0.20.5",
-    "vue-render": "0.11.28",
+    "vue-render": "0.11.29",
     "transformer": ">=0.1.5 <0.5"
   },
   "description": "A framework for building Mobile cross-platform UI",

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0eb40607/packages/weex-vue-render/package.json
----------------------------------------------------------------------
diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json
index 85520a3..2c9d17b 100644
--- a/packages/weex-vue-render/package.json
+++ b/packages/weex-vue-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weex-vue-render",
-  "version": "0.11.28",
+  "version": "0.11.29",
   "description": "Weex built-in components for Vue 2.x.",
   "license": "Apache-2.0",
   "main": "dist/index.js",