Merge remote-tracking branch 'angular-ui/master'

angular-ui · Oct 16, 2017 · d0cb84d · d0cb84d
2 parents 05252c2 + 4150b0a
commit d0cb84d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,16 @@ env:
     - GH_REF: github.com/angular-ui/ui-select.git
     - GH_PAGES_BRANCH: gh-pages
     - secure: "PkIhXXwrR5fHh7fH+2WizaY0MmK1l1Dr7PCqs112PkEimVPcntRJeA5pjTwGRwHm+RSkFVtfo38EY/GUwzhLSRTO7WZ+id+vIMGQLgiofqrOwi0nq93esG6qI8Jg5K0GUt8mzg5m9B2tgm2I91RAojEhIukKcbsDsq3hNAUy71Y="
-
 addons:
+  firefox: "31.0"
+
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
 
+
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start

diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "karma": "^0.12.16",
     "karma-chrome-launcher": "^0.1.3",
     "karma-coverage": "~0.2",
-    "karma-firefox-launcher": "~0.1",
+    "karma-firefox-launcher": "~1.0",
     "karma-jasmine": "~0.2",
     "karma-ng-html2js-preprocessor": "^0.1.0",
     "karma-phantomjs-launcher": "~0.1.4",

diff --git a/src/uiSelectController.js b/src/uiSelectController.js
@@ -158,7 +158,7 @@ uis.controller('uiSelectCtrl',
       } else {
         $timeout(function () {
           ctrl.focusSearchInput(initSearchValue);
-          if(!ctrl.tagging.isActivated && ctrl.items.length > 1) {
+          if(!ctrl.tagging.isActivated && ctrl.items.length > 1 && ctrl.open) {
             _ensureHighlightVisible();
           }
         });