diff --git a/.travis.yml b/.travis.yml index 727e401f7..b6270754a 100644 --- 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 index 97179d781..83f3b99a9 100644 --- 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 index 1f2483f04..e2945a229 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -549,7 +549,6 @@ uis.controller('uiSelectCtrl', return true; }; - ctrl.searchInput.css('width', '10px'); $timeout(function() { //Give tags time to render correctly if (sizeWatch === null && !updateIfVisible(calculateContainerWidth())) { sizeWatch = $scope.$watch(function() {