Merge branch 'master' into pr/423

# Conflicts:
#	docs/gitbook/Basics/Options.md

src/components/Select.vue

@@ -313,9 +313,9 @@
     <div ref="toggle" @mousedown.prevent="toggleDropdown" :class="['dropdown-toggle', 'clearfix']">
 
       <slot v-for="option in valueAsArray" name="selected-option-container"
-            :option="option" :deselect="deselect" :multiple="multiple" :disabled="disabled">
+            :option="(typeof option === 'object')?option:{[label]: option}" :deselect="deselect" :multiple="multiple" :disabled="disabled">
         <span class="selected-tag" v-bind:key="option.index">
-          <slot name="selected-option" v-bind="option">
+          <slot name="selected-option" v-bind="(typeof option === 'object')?option:{[label]: option}">
             {{ getOptionLabel(option) }}
           </slot>
           <button v-if="multiple" :disabled="disabled" @click="deselect(option)" type="button" class="close" aria-label="Remove option">
@@ -336,7 +336,7 @@
               @focus="onSearchFocus"
               type="search"
               class="form-control"
-              autocomplete="false"
+              autocomplete="off"
               :disabled="disabled"
               :placeholder="searchPlaceholder"
               :tabindex="tabindex"
@@ -368,7 +368,7 @@
       <ul ref="dropdownMenu" v-if="dropdownOpen" class="dropdown-menu" :style="{ 'max-height': maxHeight }">
         <li v-for="(option, index) in filteredOptions" v-bind:key="index" :class="{ active: isOptionSelected(option), highlight: index === typeAheadPointer }" @mouseover="typeAheadPointer = index">
           <a @mousedown.prevent="select(option)">
-          <slot name="option" v-bind="option">
+          <slot name="option" v-bind="(typeof option === 'object')?option:{[label]: option}">
             {{ getOptionLabel(option) }}
           </slot>
           </a>
@@ -788,9 +788,7 @@
        * @return {void}
        */
       select(option) {
-        if (this.isOptionSelected(option)) {
-          this.deselect(option)
-        } else {
+        if (!this.isOptionSelected(option)) {
           if (this.taggable && !this.optionExists(option)) {
             option = this.createOption(option)
           }
@@ -833,9 +831,9 @@
        * Clears the currently selected value(s)
        * @return {void}
        */
-       clearSelection() {
-         this.mutableValue = this.multiple ? [] : null
-       },
+      clearSelection() {
+        this.mutableValue = this.multiple ? [] : null
+      },
 
       /**
        * Called from this.select after each selection.

src/dev.js

@@ -1,53 +0,0 @@
-import Vue from 'vue'
-import Fuse from 'fuse.js'
-import debounce from 'lodash/debounce'
-import resource from 'vue-resource'
-import vSelect from './components/Select.vue'
-import countries from 'docs/data/advanced.js'
-import fuseSearchOptions from './fuseSearchOptions'
-
-Vue.use(resource)
-
-Vue.component('v-select', vSelect)
-
-Vue.config.devtools = true
-
-/* eslint-disable no-new */
-new Vue({
-  el: '#app',
-  data: {
-    placeholder: "placeholder",
-    value: null,
-    options: countries,
-    ajaxRes: [],
-    people: [],
-    fuseSearchOptions
-  },
-  methods: {
-    search(search, loading) {
-      loading(true);
-      this.getRepositories(search, loading, this)
-    },
-    searchPeople(search, loading) {
-      loading(true)
-      this.getPeople(loading, this)
-    },
-    getPeople: debounce((loading, vm) => {
-      vm.$http.get(`https://reqres.in/api/users?per_page=10`).then(res => {
-        vm.people = res.data.data
-        loading(false)
-      })
-    }, 250),
-    getRepositories: debounce((search, loading, vm) => {
-      vm.$http.get(`https://api.github.com/search/repositories?q=${search}`).then(res => {
-        vm.ajaxRes = res.data.items;
-        loading(false)
-      })
-    }, 250),
-    fuseSearch(options, search) {
-      return new Fuse(options, {
-        keys: ['title', 'author.firstName', 'author.lastName'],
-      }).search(search);
-    }
-  }
-});

src/fuseSearchOptions.js

@@ -1,163 +0,0 @@
-export default [
-  {
-    title: "Old Man's War",
-    author: {
-      firstName: "John",
-      lastName: "Scalzi"
-    }
-  },
-  {
-    title: "The Lock Artist",
-    author: {
-      firstName: "Steve",
-      lastName: "Hamilton"
-    }
-  },
-  {
-    title: "HTML5",
-    author: {
-      firstName: "Remy",
-      lastName: "Sharp"
-    }
-  },
-  {
-    title: "Right Ho Jeeves",
-    author: {
-      firstName: "P.D",
-      lastName: "Woodhouse"
-    }
-  },
-  {
-    title: "The Code of the Wooster",
-    author: {
-      firstName: "P.D",
-      lastName: "Woodhouse"
-    }
-  },
-  {
-    title: "Thank You Jeeves",
-    author: {
-      firstName: "P.D",
-      lastName: "Woodhouse"
-    }
-  },
-  {
-    title: "The DaVinci Code",
-    author: {
-      firstName: "Dan",
-      lastName: "Brown"
-    }
-  },
-  {
-    title: "Angels & Demons",
-    author: {
-      firstName: "Dan",
-      lastName: "Brown"
-    }
-  },
-  {
-    title: "The Silmarillion",
-    author: {
-      firstName: "J.R.R",
-      lastName: "Tolkien"
-    }
-  },
-  {
-    title: "Syrup",
-    author: {
-      firstName: "Max",
-      lastName: "Barry"
-    }
-  },
-  {
-    title: "The Lost Symbol",
-    author: {
-      firstName: "Dan",
-      lastName: "Brown"
-    }
-  },
-  {
-    title: "The Book of Lies",
-    author: {
-      firstName: "Brad",
-      lastName: "Meltzer"
-    }
-  },
-  {
-    title: "Lamb",
-    author: {
-      firstName: "Christopher",
-      lastName: "Moore"
-    }
-  },
-  {
-    title: "Fool",
-    author: {
-      firstName: "Christopher",
-      lastName: "Moore"
-    }
-  },
-  {
-    title: "Incompetence",
-    author: {
-      firstName: "Rob",
-      lastName: "Grant"
-    }
-  },
-  {
-    title: "Fat",
-    author: {
-      firstName: "Rob",
-      lastName: "Grant"
-    }
-  },
-  {
-    title: "Colony",
-    author: {
-      firstName: "Rob",
-      lastName: "Grant"
-    }
-  },
-  {
-    title: "Backwards, Red Dwarf",
-    author: {
-      firstName: "Rob",
-      lastName: "Grant"
-    }
-  },
-  {
-    title: "The Grand Design",
-    author: {
-      firstName: "Stephen",
-      lastName: "Hawking"
-    }
-  },
-  {
-    title: "The Book of Samson",
-    author: {
-      firstName: "David",
-      lastName: "Maine"
-    }
-  },
-  {
-    title: "The Preservationist",
-    author: {
-      firstName: "David",
-      lastName: "Maine"
-    }
-  },
-  {
-    title: "Fallen",
-    author: {
-      firstName: "David",
-      lastName: "Maine"
-    }
-  },
-  {
-    title: "Monster 1959",
-    author: {
-      firstName: "David",
-      lastName: "Maine"
-    }
-  }
-]