to amend

Damian Dulisz · Damian Dulisz · commit 52d40dc27232 · 2016-09-18T19:33:47.000+02:00
diff --git a/docs/App.vue b/docs/App.vue
@@ -13,13 +13,15 @@ section.start
       .grid__column.grid__unit--md-6
         .multiselect-example__container
           multiselect(
-            :options="options",
-            :selected="selected",
-            :multiple="multiple",
+            :options="source",
+            :selected="value",
+            :multiple="true",
             :searchable="searchable",
             :show-labels="true",
             :limit="3",
             :taggable="true",
+            label="name",
+            track-by="name",
             @tag="onTagging"
             @update="afterChange",
             placeholder="Select option",
@@ -83,7 +85,7 @@ export default {
         { name: 'Laravel', language: 'PHP' },
         { name: 'Phoenix', language: 'Elixir' }
       ],
-      value: { name: 'Vue.js', language: 'Javascript' },
+      value: [{ name: 'Vue.js', language: 'Javascript' }],
       valuePrimitive: 'showLabels',
       multiValue: [{ name: 'Vue.js', language: 'Javascript' }],
       multiple: true,
@@ -131,7 +133,7 @@ export default {
       this.selectedCountries = newVal
     },
     afterChange (selectValue) {
-      this.selected = selectValue
+      this.value = selectValue
     },
     onTagging (newTag) {
       this.options.push(newTag)
diff --git a/lib/multiselectMixin.js b/lib/multiselectMixin.js
@@ -47,7 +47,7 @@ module.exports = {
      * @default 'id'
      * @type {String}
      */
-    key: {
+    trackBy: {
       type: String
     },
     /**
@@ -196,10 +196,10 @@ module.exports = {
       return options
     },
     valueKeys () {
-      if (this.key) {
+      if (this.trackBy) {
         return this.multiple
-          ? this.value.map(element => element[this.key])
-          : this.value[this.key]
+          ? this.value.map(element => element[this.trackBy])
+          : this.value[this.trackBy]
       } else {
         return this.value
       }
@@ -253,8 +253,8 @@ module.exports = {
     isSelected (option) {
       /* istanbul ignore else */
       if (!this.value) return false
-      const opt = this.key
-        ? option[this.key]
+      const opt = this.trackBy
+        ? option[this.trackBy]
         : option
 
       if (this.multiple) {
@@ -345,7 +345,7 @@ module.exports = {
       if (!this.allowEmpty && this.value.length <= 1) return
 
       if (this.multiple && typeof option === 'object') {
-        const index = this.valueKeys.indexOf(option[this.key])
+        const index = this.valueKeys.indexOf(option[this.trackBy])
         this.value.splice(index, 1)
       } else {
         const index = this.valueKeys.indexOf(option)
diff --git a/lib/vue-multiselect.min.js b/lib/vue-multiselect.min.js
diff --git a/lib/vue-multiselect.min.js.map b/lib/vue-multiselect.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-multiselect",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "description": "Multiselect component for vue.js",
   "author": "Damian Dulisz <damian.dulisz@monterail.com>",
   "private": false,
diff --git a/src/multiselectMixin.js b/src/multiselectMixin.js
@@ -47,7 +47,7 @@ module.exports = {
      * @default 'id'
      * @type {String}
      */
-    key: {
+    trackBy: {
       type: String
     },
     /**
@@ -196,10 +196,10 @@ module.exports = {
       return options
     },
     valueKeys () {
-      if (this.key) {
+      if (this.trackBy) {
         return this.multiple
-          ? this.value.map(element => element[this.key])
-          : this.value[this.key]
+          ? this.value.map(element => element[this.trackBy])
+          : this.value[this.trackBy]
       } else {
         return this.value
       }
@@ -253,8 +253,8 @@ module.exports = {
     isSelected (option) {
       /* istanbul ignore else */
       if (!this.value) return false
-      const opt = this.key
-        ? option[this.key]
+      const opt = this.trackBy
+        ? option[this.trackBy]
         : option
 
       if (this.multiple) {
@@ -345,7 +345,7 @@ module.exports = {
       if (!this.allowEmpty && this.value.length <= 1) return
 
       if (this.multiple && typeof option === 'object') {
-        const index = this.valueKeys.indexOf(option[this.key])
+        const index = this.valueKeys.indexOf(option[this.trackBy])
         this.value.splice(index, 1)
       } else {
         const index = this.valueKeys.indexOf(option)
diff --git a/test/unit/specs/Multiselect.spec.js b/test/unit/specs/Multiselect.spec.js
@@ -1296,7 +1296,7 @@ describe('Multiselect.vue', () => {
             }
           })
         },
-        template: '<multiselect :selected="value" :options="source" label="id" key="id" @search-change="afterSearch" :clear-on-select="false"></multiselect>',
+        template: '<multiselect :selected="value" :options="source" label="id" track-by="id" @search-change="afterSearch" :clear-on-select="false"></multiselect>',
         components: { Multiselect },
         data: {
           value: null,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-multiselect",`
`3`		`- "version": "2.0.0-beta.2",`
	`3`	`+ "version": "2.0.0-beta.3",`
`4`	`4`	`"description": "Multiselect component for vue.js",`
`5`	`5`	`"author": "Damian Dulisz <damian.dulisz@monterail.com>",`
`6`	`6`	`"private": false,`
Original file line number	Diff line number	Diff line change
`@@ -1296,7 +1296,7 @@ describe('Multiselect.vue', () => {`
`1296`	`1296`	`}`
`1297`	`1297`	`})`
`1298`	`1298`	`},`
`1299`		`- template: '<multiselect :selected="value" :options="source" label="id" key="id" @search-change="afterSearch" :clear-on-select="false"></multiselect>',`
	`1299`	`+ template: '<multiselect :selected="value" :options="source" label="id" track-by="id" @search-change="afterSearch" :clear-on-select="false"></multiselect>',`
`1300`	`1300`	`components: { Multiselect },`
`1301`	`1301`	`data: {`
`1302`	`1302`	`value: null,`