merge master into theme-addition

karma.conf.js

@@ -14,7 +14,7 @@ module.exports = function (config) {
       plugin: [require('proxyquireify').plugin]
     },
     // if you want to continuously re-run tests on file-save,
-    // replace the following line with `autoWatch: true`
+    // use `autoWatch: true`, otherwise use `singleRun: true`
     singleRun: true
   })
 }

package.json

@@ -44,6 +44,7 @@
     "karma-jasmine": "^0.3.6",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-spec-reporter": "0.0.23",
+    "node-sass": "^3.4.2",
     "phantomjs-prebuilt": "^2.1.3",
     "proxyquireify": "^3.0.1",
     "uglify-js": "^2.5.0",

src/components/Select.vue

@@ -127,6 +127,7 @@
           @keydown.down.prevent="typeAheadDown"
           @keydown.enter.prevent="typeAheadSelect"
           @blur="open = false"
+          @focus="open = true"
           type="search"
           class="form-control"
           :placeholder="searchPlaceholder"
@@ -199,6 +200,9 @@
       },
       multiple( val ) {
         this.$set('value', val ? [] : null)
+      },
+      filteredOptions() {
+        this.typeAheadPointer = 0;
       }
     },
 
@@ -217,9 +221,9 @@
               this.value = option
             }
           } else {
-            if (this.multiple) {
-              this.value.$remove(option)
-            }
+            // if (this.multiple) {
+            //   this.value.$remove(option)
+            // }
           }
 
           if (!this.multiple) {
@@ -286,7 +290,7 @@
 
       onEscape() {
         if( ! this.search.length ) {
-          this.open = false
+          this.$els.search.blur()
         } else {
           this.$set('search', '')
         }