From e98c0f9ec0e203d9ef2a202a1baa92083146536c Mon Sep 17 00:00:00 2001
From: Daniel Humfleet <dhumfl1@co.pierce.wa.us>
Date: Thu, 13 Sep 2018 11:26:27 -0700
Subject: [PATCH 1/3] Upgrade ui bootstrap to 2.5.6

---
 .gitignore           |  3 ++-
 bower.json           |  2 +-
 package.json         |  2 +-
 ui-bootstrap-tpls.js | 58 ++++++++++++++++++++++----------------------
 ui-bootstrap.js      |  2 +-
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 496ee2c..3d72576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+.idea
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 05163be..f554b77 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,7 @@
     "license": "MIT",
     "ignore": [],
     "description": "Native AngularJS (Angular) directives for Bootstrap.",
-    "version": "2.5.0",
+    "version": "2.5.6",
     "main": ["./ui-bootstrap-tpls.js"],
     "dependencies": {
         "angular": ">=1.4.0"
diff --git a/package.json b/package.json
index 4ff93d6..c47968b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-bootstrap",
-  "version": "2.5.0",
+  "version": "2.5.6",
   "description": "Bootstrap widgets for Angular",
   "main": "index.js",
   "homepage": "http://angular-ui.github.io/bootstrap/",
diff --git a/ui-bootstrap-tpls.js b/ui-bootstrap-tpls.js
index 6783893..001cb0e 100644
--- a/ui-bootstrap-tpls.js
+++ b/ui-bootstrap-tpls.js
@@ -2,7 +2,7 @@
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/
 
- * Version: 2.5.0 - 2017-01-28
+ * Version: 2.5.4 - 2018-09-12
  * License: MIT
  */angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
 angular.module("ui.bootstrap.tpls", ["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/year.html","uib/template/datepickerPopup/popup.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]);
@@ -7405,7 +7405,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     };
   }]);
 
-angular.module("uib/template/accordion/accordion-group.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/accordion/accordion-group.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/accordion/accordion-group.html",
     "<div role=\"tab\" id=\"{{::headingId}}\" aria-selected=\"{{isOpen}}\" class=\"panel-heading\" ng-keypress=\"toggleOpen($event)\">\n" +
     "  <h4 class=\"panel-title\">\n" +
@@ -7418,12 +7418,12 @@ angular.module("uib/template/accordion/accordion-group.html", []).run(["$templat
     "");
 }]);
 
-angular.module("uib/template/accordion/accordion.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/accordion/accordion.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/accordion/accordion.html",
     "<div role=\"tablist\" class=\"panel-group\" ng-transclude></div>");
 }]);
 
-angular.module("uib/template/alert/alert.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/alert/alert.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/alert/alert.html",
     "<button ng-show=\"closeable\" type=\"button\" class=\"close\" ng-click=\"close({$event: $event})\">\n" +
     "  <span aria-hidden=\"true\">&times;</span>\n" +
@@ -7433,7 +7433,7 @@ angular.module("uib/template/alert/alert.html", []).run(["$templateCache", funct
     "");
 }]);
 
-angular.module("uib/template/carousel/carousel.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/carousel/carousel.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/carousel/carousel.html",
     "<div class=\"carousel-inner\" ng-transclude></div>\n" +
     "<a role=\"button\" href class=\"left carousel-control\" ng-click=\"prev()\" ng-class=\"{ disabled: isPrevDisabled() }\" ng-show=\"slides.length > 1\">\n" +
@@ -7452,13 +7452,13 @@ angular.module("uib/template/carousel/carousel.html", []).run(["$templateCache",
     "");
 }]);
 
-angular.module("uib/template/carousel/slide.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/carousel/slide.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/carousel/slide.html",
     "<div class=\"text-center\" ng-transclude></div>\n" +
     "");
 }]);
 
-angular.module("uib/template/datepicker/datepicker.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/datepicker/datepicker.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/datepicker/datepicker.html",
     "<div ng-switch=\"datepickerMode\">\n" +
     "  <div uib-daypicker ng-switch-when=\"day\" tabindex=\"0\" class=\"uib-daypicker\"></div>\n" +
@@ -7468,7 +7468,7 @@ angular.module("uib/template/datepicker/datepicker.html", []).run(["$templateCac
     "");
 }]);
 
-angular.module("uib/template/datepicker/day.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/datepicker/day.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/datepicker/day.html",
     "<table role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
     "  <thead>\n" +
@@ -7503,7 +7503,7 @@ angular.module("uib/template/datepicker/day.html", []).run(["$templateCache", fu
     "");
 }]);
 
-angular.module("uib/template/datepicker/month.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/datepicker/month.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/datepicker/month.html",
     "<table role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
     "  <thead>\n" +
@@ -7533,7 +7533,7 @@ angular.module("uib/template/datepicker/month.html", []).run(["$templateCache",
     "");
 }]);
 
-angular.module("uib/template/datepicker/year.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/datepicker/year.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/datepicker/year.html",
     "<table role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
     "  <thead>\n" +
@@ -7563,7 +7563,7 @@ angular.module("uib/template/datepicker/year.html", []).run(["$templateCache", f
     "");
 }]);
 
-angular.module("uib/template/datepickerPopup/popup.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/datepickerPopup/popup.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/datepickerPopup/popup.html",
     "<ul role=\"presentation\" class=\"uib-datepicker-popup dropdown-menu uib-position-measure\" dropdown-nested ng-if=\"isOpen\" ng-keydown=\"keydown($event)\" ng-click=\"$event.stopPropagation()\">\n" +
     "  <li ng-transclude></li>\n" +
@@ -7578,20 +7578,20 @@ angular.module("uib/template/datepickerPopup/popup.html", []).run(["$templateCac
     "");
 }]);
 
-angular.module("uib/template/modal/window.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/modal/window.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/modal/window.html",
     "<div class=\"modal-dialog {{size ? 'modal-' + size : ''}}\"><div class=\"modal-content\" uib-modal-transclude></div></div>\n" +
     "");
 }]);
 
-angular.module("uib/template/pager/pager.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/pager/pager.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/pager/pager.html",
     "<li ng-class=\"{disabled: noPrevious()||ngDisabled, previous: align}\"><a href ng-click=\"selectPage(page - 1, $event)\" ng-disabled=\"noPrevious()||ngDisabled\" uib-tabindex-toggle>{{::getText('previous')}}</a></li>\n" +
     "<li ng-class=\"{disabled: noNext()||ngDisabled, next: align}\"><a href ng-click=\"selectPage(page + 1, $event)\" ng-disabled=\"noNext()||ngDisabled\" uib-tabindex-toggle>{{::getText('next')}}</a></li>\n" +
     "");
 }]);
 
-angular.module("uib/template/pagination/pagination.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/pagination/pagination.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/pagination/pagination.html",
     "<li role=\"menuitem\" ng-if=\"::boundaryLinks\" ng-class=\"{disabled: noPrevious()||ngDisabled}\" class=\"pagination-first\"><a href ng-click=\"selectPage(1, $event)\" ng-disabled=\"noPrevious()||ngDisabled\" uib-tabindex-toggle>{{::getText('first')}}</a></li>\n" +
     "<li role=\"menuitem\" ng-if=\"::directionLinks\" ng-class=\"{disabled: noPrevious()||ngDisabled}\" class=\"pagination-prev\"><a href ng-click=\"selectPage(page - 1, $event)\" ng-disabled=\"noPrevious()||ngDisabled\" uib-tabindex-toggle>{{::getText('previous')}}</a></li>\n" +
@@ -7601,21 +7601,21 @@ angular.module("uib/template/pagination/pagination.html", []).run(["$templateCac
     "");
 }]);
 
-angular.module("uib/template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/tooltip/tooltip-html-popup.html",
     "<div class=\"tooltip-arrow\"></div>\n" +
     "<div class=\"tooltip-inner\" ng-bind-html=\"contentExp()\"></div>\n" +
     "");
 }]);
 
-angular.module("uib/template/tooltip/tooltip-popup.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/tooltip/tooltip-popup.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/tooltip/tooltip-popup.html",
     "<div class=\"tooltip-arrow\"></div>\n" +
     "<div class=\"tooltip-inner\" ng-bind=\"content\"></div>\n" +
     "");
 }]);
 
-angular.module("uib/template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/tooltip/tooltip-template-popup.html",
     "<div class=\"tooltip-arrow\"></div>\n" +
     "<div class=\"tooltip-inner\"\n" +
@@ -7624,7 +7624,7 @@ angular.module("uib/template/tooltip/tooltip-template-popup.html", []).run(["$te
     "");
 }]);
 
-angular.module("uib/template/popover/popover-html.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/popover/popover-html.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/popover/popover-html.html",
     "<div class=\"arrow\"></div>\n" +
     "\n" +
@@ -7635,7 +7635,7 @@ angular.module("uib/template/popover/popover-html.html", []).run(["$templateCach
     "");
 }]);
 
-angular.module("uib/template/popover/popover-template.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/popover/popover-template.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/popover/popover-template.html",
     "<div class=\"arrow\"></div>\n" +
     "\n" +
@@ -7648,7 +7648,7 @@ angular.module("uib/template/popover/popover-template.html", []).run(["$template
     "");
 }]);
 
-angular.module("uib/template/popover/popover.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/popover/popover.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/popover/popover.html",
     "<div class=\"arrow\"></div>\n" +
     "\n" +
@@ -7659,18 +7659,18 @@ angular.module("uib/template/popover/popover.html", []).run(["$templateCache", f
     "");
 }]);
 
-angular.module("uib/template/progressbar/bar.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/progressbar/bar.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/progressbar/bar.html",
     "<div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" aria-labelledby=\"{{::title}}\" ng-transclude></div>\n" +
     "");
 }]);
 
-angular.module("uib/template/progressbar/progress.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/progressbar/progress.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/progressbar/progress.html",
     "<div class=\"progress\" ng-transclude aria-labelledby=\"{{::title}}\"></div>");
 }]);
 
-angular.module("uib/template/progressbar/progressbar.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/progressbar/progressbar.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/progressbar/progressbar.html",
     "<div class=\"progress\">\n" +
     "  <div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" aria-labelledby=\"{{::title}}\" ng-transclude></div>\n" +
@@ -7678,7 +7678,7 @@ angular.module("uib/template/progressbar/progressbar.html", []).run(["$templateC
     "");
 }]);
 
-angular.module("uib/template/rating/rating.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/rating/rating.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/rating/rating.html",
     "<span ng-mouseleave=\"reset()\" ng-keydown=\"onKeydown($event)\" tabindex=\"0\" role=\"slider\" aria-valuemin=\"0\" aria-valuemax=\"{{range.length}}\" aria-valuenow=\"{{value}}\" aria-valuetext=\"{{title}}\">\n" +
     "    <span ng-repeat-start=\"r in range track by $index\" class=\"sr-only\">({{ $index < value ? '*' : ' ' }})</span>\n" +
@@ -7687,7 +7687,7 @@ angular.module("uib/template/rating/rating.html", []).run(["$templateCache", fun
     "");
 }]);
 
-angular.module("uib/template/tabs/tab.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/tabs/tab.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/tabs/tab.html",
     "<li ng-class=\"[{active: active, disabled: disabled}, classes]\" class=\"uib-tab nav-item\">\n" +
     "  <a href ng-click=\"select($event)\" class=\"nav-link\" uib-tab-heading-transclude>{{heading}}</a>\n" +
@@ -7695,7 +7695,7 @@ angular.module("uib/template/tabs/tab.html", []).run(["$templateCache", function
     "");
 }]);
 
-angular.module("uib/template/tabs/tabset.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/tabs/tabset.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/tabs/tabset.html",
     "<div>\n" +
     "  <ul class=\"nav nav-{{tabset.type || 'tabs'}}\" ng-class=\"{'nav-stacked': vertical, 'nav-justified': justified}\" ng-transclude></ul>\n" +
@@ -7710,7 +7710,7 @@ angular.module("uib/template/tabs/tabset.html", []).run(["$templateCache", funct
     "");
 }]);
 
-angular.module("uib/template/timepicker/timepicker.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/timepicker/timepicker.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/timepicker/timepicker.html",
     "<table class=\"uib-timepicker\">\n" +
     "  <tbody>\n" +
@@ -7749,7 +7749,7 @@ angular.module("uib/template/timepicker/timepicker.html", []).run(["$templateCac
     "");
 }]);
 
-angular.module("uib/template/typeahead/typeahead-match.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/typeahead/typeahead-match.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/typeahead/typeahead-match.html",
     "<a href\n" +
     "   tabindex=\"-1\"\n" +
@@ -7758,7 +7758,7 @@ angular.module("uib/template/typeahead/typeahead-match.html", []).run(["$templat
     "");
 }]);
 
-angular.module("uib/template/typeahead/typeahead-popup.html", []).run(["$templateCache", function($templateCache) {
+angular.module("uib/template/typeahead/typeahead-popup.html", []).run(["$templateCache", function ($templateCache) {
   $templateCache.put("uib/template/typeahead/typeahead-popup.html",
     "<ul class=\"dropdown-menu\" ng-show=\"isOpen() && !moveInProgress\" ng-style=\"{top: position().top+'px', left: position().left+'px'}\" role=\"listbox\" aria-hidden=\"{{!isOpen()}}\">\n" +
     "    <li class=\"uib-typeahead-match\" ng-repeat=\"match in matches track by $index\" ng-class=\"{active: isActive($index) }\" ng-mouseenter=\"selectActive($index)\" ng-click=\"selectMatch($index, $event)\" role=\"option\" id=\"{{::match.id}}\">\n" +
diff --git a/ui-bootstrap.js b/ui-bootstrap.js
index 8bcf397..e720609 100644
--- a/ui-bootstrap.js
+++ b/ui-bootstrap.js
@@ -2,7 +2,7 @@
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/
 
- * Version: 2.5.0 - 2017-01-28
+ * Version: 2.5.4 - 2018-09-12
  * License: MIT
  */angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
 angular.module('ui.bootstrap.collapse', [])

From bd8c0d7e517668b77447150e98fcb12378723133 Mon Sep 17 00:00:00 2001
From: Daniel Humfleet <dhumfl1@co.pierce.wa.us>
Date: Fri, 14 Sep 2018 11:59:58 -0700
Subject: [PATCH 2/3] Fix typeahead to dynamic angular 1.7

---
 ui-bootstrap-tpls.js | 30 ++++++++++++++++--------------
 ui-bootstrap.js      | 30 ++++++++++++++++--------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/ui-bootstrap-tpls.js b/ui-bootstrap-tpls.js
index 001cb0e..7eaee32 100644
--- a/ui-bootstrap-tpls.js
+++ b/ui-bootstrap-tpls.js
@@ -2,7 +2,7 @@
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/
 
- * Version: 2.5.4 - 2018-09-12
+ * Version: 2.5.4 - 2018-09-14
  * License: MIT
  */angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
 angular.module("ui.bootstrap.tpls", ["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/year.html","uib/template/datepickerPopup/popup.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]);
@@ -6739,8 +6739,8 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     };
   }])
 
-  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser',
-    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser) {
+  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser', '$scope', '$interpolate',
+    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser, $scope, $interpolate) {
     var HOT_KEYS = [9, 13, 27, 38, 40];
     var eventDebounceTime = 200;
     var modelCtrl, ngModelOptions;
@@ -6815,7 +6815,9 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     };
 
     //expressions used by typeahead
-    var parserResult = typeaheadParser.parse(attrs.uibTypeahead);
+      var getParserResult = function() {
+        return typeaheadParser.parse($interpolate(attrs.uibTypeahead)($scope));
+      };
 
     var hasFocus;
 
@@ -6934,7 +6936,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       var locals = {$viewValue: inputValue};
       isLoadingSetter(originalScope, true);
       isNoResultsSetter(originalScope, false);
-      $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+        $q.when(getParserResult().source(originalScope, locals)).then(function(matches) {
         //it might happen that several async queries were in progress if a user were typing fast
         //but we are interested only in responses that correspond to the current view value
         var onCurrentRequest = inputValue === modelCtrl.$viewValue;
@@ -6946,10 +6948,10 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
             //transform labels
             for (var i = 0; i < matches.length; i++) {
-              locals[parserResult.itemName] = matches[i];
+                locals[getParserResult().itemName] = matches[i];
               scope.matches.push({
                 id: getMatchId(i),
-                label: parserResult.viewMapper(scope, locals),
+                  label: getParserResult().viewMapper(scope, locals),
                 model: matches[i]
               });
             }
@@ -7064,8 +7066,8 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       var model, item;
 
       selected = true;
-      locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
-      model = parserResult.modelMapper(originalScope, locals);
+        locals[getParserResult().itemName] = item = scope.matches[activeIdx].model;
+        model = getParserResult().modelMapper(originalScope, locals);
       $setModelValue(originalScope, model);
       modelCtrl.$setValidity('editable', true);
       modelCtrl.$setValidity('parse', true);
@@ -7073,7 +7075,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       onSelectCallback(originalScope, {
         $item: item,
         $model: model,
-        $label: parserResult.viewMapper(originalScope, locals),
+        $label: getParserResult().viewMapper(originalScope, locals),
         $event: evt
       });
 
@@ -7276,10 +7278,10 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
         //it might happen that we don't have enough info to properly render input value
         //we need to check for this situation and simply return model value if we can't apply custom formatting
-        locals[parserResult.itemName] = modelValue;
-        candidateViewValue = parserResult.viewMapper(originalScope, locals);
-        locals[parserResult.itemName] = undefined;
-        emptyViewValue = parserResult.viewMapper(originalScope, locals);
+          locals[getParserResult().itemName] = modelValue;
+          candidateViewValue = getParserResult().viewMapper(originalScope, locals);
+          locals[getParserResult().itemName] = undefined;
+          emptyViewValue = getParserResult().viewMapper(originalScope, locals);
 
         return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
       });
diff --git a/ui-bootstrap.js b/ui-bootstrap.js
index e720609..bcc1a32 100644
--- a/ui-bootstrap.js
+++ b/ui-bootstrap.js
@@ -2,7 +2,7 @@
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/
 
- * Version: 2.5.4 - 2018-09-12
+ * Version: 2.5.4 - 2018-09-14
  * License: MIT
  */angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
 angular.module('ui.bootstrap.collapse', [])
@@ -6738,8 +6738,8 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     };
   }])
 
-  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser',
-    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser) {
+  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser', '$scope', '$interpolate',
+    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser, $scope, $interpolate) {
     var HOT_KEYS = [9, 13, 27, 38, 40];
     var eventDebounceTime = 200;
     var modelCtrl, ngModelOptions;
@@ -6814,7 +6814,9 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     };
 
     //expressions used by typeahead
-    var parserResult = typeaheadParser.parse(attrs.uibTypeahead);
+      var getParserResult = function() {
+        return typeaheadParser.parse($interpolate(attrs.uibTypeahead)($scope));
+      };
 
     var hasFocus;
 
@@ -6933,7 +6935,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       var locals = {$viewValue: inputValue};
       isLoadingSetter(originalScope, true);
       isNoResultsSetter(originalScope, false);
-      $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+        $q.when(getParserResult().source(originalScope, locals)).then(function(matches) {
         //it might happen that several async queries were in progress if a user were typing fast
         //but we are interested only in responses that correspond to the current view value
         var onCurrentRequest = inputValue === modelCtrl.$viewValue;
@@ -6945,10 +6947,10 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
             //transform labels
             for (var i = 0; i < matches.length; i++) {
-              locals[parserResult.itemName] = matches[i];
+                locals[getParserResult().itemName] = matches[i];
               scope.matches.push({
                 id: getMatchId(i),
-                label: parserResult.viewMapper(scope, locals),
+                  label: getParserResult().viewMapper(scope, locals),
                 model: matches[i]
               });
             }
@@ -7063,8 +7065,8 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       var model, item;
 
       selected = true;
-      locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
-      model = parserResult.modelMapper(originalScope, locals);
+        locals[getParserResult().itemName] = item = scope.matches[activeIdx].model;
+        model = getParserResult().modelMapper(originalScope, locals);
       $setModelValue(originalScope, model);
       modelCtrl.$setValidity('editable', true);
       modelCtrl.$setValidity('parse', true);
@@ -7072,7 +7074,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       onSelectCallback(originalScope, {
         $item: item,
         $model: model,
-        $label: parserResult.viewMapper(originalScope, locals),
+        $label: getParserResult().viewMapper(originalScope, locals),
         $event: evt
       });
 
@@ -7275,10 +7277,10 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
         //it might happen that we don't have enough info to properly render input value
         //we need to check for this situation and simply return model value if we can't apply custom formatting
-        locals[parserResult.itemName] = modelValue;
-        candidateViewValue = parserResult.viewMapper(originalScope, locals);
-        locals[parserResult.itemName] = undefined;
-        emptyViewValue = parserResult.viewMapper(originalScope, locals);
+          locals[getParserResult().itemName] = modelValue;
+          candidateViewValue = getParserResult().viewMapper(originalScope, locals);
+          locals[getParserResult().itemName] = undefined;
+          emptyViewValue = getParserResult().viewMapper(originalScope, locals);
 
         return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
       });

From 20c29f80ac89edf63bf9abd6c1e31f1473c547d4 Mon Sep 17 00:00:00 2001
From: Daniel Humfleet <dhumfl1@co.pierce.wa.us>
Date: Thu, 20 Sep 2018 11:22:01 -0700
Subject: [PATCH 3/3] New build with typeahead interpolation fix

---
 ui-bootstrap-tpls.js | 904 ++++++++++++++++++++++---------------------
 ui-bootstrap.js      | 904 ++++++++++++++++++++++---------------------
 2 files changed, 942 insertions(+), 866 deletions(-)

diff --git a/ui-bootstrap-tpls.js b/ui-bootstrap-tpls.js
index 7eaee32..957880c 100644
--- a/ui-bootstrap-tpls.js
+++ b/ui-bootstrap-tpls.js
@@ -2,7 +2,7 @@
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/
 
- * Version: 2.5.4 - 2018-09-14
+ * Version: 2.5.4 - 2018-09-20
  * License: MIT
  */angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
 angular.module("ui.bootstrap.tpls", ["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/year.html","uib/template/datepickerPopup/popup.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]);
@@ -6741,46 +6741,78 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
   .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser', '$scope', '$interpolate',
     function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser, $scope, $interpolate) {
-    var HOT_KEYS = [9, 13, 27, 38, 40];
-    var eventDebounceTime = 200;
-    var modelCtrl, ngModelOptions;
-    //SUPPORTED ATTRIBUTES (OPTIONS)
+      var minLength, isEditable;
 
-    //minimal no of characters that needs to be entered before typeahead kicks-in
-    var minLength = originalScope.$eval(attrs.typeaheadMinLength);
-    if (!minLength && minLength !== 0) {
-      minLength = 1;
-    }
+      var interpolateValue = function(value){
+        if(value){
+          return $interpolate(value)($scope);
+        }
+        return value;
+      };
+
+      var attributesToInterpolate = [
+        'typeaheadMinLength', 'typeaheadEditable', 'typeaheadWaitMs', 'typeaheadOnSelect', 'typeaheadLoading', 'typeaheadAppendTo',
+        'typeaheadShowHint', 'typeaheadIsOpen', 'typeaheadSelectOnExact', 'typeaheadFocusFirst', 'typeaheadFocusOnSelect',
+        'typeaheadPopupTemplateUrl', 'typeaheadTemplateUrl', 'uibTypeahead', 'ngModel', 'typeaheadSelectOnBlur'
+      ];
+
+      angular.forEach(attributesToInterpolate, function(attribute){
+        attrs[attribute] = interpolateValue(attrs[attribute]);
+      });
+
+       $scope.init = function() {
+
+          originalScope.$watch(attrs.typeaheadMinLength, function (newValue) {
+            var newVal = interpolateValue(newValue);
+            minLength = !newVal && newVal !== 0 ? 1 : newVal;
+          });
+
+          originalScope.$watch(attrs.typeaheadEditable, function (newValue) {
+            var newVal = interpolateValue(newValue);
+            isEditable = newVal !== false;
+          });
+      };
+
+        var HOT_KEYS = [9, 13, 27, 38, 40];
+        var eventDebounceTime = 200;
+        var modelCtrl, ngModelOptions;
+        //SUPPORTED ATTRIBUTES (OPTIONS)
+
+        //minimal no of characters that needs to be entered before typeahead kicks-in
+        minLength = originalScope.$eval(attrs.typeaheadMinLength);
+        if (!minLength && minLength !== 0) {
+          minLength = 1;
+        }
 
     originalScope.$watch(attrs.typeaheadMinLength, function (newVal) {
         minLength = !newVal && newVal !== 0 ? 1 : newVal;
     });
 
-    //minimal wait time after last character typed before typeahead kicks-in
+        //minimal wait time after last character typed before typeahead kicks-in
     var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
 
-    //should it restrict model values to the ones selected from the popup only?
-    var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+        //should it restrict model values to the ones selected from the popup only?
+    isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
     originalScope.$watch(attrs.typeaheadEditable, function (newVal) {
       isEditable = newVal !== false;
     });
 
-    //binding to a variable that indicates if matches are being retrieved asynchronously
+        //binding to a variable that indicates if matches are being retrieved asynchronously
     var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
 
-    //a function to determine if an event should cause selection
+        //a function to determine if an event should cause selection
     var isSelectEvent = attrs.typeaheadShouldSelect ? $parse(attrs.typeaheadShouldSelect) : function(scope, vals) {
-      var evt = vals.$event;
-      return evt.which === 13 || evt.which === 9;
-    };
+          var evt = vals.$event;
+          return evt.which === 13 || evt.which === 9;
+        };
 
-    //a callback executed when a match is selected
+        //a callback executed when a match is selected
     var onSelectCallback = $parse(attrs.typeaheadOnSelect);
 
-    //should it select highlighted popup value when losing focus?
+        //should it select highlighted popup value when losing focus?
     var isSelectOnBlur = angular.isDefined(attrs.typeaheadSelectOnBlur) ? originalScope.$eval(attrs.typeaheadSelectOnBlur) : false;
 
-    //binding to a variable that indicates if there were no results after the query is completed
+        //binding to a variable that indicates if there were no results after the query is completed
     var isNoResultsSetter = $parse(attrs.typeaheadNoResults).assign || angular.noop;
 
     var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
@@ -6792,127 +6824,129 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
     var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
 
-    //If input matches an item of the list exactly, select it automatically
+        //If input matches an item of the list exactly, select it automatically
     var selectOnExact = attrs.typeaheadSelectOnExact ? originalScope.$eval(attrs.typeaheadSelectOnExact) : false;
 
-    //binding to a variable that indicates if dropdown is open
+        //binding to a variable that indicates if dropdown is open
     var isOpenSetter = $parse(attrs.typeaheadIsOpen).assign || angular.noop;
 
     var showHint = originalScope.$eval(attrs.typeaheadShowHint) || false;
 
-    //INTERNAL VARIABLES
+        //INTERNAL VARIABLES
 
-    //model setter executed upon match selection
+        //model setter executed upon match selection
     var parsedModel = $parse(attrs.ngModel);
     var invokeModelSetter = $parse(attrs.ngModel + '($$$p)');
-    var $setModelValue = function(scope, newValue) {
-      if (angular.isFunction(parsedModel(originalScope)) &&
-        ngModelOptions.getOption('getterSetter')) {
-        return invokeModelSetter(scope, {$$$p: newValue});
-      }
+        var $setModelValue = function (scope, newValue) {
+          if (angular.isFunction(parsedModel(originalScope)) &&
+            ngModelOptions.getOption('getterSetter')) {
+            return invokeModelSetter(scope, {$$$p: newValue});
+          }
 
-      return parsedModel.assign(scope, newValue);
-    };
+          return parsedModel.assign(scope, newValue);
+        };
 
-    //expressions used by typeahead
-      var getParserResult = function() {
-        return typeaheadParser.parse($interpolate(attrs.uibTypeahead)($scope));
-      };
 
-    var hasFocus;
 
-    //Used to avoid bug in iOS webview where iOS keyboard does not fire
-    //mousedown & mouseup events
-    //Issue #3699
-    var selected;
+        //expressions used by typeahead
+        var getParserResult = function () {
+          return typeaheadParser.parse(attrs.uibTypeahead);
+        };
 
-    //create a child scope for the typeahead directive so we are not polluting original scope
-    //with typeahead-specific data (matches, query etc.)
-    var scope = originalScope.$new();
-    var offDestroy = originalScope.$on('$destroy', function() {
-      scope.$destroy();
-    });
-    scope.$on('$destroy', offDestroy);
-
-    // WAI-ARIA
-    var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
-    element.attr({
-      'aria-autocomplete': 'list',
-      'aria-expanded': false,
-      'aria-owns': popupId
-    });
+        var hasFocus;
 
-    var inputsContainer, hintInputElem;
-    //add read-only input to show hint
-    if (showHint) {
-      inputsContainer = angular.element('<div></div>');
-      inputsContainer.css('position', 'relative');
-      element.after(inputsContainer);
-      hintInputElem = element.clone();
-      hintInputElem.attr('placeholder', '');
-      hintInputElem.attr('tabindex', '-1');
-      hintInputElem.val('');
-      hintInputElem.css({
-        'position': 'absolute',
-        'top': '0px',
-        'left': '0px',
-        'border-color': 'transparent',
-        'box-shadow': 'none',
-        'opacity': 1,
-        'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
-        'color': '#999'
-      });
-      element.css({
-        'position': 'relative',
-        'vertical-align': 'top',
-        'background-color': 'transparent'
-      });
+        //Used to avoid bug in iOS webview where iOS keyboard does not fire
+        //mousedown & mouseup events
+        //Issue #3699
+        var selected;
 
-      if (hintInputElem.attr('id')) {
-        hintInputElem.removeAttr('id'); // remove duplicate id if present.
-      }
-      inputsContainer.append(hintInputElem);
-      hintInputElem.after(element);
-    }
-
-    //pop-up element used to display matches
-    var popUpEl = angular.element('<div uib-typeahead-popup></div>');
-    popUpEl.attr({
-      id: popupId,
-      matches: 'matches',
-      active: 'activeIdx',
-      select: 'select(activeIdx, evt)',
-      'move-in-progress': 'moveInProgress',
-      query: 'query',
-      position: 'position',
-      'assign-is-open': 'assignIsOpen(isOpen)',
-      debounce: 'debounceUpdate'
-    });
-    //custom item template
+        //create a child scope for the typeahead directive so we are not polluting original scope
+        //with typeahead-specific data (matches, query etc.)
+        var scope = originalScope.$new();
+        var offDestroy = originalScope.$on('$destroy', function () {
+          scope.$destroy();
+        });
+        scope.$on('$destroy', offDestroy);
+
+        // WAI-ARIA
+        var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+        element.attr({
+          'aria-autocomplete': 'list',
+          'aria-expanded': false,
+          'aria-owns': popupId
+        });
+
+        var inputsContainer, hintInputElem;
+        //add read-only input to show hint
+        if (showHint) {
+          inputsContainer = angular.element('<div></div>');
+          inputsContainer.css('position', 'relative');
+          element.after(inputsContainer);
+          hintInputElem = element.clone();
+          hintInputElem.attr('placeholder', '');
+          hintInputElem.attr('tabindex', '-1');
+          hintInputElem.val('');
+          hintInputElem.css({
+            'position': 'absolute',
+            'top': '0px',
+            'left': '0px',
+            'border-color': 'transparent',
+            'box-shadow': 'none',
+            'opacity': 1,
+            'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
+            'color': '#999'
+          });
+          element.css({
+            'position': 'relative',
+            'vertical-align': 'top',
+            'background-color': 'transparent'
+          });
+
+          if (hintInputElem.attr('id')) {
+            hintInputElem.removeAttr('id'); // remove duplicate id if present.
+          }
+          inputsContainer.append(hintInputElem);
+          hintInputElem.after(element);
+        }
+
+        //pop-up element used to display matches
+        var popUpEl = angular.element('<div uib-typeahead-popup></div>');
+        popUpEl.attr({
+          id: popupId,
+          matches: 'matches',
+          active: 'activeIdx',
+          select: 'select(activeIdx, evt)',
+          'move-in-progress': 'moveInProgress',
+          query: 'query',
+          position: 'position',
+          'assign-is-open': 'assignIsOpen(isOpen)',
+          debounce: 'debounceUpdate'
+        });
+        //custom item template
     if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
       popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
-    }
+        }
 
     if (angular.isDefined(attrs.typeaheadPopupTemplateUrl)) {
       popUpEl.attr('popup-template-url', attrs.typeaheadPopupTemplateUrl);
-    }
+        }
 
-    var resetHint = function() {
-      if (showHint) {
-        hintInputElem.val('');
-      }
-    };
+      var resetHint = function () {
+          if (showHint) {
+            hintInputElem.val('');
+          }
+        };
 
-    var resetMatches = function() {
-      scope.matches = [];
-      scope.activeIdx = -1;
-      element.attr('aria-expanded', false);
-      resetHint();
-    };
+        var resetMatches = function () {
+          scope.matches = [];
+          scope.activeIdx = -1;
+          element.attr('aria-expanded', false);
+          resetHint();
+        };
 
-    var getMatchId = function(index) {
-      return popupId + '-option-' + index;
-    };
+        var getMatchId = function (index) {
+          return popupId + '-option-' + index;
+        };
 
     // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
     // This attribute is added or removed automatically when the `activeIdx` changes.
@@ -6924,386 +6958,390 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       }
     });
 
-    var inputIsExactMatch = function(inputValue, index) {
-      if (scope.matches.length > index && inputValue) {
-        return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
-      }
+        var inputIsExactMatch = function (inputValue, index) {
+          if (scope.matches.length > index && inputValue) {
+            return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
+          }
 
-      return false;
-    };
+          return false;
+        };
 
-    var getMatchesAsync = function(inputValue, evt) {
-      var locals = {$viewValue: inputValue};
-      isLoadingSetter(originalScope, true);
-      isNoResultsSetter(originalScope, false);
-        $q.when(getParserResult().source(originalScope, locals)).then(function(matches) {
-        //it might happen that several async queries were in progress if a user were typing fast
-        //but we are interested only in responses that correspond to the current view value
-        var onCurrentRequest = inputValue === modelCtrl.$viewValue;
-        if (onCurrentRequest && hasFocus) {
-          if (matches && matches.length > 0) {
-            scope.activeIdx = focusFirst ? 0 : -1;
-            isNoResultsSetter(originalScope, false);
-            scope.matches.length = 0;
-
-            //transform labels
-            for (var i = 0; i < matches.length; i++) {
-                locals[getParserResult().itemName] = matches[i];
-              scope.matches.push({
-                id: getMatchId(i),
-                  label: getParserResult().viewMapper(scope, locals),
-                model: matches[i]
-              });
-            }
+        var getMatchesAsync = function (inputValue, evt) {
+          var locals = {$viewValue: inputValue};
+          isLoadingSetter(originalScope, true);
+          isNoResultsSetter(originalScope, false);
+          $q.when(getParserResult().source(originalScope, locals)).then(function (matches) {
+            //it might happen that several async queries were in progress if a user were typing fast
+            //but we are interested only in responses that correspond to the current view value
+            var onCurrentRequest = inputValue === modelCtrl.$viewValue;
+            if (onCurrentRequest && hasFocus) {
+              if (matches && matches.length > 0) {
+                scope.activeIdx = focusFirst ? 0 : -1;
+                isNoResultsSetter(originalScope, false);
+                scope.matches.length = 0;
+
+                //transform labels
+                for (var i = 0; i < matches.length; i++) {
+                  locals[getParserResult().itemName] = matches[i];
+                  scope.matches.push({
+                    id: getMatchId(i),
+                    label: getParserResult().viewMapper(scope, locals),
+                    model: matches[i]
+                  });
+                }
 
-            scope.query = inputValue;
-            //position pop-up with matches - we need to re-calculate its position each time we are opening a window
-            //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
-            //due to other elements being rendered
-            recalculatePosition();
+                scope.query = inputValue;
+                //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+                //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+                //due to other elements being rendered
+                recalculatePosition();
 
-            element.attr('aria-expanded', true);
+                element.attr('aria-expanded', true);
 
-            //Select the single remaining option if user input matches
-            if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
-              if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
-                $$debounce(function() {
-                  scope.select(0, evt);
-                }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
-              } else {
-                scope.select(0, evt);
-              }
-            }
+                //Select the single remaining option if user input matches
+                if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
+                  if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                    $$debounce(function () {
+                      scope.select(0, evt);
+                    }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                  } else {
+                    scope.select(0, evt);
+                  }
+                }
 
-            if (showHint) {
-              var firstLabel = scope.matches[0].label;
-              if (angular.isString(inputValue) &&
-                inputValue.length > 0 &&
-                firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
-                hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+                if (showHint) {
+                  var firstLabel = scope.matches[0].label;
+                  if (angular.isString(inputValue) &&
+                    inputValue.length > 0 &&
+                    firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
+                    hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+                  } else {
+                    hintInputElem.val('');
+                  }
+                }
               } else {
-                hintInputElem.val('');
+                resetMatches();
+                isNoResultsSetter(originalScope, true);
               }
             }
-          } else {
+            if (onCurrentRequest) {
+              isLoadingSetter(originalScope, false);
+            }
+          }, function () {
             resetMatches();
+            isLoadingSetter(originalScope, false);
             isNoResultsSetter(originalScope, true);
-          }
-        }
-        if (onCurrentRequest) {
-          isLoadingSetter(originalScope, false);
+          });
+        };
+
+        // bind events only if appendToBody params exist - performance feature
+        if (appendToBody) {
+          angular.element($window).on('resize', fireRecalculating);
+          $document.find('body').on('scroll', fireRecalculating);
         }
-      }, function() {
-        resetMatches();
-        isLoadingSetter(originalScope, false);
-        isNoResultsSetter(originalScope, true);
-      });
-    };
 
-    // bind events only if appendToBody params exist - performance feature
-    if (appendToBody) {
-      angular.element($window).on('resize', fireRecalculating);
-      $document.find('body').on('scroll', fireRecalculating);
-    }
+        // Declare the debounced function outside recalculating for
+        // proper debouncing
+        var debouncedRecalculate = $$debounce(function () {
+          // if popup is visible
+          if (scope.matches.length) {
+            recalculatePosition();
+          }
 
-    // Declare the debounced function outside recalculating for
-    // proper debouncing
-    var debouncedRecalculate = $$debounce(function() {
-      // if popup is visible
-      if (scope.matches.length) {
-        recalculatePosition();
-      }
+          scope.moveInProgress = false;
+        }, eventDebounceTime);
 
-      scope.moveInProgress = false;
-    }, eventDebounceTime);
+        // Default progress type
+        scope.moveInProgress = false;
 
-    // Default progress type
-    scope.moveInProgress = false;
+        function fireRecalculating() {
+          if (!scope.moveInProgress) {
+            scope.moveInProgress = true;
+            scope.$digest();
+          }
 
-    function fireRecalculating() {
-      if (!scope.moveInProgress) {
-        scope.moveInProgress = true;
-        scope.$digest();
-      }
+          debouncedRecalculate();
+        }
 
-      debouncedRecalculate();
-    }
+        // recalculate actual position and set new values to scope
+        // after digest loop is popup in right position
+        function recalculatePosition() {
+          scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+          scope.position.top += element.prop('offsetHeight');
+        }
 
-    // recalculate actual position and set new values to scope
-    // after digest loop is popup in right position
-    function recalculatePosition() {
-      scope.position = appendToBody ? $position.offset(element) : $position.position(element);
-      scope.position.top += element.prop('offsetHeight');
-    }
+        //we need to propagate user's query so we can higlight matches
+        scope.query = undefined;
 
-    //we need to propagate user's query so we can higlight matches
-    scope.query = undefined;
+        //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+        var timeoutPromise;
 
-    //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
-    var timeoutPromise;
+        var scheduleSearchWithTimeout = function (inputValue) {
+          timeoutPromise = $timeout(function () {
+            getMatchesAsync(inputValue);
+          }, waitTime);
+        };
 
-    var scheduleSearchWithTimeout = function(inputValue) {
-      timeoutPromise = $timeout(function() {
-        getMatchesAsync(inputValue);
-      }, waitTime);
-    };
+        var cancelPreviousTimeout = function () {
+          if (timeoutPromise) {
+            $timeout.cancel(timeoutPromise);
+          }
+        };
 
-    var cancelPreviousTimeout = function() {
-      if (timeoutPromise) {
-        $timeout.cancel(timeoutPromise);
-      }
-    };
+        resetMatches();
 
-    resetMatches();
+        scope.assignIsOpen = function (isOpen) {
+          isOpenSetter(originalScope, isOpen);
+        };
 
-    scope.assignIsOpen = function (isOpen) {
-      isOpenSetter(originalScope, isOpen);
-    };
+        scope.select = function (activeIdx, evt) {
+          //called from within the $digest() cycle
+          var locals = {};
+          var model, item;
 
-    scope.select = function(activeIdx, evt) {
-      //called from within the $digest() cycle
-      var locals = {};
-      var model, item;
-
-      selected = true;
-        locals[getParserResult().itemName] = item = scope.matches[activeIdx].model;
-        model = getParserResult().modelMapper(originalScope, locals);
-      $setModelValue(originalScope, model);
-      modelCtrl.$setValidity('editable', true);
-      modelCtrl.$setValidity('parse', true);
-
-      onSelectCallback(originalScope, {
-        $item: item,
-        $model: model,
-        $label: getParserResult().viewMapper(originalScope, locals),
-        $event: evt
-      });
+          selected = true;
+          locals[getParserResult().itemName] = item = scope.matches[activeIdx].model;
+          model = getParserResult().modelMapper(originalScope, locals);
+          $setModelValue(originalScope, model);
+          modelCtrl.$setValidity('editable', true);
+          modelCtrl.$setValidity('parse', true);
 
-      resetMatches();
+          onSelectCallback(originalScope, {
+            $item: item,
+            $model: model,
+            $label: getParserResult().viewMapper(originalScope, locals),
+            $event: evt
+          });
+
+          resetMatches();
 
-      //return focus to the input element if a match was selected via a mouse click event
-      // use timeout to avoid $rootScope:inprog error
+          //return focus to the input element if a match was selected via a mouse click event
+          // use timeout to avoid $rootScope:inprog error
       if (scope.$eval(attrs.typeaheadFocusOnSelect) !== false) {
-        $timeout(function() { element[0].focus(); }, 0, false);
-      }
-    };
+            $timeout(function () {
+              element[0].focus();
+            }, 0, false);
+          }
+        };
 
-    //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
-    element.on('keydown', function(evt) {
-      //typeahead is open and an "interesting" key was pressed
-      if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
-        return;
-      }
+        //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+        element.on('keydown', function (evt) {
+          //typeahead is open and an "interesting" key was pressed
+          if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+            return;
+          }
 
-      var shouldSelect = isSelectEvent(originalScope, {$event: evt});
+          var shouldSelect = isSelectEvent(originalScope, {$event: evt});
 
-      /**
-       * if there's nothing selected (i.e. focusFirst) and enter or tab is hit
-       * or
-       * shift + tab is pressed to bring focus to the previous element
-       * then clear the results
-       */
-      if (scope.activeIdx === -1 && shouldSelect || evt.which === 9 && !!evt.shiftKey) {
-        resetMatches();
-        scope.$digest();
-        return;
-      }
+          /**
+           * if there's nothing selected (i.e. focusFirst) and enter or tab is hit
+           * or
+           * shift + tab is pressed to bring focus to the previous element
+           * then clear the results
+           */
+          if (scope.activeIdx === -1 && shouldSelect || evt.which === 9 && !!evt.shiftKey) {
+            resetMatches();
+            scope.$digest();
+            return;
+          }
 
-      evt.preventDefault();
-      var target;
-      switch (evt.which) {
-        case 27: // escape
-          evt.stopPropagation();
+          evt.preventDefault();
+          var target;
+          switch (evt.which) {
+            case 27: // escape
+              evt.stopPropagation();
 
-          resetMatches();
-          originalScope.$digest();
-          break;
-        case 38: // up arrow
-          scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
-          scope.$digest();
-          target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
-          target.parentNode.scrollTop = target.offsetTop;
-          break;
-        case 40: // down arrow
-          scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
-          scope.$digest();
-          target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
-          target.parentNode.scrollTop = target.offsetTop;
-          break;
-        default:
-          if (shouldSelect) {
-            scope.$apply(function() {
-              if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
-                $$debounce(function() {
+              resetMatches();
+              originalScope.$digest();
+              break;
+            case 38: // up arrow
+              scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+              scope.$digest();
+              target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
+              target.parentNode.scrollTop = target.offsetTop;
+              break;
+            case 40: // down arrow
+              scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+              scope.$digest();
+              target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
+              target.parentNode.scrollTop = target.offsetTop;
+              break;
+            default:
+              if (shouldSelect) {
+                scope.$apply(function () {
+                  if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                    $$debounce(function () {
+                      scope.select(scope.activeIdx, evt);
+                    }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                  } else {
+                    scope.select(scope.activeIdx, evt);
+                  }
+                });
+              }
+          }
+        });
+
+        element.on('focus', function (evt) {
+          hasFocus = true;
+          if (minLength === 0 && !modelCtrl.$viewValue) {
+            $timeout(function () {
+              getMatchesAsync(modelCtrl.$viewValue, evt);
+            }, 0);
+          }
+        });
+
+        element.on('blur', function (evt) {
+          if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
+            selected = true;
+            scope.$apply(function () {
+              if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
+                $$debounce(function () {
                   scope.select(scope.activeIdx, evt);
-                }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                }, scope.debounceUpdate.blur);
               } else {
                 scope.select(scope.activeIdx, evt);
               }
             });
           }
-      }
-    });
-
-    element.on('focus', function (evt) {
-      hasFocus = true;
-      if (minLength === 0 && !modelCtrl.$viewValue) {
-        $timeout(function() {
-          getMatchesAsync(modelCtrl.$viewValue, evt);
-        }, 0);
-      }
-    });
-
-    element.on('blur', function(evt) {
-      if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
-        selected = true;
-        scope.$apply(function() {
-          if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
-            $$debounce(function() {
-              scope.select(scope.activeIdx, evt);
-            }, scope.debounceUpdate.blur);
-          } else {
-            scope.select(scope.activeIdx, evt);
+          if (!isEditable && modelCtrl.$error.editable) {
+            modelCtrl.$setViewValue();
+            scope.$apply(function () {
+              // Reset validity as we are clearing
+              modelCtrl.$setValidity('editable', true);
+              modelCtrl.$setValidity('parse', true);
+            });
+            element.val('');
           }
+          hasFocus = false;
+          selected = false;
         });
-      }
-      if (!isEditable && modelCtrl.$error.editable) {
-        modelCtrl.$setViewValue();
-        scope.$apply(function() {
-          // Reset validity as we are clearing
-          modelCtrl.$setValidity('editable', true);
-          modelCtrl.$setValidity('parse', true);
-        });
-        element.val('');
-      }
-      hasFocus = false;
-      selected = false;
-    });
 
-    // Keep reference to click handler to unbind it.
-    var dismissClickHandler = function(evt) {
-      // Issue #3973
-      // Firefox treats right click as a click on document
-      if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
-        resetMatches();
-        if (!$rootScope.$$phase) {
-          originalScope.$digest();
-        }
-      }
-    };
+        // Keep reference to click handler to unbind it.
+        var dismissClickHandler = function (evt) {
+          // Issue #3973
+          // Firefox treats right click as a click on document
+          if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
+            resetMatches();
+            if (!$rootScope.$$phase) {
+              originalScope.$digest();
+            }
+          }
+        };
 
-    $document.on('click', dismissClickHandler);
+        $document.on('click', dismissClickHandler);
 
-    originalScope.$on('$destroy', function() {
-      $document.off('click', dismissClickHandler);
-      if (appendToBody || appendTo) {
-        $popup.remove();
-      }
+        originalScope.$on('$destroy', function () {
+          $document.off('click', dismissClickHandler);
+          if (appendToBody || appendTo) {
+            $popup.remove();
+          }
 
-      if (appendToBody) {
-        angular.element($window).off('resize', fireRecalculating);
-        $document.find('body').off('scroll', fireRecalculating);
-      }
-      // Prevent jQuery cache memory leak
-      popUpEl.remove();
+          if (appendToBody) {
+            angular.element($window).off('resize', fireRecalculating);
+            $document.find('body').off('scroll', fireRecalculating);
+          }
+          // Prevent jQuery cache memory leak
+          popUpEl.remove();
 
-      if (showHint) {
-          inputsContainer.remove();
-      }
-    });
+          if (showHint) {
+            inputsContainer.remove();
+          }
+        });
 
-    var $popup = $compile(popUpEl)(scope);
+        var $popup = $compile(popUpEl)(scope);
 
-    if (appendToBody) {
-      $document.find('body').append($popup);
-    } else if (appendTo) {
-      angular.element(appendTo).eq(0).append($popup);
-    } else {
-      element.after($popup);
-    }
+        if (appendToBody) {
+          $document.find('body').append($popup);
+        } else if (appendTo) {
+          angular.element(appendTo).eq(0).append($popup);
+        } else {
+          element.after($popup);
+        }
 
-    this.init = function(_modelCtrl) {
-      modelCtrl = _modelCtrl;
-      ngModelOptions = extractOptions(modelCtrl);
 
-      scope.debounceUpdate = $parse(ngModelOptions.getOption('debounce'))(originalScope);
+        this.init = function (_modelCtrl) {
+          modelCtrl = _modelCtrl;
+          ngModelOptions = extractOptions(modelCtrl);
 
-      //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
-      //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
-      modelCtrl.$parsers.unshift(function(inputValue) {
-        hasFocus = true;
+          scope.debounceUpdate = $parse(ngModelOptions.getOption('debounce'))(originalScope);
 
-        if (minLength === 0 || inputValue && inputValue.length >= minLength) {
-          if (waitTime > 0) {
-            cancelPreviousTimeout();
-            scheduleSearchWithTimeout(inputValue);
-          } else {
-            getMatchesAsync(inputValue);
-          }
-        } else {
-          isLoadingSetter(originalScope, false);
-          cancelPreviousTimeout();
-          resetMatches();
-        }
+          //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+          //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+          modelCtrl.$parsers.unshift(function (inputValue) {
+            hasFocus = true;
 
-        if (isEditable) {
-          return inputValue;
-        }
+            if (minLength === 0 || inputValue && inputValue.length >= minLength) {
+              if (waitTime > 0) {
+                cancelPreviousTimeout();
+                scheduleSearchWithTimeout(inputValue);
+              } else {
+                getMatchesAsync(inputValue);
+              }
+            } else {
+              isLoadingSetter(originalScope, false);
+              cancelPreviousTimeout();
+              resetMatches();
+            }
 
-        if (!inputValue) {
-          // Reset in case user had typed something previously.
-          modelCtrl.$setValidity('editable', true);
-          return null;
-        }
+            if (isEditable) {
+              return inputValue;
+            }
 
-        modelCtrl.$setValidity('editable', false);
-        return undefined;
-      });
+            if (!inputValue) {
+              // Reset in case user had typed something previously.
+              modelCtrl.$setValidity('editable', true);
+              return null;
+            }
 
-      modelCtrl.$formatters.push(function(modelValue) {
-        var candidateViewValue, emptyViewValue;
-        var locals = {};
+            modelCtrl.$setValidity('editable', false);
+            return undefined;
+          });
 
-        // The validity may be set to false via $parsers (see above) if
-        // the model is restricted to selected values. If the model
-        // is set manually it is considered to be valid.
-        if (!isEditable) {
-          modelCtrl.$setValidity('editable', true);
-        }
+          modelCtrl.$formatters.push(function (modelValue) {
+            var candidateViewValue, emptyViewValue;
+            var locals = {};
 
-        if (inputFormatter) {
-          locals.$model = modelValue;
-          return inputFormatter(originalScope, locals);
-        }
+            // The validity may be set to false via $parsers (see above) if
+            // the model is restricted to selected values. If the model
+            // is set manually it is considered to be valid.
+            if (!isEditable) {
+              modelCtrl.$setValidity('editable', true);
+            }
 
-        //it might happen that we don't have enough info to properly render input value
-        //we need to check for this situation and simply return model value if we can't apply custom formatting
-          locals[getParserResult().itemName] = modelValue;
-          candidateViewValue = getParserResult().viewMapper(originalScope, locals);
-          locals[getParserResult().itemName] = undefined;
-          emptyViewValue = getParserResult().viewMapper(originalScope, locals);
+            if (inputFormatter) {
+              locals.$model = modelValue;
+              return inputFormatter(originalScope, locals);
+            }
 
-        return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
-      });
-    };
+            //it might happen that we don't have enough info to properly render input value
+            //we need to check for this situation and simply return model value if we can't apply custom formatting
+            locals[getParserResult().itemName] = modelValue;
+            candidateViewValue = getParserResult().viewMapper(originalScope, locals);
+            locals[getParserResult().itemName] = undefined;
+            emptyViewValue = getParserResult().viewMapper(originalScope, locals);
 
-    function extractOptions(ngModelCtrl) {
-      var ngModelOptions;
+            return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
+          });
+        };
 
-      if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
-        // guarantee a value
-        ngModelOptions = ngModelCtrl.$options || {};
+        function extractOptions(ngModelCtrl) {
+          var ngModelOptions;
 
-        // mimic 1.6+ api
-        ngModelOptions.getOption = function (key) {
-          return ngModelOptions[key];
-        };
-      } else { // in angular >=1.6 $options is always present
-        ngModelOptions = ngModelCtrl.$options;
-      }
+          if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
+            // guarantee a value
+            ngModelOptions = ngModelCtrl.$options || {};
+
+            // mimic 1.6+ api
+            ngModelOptions.getOption = function (key) {
+              return ngModelOptions[key];
+            };
+          } else { // in angular >=1.6 $options is always present
+            ngModelOptions = ngModelCtrl.$options;
+          }
+
+          return ngModelOptions;
+        }
 
-      return ngModelOptions;
-    }
   }])
 
   .directive('uibTypeahead', function() {
diff --git a/ui-bootstrap.js b/ui-bootstrap.js
index bcc1a32..5ce033c 100644
--- a/ui-bootstrap.js
+++ b/ui-bootstrap.js
@@ -2,7 +2,7 @@
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/
 
- * Version: 2.5.4 - 2018-09-14
+ * Version: 2.5.4 - 2018-09-20
  * License: MIT
  */angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
 angular.module('ui.bootstrap.collapse', [])
@@ -6740,46 +6740,78 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
   .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser', '$scope', '$interpolate',
     function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser, $scope, $interpolate) {
-    var HOT_KEYS = [9, 13, 27, 38, 40];
-    var eventDebounceTime = 200;
-    var modelCtrl, ngModelOptions;
-    //SUPPORTED ATTRIBUTES (OPTIONS)
+      var minLength, isEditable;
 
-    //minimal no of characters that needs to be entered before typeahead kicks-in
-    var minLength = originalScope.$eval(attrs.typeaheadMinLength);
-    if (!minLength && minLength !== 0) {
-      minLength = 1;
-    }
+      var interpolateValue = function(value){
+        if(value){
+          return $interpolate(value)($scope);
+        }
+        return value;
+      };
+
+      var attributesToInterpolate = [
+        'typeaheadMinLength', 'typeaheadEditable', 'typeaheadWaitMs', 'typeaheadOnSelect', 'typeaheadLoading', 'typeaheadAppendTo',
+        'typeaheadShowHint', 'typeaheadIsOpen', 'typeaheadSelectOnExact', 'typeaheadFocusFirst', 'typeaheadFocusOnSelect',
+        'typeaheadPopupTemplateUrl', 'typeaheadTemplateUrl', 'uibTypeahead', 'ngModel', 'typeaheadSelectOnBlur'
+      ];
+
+      angular.forEach(attributesToInterpolate, function(attribute){
+        attrs[attribute] = interpolateValue(attrs[attribute]);
+      });
+
+       $scope.init = function() {
+
+          originalScope.$watch(attrs.typeaheadMinLength, function (newValue) {
+            var newVal = interpolateValue(newValue);
+            minLength = !newVal && newVal !== 0 ? 1 : newVal;
+          });
+
+          originalScope.$watch(attrs.typeaheadEditable, function (newValue) {
+            var newVal = interpolateValue(newValue);
+            isEditable = newVal !== false;
+          });
+      };
+
+        var HOT_KEYS = [9, 13, 27, 38, 40];
+        var eventDebounceTime = 200;
+        var modelCtrl, ngModelOptions;
+        //SUPPORTED ATTRIBUTES (OPTIONS)
+
+        //minimal no of characters that needs to be entered before typeahead kicks-in
+        minLength = originalScope.$eval(attrs.typeaheadMinLength);
+        if (!minLength && minLength !== 0) {
+          minLength = 1;
+        }
 
     originalScope.$watch(attrs.typeaheadMinLength, function (newVal) {
         minLength = !newVal && newVal !== 0 ? 1 : newVal;
     });
 
-    //minimal wait time after last character typed before typeahead kicks-in
+        //minimal wait time after last character typed before typeahead kicks-in
     var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
 
-    //should it restrict model values to the ones selected from the popup only?
-    var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+        //should it restrict model values to the ones selected from the popup only?
+    isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
     originalScope.$watch(attrs.typeaheadEditable, function (newVal) {
       isEditable = newVal !== false;
     });
 
-    //binding to a variable that indicates if matches are being retrieved asynchronously
+        //binding to a variable that indicates if matches are being retrieved asynchronously
     var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
 
-    //a function to determine if an event should cause selection
+        //a function to determine if an event should cause selection
     var isSelectEvent = attrs.typeaheadShouldSelect ? $parse(attrs.typeaheadShouldSelect) : function(scope, vals) {
-      var evt = vals.$event;
-      return evt.which === 13 || evt.which === 9;
-    };
+          var evt = vals.$event;
+          return evt.which === 13 || evt.which === 9;
+        };
 
-    //a callback executed when a match is selected
+        //a callback executed when a match is selected
     var onSelectCallback = $parse(attrs.typeaheadOnSelect);
 
-    //should it select highlighted popup value when losing focus?
+        //should it select highlighted popup value when losing focus?
     var isSelectOnBlur = angular.isDefined(attrs.typeaheadSelectOnBlur) ? originalScope.$eval(attrs.typeaheadSelectOnBlur) : false;
 
-    //binding to a variable that indicates if there were no results after the query is completed
+        //binding to a variable that indicates if there were no results after the query is completed
     var isNoResultsSetter = $parse(attrs.typeaheadNoResults).assign || angular.noop;
 
     var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
@@ -6791,127 +6823,129 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
 
     var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
 
-    //If input matches an item of the list exactly, select it automatically
+        //If input matches an item of the list exactly, select it automatically
     var selectOnExact = attrs.typeaheadSelectOnExact ? originalScope.$eval(attrs.typeaheadSelectOnExact) : false;
 
-    //binding to a variable that indicates if dropdown is open
+        //binding to a variable that indicates if dropdown is open
     var isOpenSetter = $parse(attrs.typeaheadIsOpen).assign || angular.noop;
 
     var showHint = originalScope.$eval(attrs.typeaheadShowHint) || false;
 
-    //INTERNAL VARIABLES
+        //INTERNAL VARIABLES
 
-    //model setter executed upon match selection
+        //model setter executed upon match selection
     var parsedModel = $parse(attrs.ngModel);
     var invokeModelSetter = $parse(attrs.ngModel + '($$$p)');
-    var $setModelValue = function(scope, newValue) {
-      if (angular.isFunction(parsedModel(originalScope)) &&
-        ngModelOptions.getOption('getterSetter')) {
-        return invokeModelSetter(scope, {$$$p: newValue});
-      }
+        var $setModelValue = function (scope, newValue) {
+          if (angular.isFunction(parsedModel(originalScope)) &&
+            ngModelOptions.getOption('getterSetter')) {
+            return invokeModelSetter(scope, {$$$p: newValue});
+          }
 
-      return parsedModel.assign(scope, newValue);
-    };
+          return parsedModel.assign(scope, newValue);
+        };
 
-    //expressions used by typeahead
-      var getParserResult = function() {
-        return typeaheadParser.parse($interpolate(attrs.uibTypeahead)($scope));
-      };
 
-    var hasFocus;
 
-    //Used to avoid bug in iOS webview where iOS keyboard does not fire
-    //mousedown & mouseup events
-    //Issue #3699
-    var selected;
+        //expressions used by typeahead
+        var getParserResult = function () {
+          return typeaheadParser.parse(attrs.uibTypeahead);
+        };
 
-    //create a child scope for the typeahead directive so we are not polluting original scope
-    //with typeahead-specific data (matches, query etc.)
-    var scope = originalScope.$new();
-    var offDestroy = originalScope.$on('$destroy', function() {
-      scope.$destroy();
-    });
-    scope.$on('$destroy', offDestroy);
-
-    // WAI-ARIA
-    var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
-    element.attr({
-      'aria-autocomplete': 'list',
-      'aria-expanded': false,
-      'aria-owns': popupId
-    });
+        var hasFocus;
 
-    var inputsContainer, hintInputElem;
-    //add read-only input to show hint
-    if (showHint) {
-      inputsContainer = angular.element('<div></div>');
-      inputsContainer.css('position', 'relative');
-      element.after(inputsContainer);
-      hintInputElem = element.clone();
-      hintInputElem.attr('placeholder', '');
-      hintInputElem.attr('tabindex', '-1');
-      hintInputElem.val('');
-      hintInputElem.css({
-        'position': 'absolute',
-        'top': '0px',
-        'left': '0px',
-        'border-color': 'transparent',
-        'box-shadow': 'none',
-        'opacity': 1,
-        'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
-        'color': '#999'
-      });
-      element.css({
-        'position': 'relative',
-        'vertical-align': 'top',
-        'background-color': 'transparent'
-      });
+        //Used to avoid bug in iOS webview where iOS keyboard does not fire
+        //mousedown & mouseup events
+        //Issue #3699
+        var selected;
 
-      if (hintInputElem.attr('id')) {
-        hintInputElem.removeAttr('id'); // remove duplicate id if present.
-      }
-      inputsContainer.append(hintInputElem);
-      hintInputElem.after(element);
-    }
-
-    //pop-up element used to display matches
-    var popUpEl = angular.element('<div uib-typeahead-popup></div>');
-    popUpEl.attr({
-      id: popupId,
-      matches: 'matches',
-      active: 'activeIdx',
-      select: 'select(activeIdx, evt)',
-      'move-in-progress': 'moveInProgress',
-      query: 'query',
-      position: 'position',
-      'assign-is-open': 'assignIsOpen(isOpen)',
-      debounce: 'debounceUpdate'
-    });
-    //custom item template
+        //create a child scope for the typeahead directive so we are not polluting original scope
+        //with typeahead-specific data (matches, query etc.)
+        var scope = originalScope.$new();
+        var offDestroy = originalScope.$on('$destroy', function () {
+          scope.$destroy();
+        });
+        scope.$on('$destroy', offDestroy);
+
+        // WAI-ARIA
+        var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+        element.attr({
+          'aria-autocomplete': 'list',
+          'aria-expanded': false,
+          'aria-owns': popupId
+        });
+
+        var inputsContainer, hintInputElem;
+        //add read-only input to show hint
+        if (showHint) {
+          inputsContainer = angular.element('<div></div>');
+          inputsContainer.css('position', 'relative');
+          element.after(inputsContainer);
+          hintInputElem = element.clone();
+          hintInputElem.attr('placeholder', '');
+          hintInputElem.attr('tabindex', '-1');
+          hintInputElem.val('');
+          hintInputElem.css({
+            'position': 'absolute',
+            'top': '0px',
+            'left': '0px',
+            'border-color': 'transparent',
+            'box-shadow': 'none',
+            'opacity': 1,
+            'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
+            'color': '#999'
+          });
+          element.css({
+            'position': 'relative',
+            'vertical-align': 'top',
+            'background-color': 'transparent'
+          });
+
+          if (hintInputElem.attr('id')) {
+            hintInputElem.removeAttr('id'); // remove duplicate id if present.
+          }
+          inputsContainer.append(hintInputElem);
+          hintInputElem.after(element);
+        }
+
+        //pop-up element used to display matches
+        var popUpEl = angular.element('<div uib-typeahead-popup></div>');
+        popUpEl.attr({
+          id: popupId,
+          matches: 'matches',
+          active: 'activeIdx',
+          select: 'select(activeIdx, evt)',
+          'move-in-progress': 'moveInProgress',
+          query: 'query',
+          position: 'position',
+          'assign-is-open': 'assignIsOpen(isOpen)',
+          debounce: 'debounceUpdate'
+        });
+        //custom item template
     if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
       popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
-    }
+        }
 
     if (angular.isDefined(attrs.typeaheadPopupTemplateUrl)) {
       popUpEl.attr('popup-template-url', attrs.typeaheadPopupTemplateUrl);
-    }
+        }
 
-    var resetHint = function() {
-      if (showHint) {
-        hintInputElem.val('');
-      }
-    };
+      var resetHint = function () {
+          if (showHint) {
+            hintInputElem.val('');
+          }
+        };
 
-    var resetMatches = function() {
-      scope.matches = [];
-      scope.activeIdx = -1;
-      element.attr('aria-expanded', false);
-      resetHint();
-    };
+        var resetMatches = function () {
+          scope.matches = [];
+          scope.activeIdx = -1;
+          element.attr('aria-expanded', false);
+          resetHint();
+        };
 
-    var getMatchId = function(index) {
-      return popupId + '-option-' + index;
-    };
+        var getMatchId = function (index) {
+          return popupId + '-option-' + index;
+        };
 
     // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
     // This attribute is added or removed automatically when the `activeIdx` changes.
@@ -6923,386 +6957,390 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       }
     });
 
-    var inputIsExactMatch = function(inputValue, index) {
-      if (scope.matches.length > index && inputValue) {
-        return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
-      }
+        var inputIsExactMatch = function (inputValue, index) {
+          if (scope.matches.length > index && inputValue) {
+            return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
+          }
 
-      return false;
-    };
+          return false;
+        };
 
-    var getMatchesAsync = function(inputValue, evt) {
-      var locals = {$viewValue: inputValue};
-      isLoadingSetter(originalScope, true);
-      isNoResultsSetter(originalScope, false);
-        $q.when(getParserResult().source(originalScope, locals)).then(function(matches) {
-        //it might happen that several async queries were in progress if a user were typing fast
-        //but we are interested only in responses that correspond to the current view value
-        var onCurrentRequest = inputValue === modelCtrl.$viewValue;
-        if (onCurrentRequest && hasFocus) {
-          if (matches && matches.length > 0) {
-            scope.activeIdx = focusFirst ? 0 : -1;
-            isNoResultsSetter(originalScope, false);
-            scope.matches.length = 0;
-
-            //transform labels
-            for (var i = 0; i < matches.length; i++) {
-                locals[getParserResult().itemName] = matches[i];
-              scope.matches.push({
-                id: getMatchId(i),
-                  label: getParserResult().viewMapper(scope, locals),
-                model: matches[i]
-              });
-            }
+        var getMatchesAsync = function (inputValue, evt) {
+          var locals = {$viewValue: inputValue};
+          isLoadingSetter(originalScope, true);
+          isNoResultsSetter(originalScope, false);
+          $q.when(getParserResult().source(originalScope, locals)).then(function (matches) {
+            //it might happen that several async queries were in progress if a user were typing fast
+            //but we are interested only in responses that correspond to the current view value
+            var onCurrentRequest = inputValue === modelCtrl.$viewValue;
+            if (onCurrentRequest && hasFocus) {
+              if (matches && matches.length > 0) {
+                scope.activeIdx = focusFirst ? 0 : -1;
+                isNoResultsSetter(originalScope, false);
+                scope.matches.length = 0;
+
+                //transform labels
+                for (var i = 0; i < matches.length; i++) {
+                  locals[getParserResult().itemName] = matches[i];
+                  scope.matches.push({
+                    id: getMatchId(i),
+                    label: getParserResult().viewMapper(scope, locals),
+                    model: matches[i]
+                  });
+                }
 
-            scope.query = inputValue;
-            //position pop-up with matches - we need to re-calculate its position each time we are opening a window
-            //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
-            //due to other elements being rendered
-            recalculatePosition();
+                scope.query = inputValue;
+                //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+                //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+                //due to other elements being rendered
+                recalculatePosition();
 
-            element.attr('aria-expanded', true);
+                element.attr('aria-expanded', true);
 
-            //Select the single remaining option if user input matches
-            if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
-              if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
-                $$debounce(function() {
-                  scope.select(0, evt);
-                }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
-              } else {
-                scope.select(0, evt);
-              }
-            }
+                //Select the single remaining option if user input matches
+                if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
+                  if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                    $$debounce(function () {
+                      scope.select(0, evt);
+                    }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                  } else {
+                    scope.select(0, evt);
+                  }
+                }
 
-            if (showHint) {
-              var firstLabel = scope.matches[0].label;
-              if (angular.isString(inputValue) &&
-                inputValue.length > 0 &&
-                firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
-                hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+                if (showHint) {
+                  var firstLabel = scope.matches[0].label;
+                  if (angular.isString(inputValue) &&
+                    inputValue.length > 0 &&
+                    firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
+                    hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+                  } else {
+                    hintInputElem.val('');
+                  }
+                }
               } else {
-                hintInputElem.val('');
+                resetMatches();
+                isNoResultsSetter(originalScope, true);
               }
             }
-          } else {
+            if (onCurrentRequest) {
+              isLoadingSetter(originalScope, false);
+            }
+          }, function () {
             resetMatches();
+            isLoadingSetter(originalScope, false);
             isNoResultsSetter(originalScope, true);
-          }
-        }
-        if (onCurrentRequest) {
-          isLoadingSetter(originalScope, false);
+          });
+        };
+
+        // bind events only if appendToBody params exist - performance feature
+        if (appendToBody) {
+          angular.element($window).on('resize', fireRecalculating);
+          $document.find('body').on('scroll', fireRecalculating);
         }
-      }, function() {
-        resetMatches();
-        isLoadingSetter(originalScope, false);
-        isNoResultsSetter(originalScope, true);
-      });
-    };
 
-    // bind events only if appendToBody params exist - performance feature
-    if (appendToBody) {
-      angular.element($window).on('resize', fireRecalculating);
-      $document.find('body').on('scroll', fireRecalculating);
-    }
+        // Declare the debounced function outside recalculating for
+        // proper debouncing
+        var debouncedRecalculate = $$debounce(function () {
+          // if popup is visible
+          if (scope.matches.length) {
+            recalculatePosition();
+          }
 
-    // Declare the debounced function outside recalculating for
-    // proper debouncing
-    var debouncedRecalculate = $$debounce(function() {
-      // if popup is visible
-      if (scope.matches.length) {
-        recalculatePosition();
-      }
+          scope.moveInProgress = false;
+        }, eventDebounceTime);
 
-      scope.moveInProgress = false;
-    }, eventDebounceTime);
+        // Default progress type
+        scope.moveInProgress = false;
 
-    // Default progress type
-    scope.moveInProgress = false;
+        function fireRecalculating() {
+          if (!scope.moveInProgress) {
+            scope.moveInProgress = true;
+            scope.$digest();
+          }
 
-    function fireRecalculating() {
-      if (!scope.moveInProgress) {
-        scope.moveInProgress = true;
-        scope.$digest();
-      }
+          debouncedRecalculate();
+        }
 
-      debouncedRecalculate();
-    }
+        // recalculate actual position and set new values to scope
+        // after digest loop is popup in right position
+        function recalculatePosition() {
+          scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+          scope.position.top += element.prop('offsetHeight');
+        }
 
-    // recalculate actual position and set new values to scope
-    // after digest loop is popup in right position
-    function recalculatePosition() {
-      scope.position = appendToBody ? $position.offset(element) : $position.position(element);
-      scope.position.top += element.prop('offsetHeight');
-    }
+        //we need to propagate user's query so we can higlight matches
+        scope.query = undefined;
 
-    //we need to propagate user's query so we can higlight matches
-    scope.query = undefined;
+        //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+        var timeoutPromise;
 
-    //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
-    var timeoutPromise;
+        var scheduleSearchWithTimeout = function (inputValue) {
+          timeoutPromise = $timeout(function () {
+            getMatchesAsync(inputValue);
+          }, waitTime);
+        };
 
-    var scheduleSearchWithTimeout = function(inputValue) {
-      timeoutPromise = $timeout(function() {
-        getMatchesAsync(inputValue);
-      }, waitTime);
-    };
+        var cancelPreviousTimeout = function () {
+          if (timeoutPromise) {
+            $timeout.cancel(timeoutPromise);
+          }
+        };
 
-    var cancelPreviousTimeout = function() {
-      if (timeoutPromise) {
-        $timeout.cancel(timeoutPromise);
-      }
-    };
+        resetMatches();
 
-    resetMatches();
+        scope.assignIsOpen = function (isOpen) {
+          isOpenSetter(originalScope, isOpen);
+        };
 
-    scope.assignIsOpen = function (isOpen) {
-      isOpenSetter(originalScope, isOpen);
-    };
+        scope.select = function (activeIdx, evt) {
+          //called from within the $digest() cycle
+          var locals = {};
+          var model, item;
 
-    scope.select = function(activeIdx, evt) {
-      //called from within the $digest() cycle
-      var locals = {};
-      var model, item;
-
-      selected = true;
-        locals[getParserResult().itemName] = item = scope.matches[activeIdx].model;
-        model = getParserResult().modelMapper(originalScope, locals);
-      $setModelValue(originalScope, model);
-      modelCtrl.$setValidity('editable', true);
-      modelCtrl.$setValidity('parse', true);
-
-      onSelectCallback(originalScope, {
-        $item: item,
-        $model: model,
-        $label: getParserResult().viewMapper(originalScope, locals),
-        $event: evt
-      });
+          selected = true;
+          locals[getParserResult().itemName] = item = scope.matches[activeIdx].model;
+          model = getParserResult().modelMapper(originalScope, locals);
+          $setModelValue(originalScope, model);
+          modelCtrl.$setValidity('editable', true);
+          modelCtrl.$setValidity('parse', true);
 
-      resetMatches();
+          onSelectCallback(originalScope, {
+            $item: item,
+            $model: model,
+            $label: getParserResult().viewMapper(originalScope, locals),
+            $event: evt
+          });
+
+          resetMatches();
 
-      //return focus to the input element if a match was selected via a mouse click event
-      // use timeout to avoid $rootScope:inprog error
+          //return focus to the input element if a match was selected via a mouse click event
+          // use timeout to avoid $rootScope:inprog error
       if (scope.$eval(attrs.typeaheadFocusOnSelect) !== false) {
-        $timeout(function() { element[0].focus(); }, 0, false);
-      }
-    };
+            $timeout(function () {
+              element[0].focus();
+            }, 0, false);
+          }
+        };
 
-    //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
-    element.on('keydown', function(evt) {
-      //typeahead is open and an "interesting" key was pressed
-      if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
-        return;
-      }
+        //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+        element.on('keydown', function (evt) {
+          //typeahead is open and an "interesting" key was pressed
+          if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+            return;
+          }
 
-      var shouldSelect = isSelectEvent(originalScope, {$event: evt});
+          var shouldSelect = isSelectEvent(originalScope, {$event: evt});
 
-      /**
-       * if there's nothing selected (i.e. focusFirst) and enter or tab is hit
-       * or
-       * shift + tab is pressed to bring focus to the previous element
-       * then clear the results
-       */
-      if (scope.activeIdx === -1 && shouldSelect || evt.which === 9 && !!evt.shiftKey) {
-        resetMatches();
-        scope.$digest();
-        return;
-      }
+          /**
+           * if there's nothing selected (i.e. focusFirst) and enter or tab is hit
+           * or
+           * shift + tab is pressed to bring focus to the previous element
+           * then clear the results
+           */
+          if (scope.activeIdx === -1 && shouldSelect || evt.which === 9 && !!evt.shiftKey) {
+            resetMatches();
+            scope.$digest();
+            return;
+          }
 
-      evt.preventDefault();
-      var target;
-      switch (evt.which) {
-        case 27: // escape
-          evt.stopPropagation();
+          evt.preventDefault();
+          var target;
+          switch (evt.which) {
+            case 27: // escape
+              evt.stopPropagation();
 
-          resetMatches();
-          originalScope.$digest();
-          break;
-        case 38: // up arrow
-          scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
-          scope.$digest();
-          target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
-          target.parentNode.scrollTop = target.offsetTop;
-          break;
-        case 40: // down arrow
-          scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
-          scope.$digest();
-          target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
-          target.parentNode.scrollTop = target.offsetTop;
-          break;
-        default:
-          if (shouldSelect) {
-            scope.$apply(function() {
-              if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
-                $$debounce(function() {
+              resetMatches();
+              originalScope.$digest();
+              break;
+            case 38: // up arrow
+              scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+              scope.$digest();
+              target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
+              target.parentNode.scrollTop = target.offsetTop;
+              break;
+            case 40: // down arrow
+              scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+              scope.$digest();
+              target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
+              target.parentNode.scrollTop = target.offsetTop;
+              break;
+            default:
+              if (shouldSelect) {
+                scope.$apply(function () {
+                  if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                    $$debounce(function () {
+                      scope.select(scope.activeIdx, evt);
+                    }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                  } else {
+                    scope.select(scope.activeIdx, evt);
+                  }
+                });
+              }
+          }
+        });
+
+        element.on('focus', function (evt) {
+          hasFocus = true;
+          if (minLength === 0 && !modelCtrl.$viewValue) {
+            $timeout(function () {
+              getMatchesAsync(modelCtrl.$viewValue, evt);
+            }, 0);
+          }
+        });
+
+        element.on('blur', function (evt) {
+          if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
+            selected = true;
+            scope.$apply(function () {
+              if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
+                $$debounce(function () {
                   scope.select(scope.activeIdx, evt);
-                }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                }, scope.debounceUpdate.blur);
               } else {
                 scope.select(scope.activeIdx, evt);
               }
             });
           }
-      }
-    });
-
-    element.on('focus', function (evt) {
-      hasFocus = true;
-      if (minLength === 0 && !modelCtrl.$viewValue) {
-        $timeout(function() {
-          getMatchesAsync(modelCtrl.$viewValue, evt);
-        }, 0);
-      }
-    });
-
-    element.on('blur', function(evt) {
-      if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
-        selected = true;
-        scope.$apply(function() {
-          if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
-            $$debounce(function() {
-              scope.select(scope.activeIdx, evt);
-            }, scope.debounceUpdate.blur);
-          } else {
-            scope.select(scope.activeIdx, evt);
+          if (!isEditable && modelCtrl.$error.editable) {
+            modelCtrl.$setViewValue();
+            scope.$apply(function () {
+              // Reset validity as we are clearing
+              modelCtrl.$setValidity('editable', true);
+              modelCtrl.$setValidity('parse', true);
+            });
+            element.val('');
           }
+          hasFocus = false;
+          selected = false;
         });
-      }
-      if (!isEditable && modelCtrl.$error.editable) {
-        modelCtrl.$setViewValue();
-        scope.$apply(function() {
-          // Reset validity as we are clearing
-          modelCtrl.$setValidity('editable', true);
-          modelCtrl.$setValidity('parse', true);
-        });
-        element.val('');
-      }
-      hasFocus = false;
-      selected = false;
-    });
 
-    // Keep reference to click handler to unbind it.
-    var dismissClickHandler = function(evt) {
-      // Issue #3973
-      // Firefox treats right click as a click on document
-      if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
-        resetMatches();
-        if (!$rootScope.$$phase) {
-          originalScope.$digest();
-        }
-      }
-    };
+        // Keep reference to click handler to unbind it.
+        var dismissClickHandler = function (evt) {
+          // Issue #3973
+          // Firefox treats right click as a click on document
+          if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
+            resetMatches();
+            if (!$rootScope.$$phase) {
+              originalScope.$digest();
+            }
+          }
+        };
 
-    $document.on('click', dismissClickHandler);
+        $document.on('click', dismissClickHandler);
 
-    originalScope.$on('$destroy', function() {
-      $document.off('click', dismissClickHandler);
-      if (appendToBody || appendTo) {
-        $popup.remove();
-      }
+        originalScope.$on('$destroy', function () {
+          $document.off('click', dismissClickHandler);
+          if (appendToBody || appendTo) {
+            $popup.remove();
+          }
 
-      if (appendToBody) {
-        angular.element($window).off('resize', fireRecalculating);
-        $document.find('body').off('scroll', fireRecalculating);
-      }
-      // Prevent jQuery cache memory leak
-      popUpEl.remove();
+          if (appendToBody) {
+            angular.element($window).off('resize', fireRecalculating);
+            $document.find('body').off('scroll', fireRecalculating);
+          }
+          // Prevent jQuery cache memory leak
+          popUpEl.remove();
 
-      if (showHint) {
-          inputsContainer.remove();
-      }
-    });
+          if (showHint) {
+            inputsContainer.remove();
+          }
+        });
 
-    var $popup = $compile(popUpEl)(scope);
+        var $popup = $compile(popUpEl)(scope);
 
-    if (appendToBody) {
-      $document.find('body').append($popup);
-    } else if (appendTo) {
-      angular.element(appendTo).eq(0).append($popup);
-    } else {
-      element.after($popup);
-    }
+        if (appendToBody) {
+          $document.find('body').append($popup);
+        } else if (appendTo) {
+          angular.element(appendTo).eq(0).append($popup);
+        } else {
+          element.after($popup);
+        }
 
-    this.init = function(_modelCtrl) {
-      modelCtrl = _modelCtrl;
-      ngModelOptions = extractOptions(modelCtrl);
 
-      scope.debounceUpdate = $parse(ngModelOptions.getOption('debounce'))(originalScope);
+        this.init = function (_modelCtrl) {
+          modelCtrl = _modelCtrl;
+          ngModelOptions = extractOptions(modelCtrl);
 
-      //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
-      //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
-      modelCtrl.$parsers.unshift(function(inputValue) {
-        hasFocus = true;
+          scope.debounceUpdate = $parse(ngModelOptions.getOption('debounce'))(originalScope);
 
-        if (minLength === 0 || inputValue && inputValue.length >= minLength) {
-          if (waitTime > 0) {
-            cancelPreviousTimeout();
-            scheduleSearchWithTimeout(inputValue);
-          } else {
-            getMatchesAsync(inputValue);
-          }
-        } else {
-          isLoadingSetter(originalScope, false);
-          cancelPreviousTimeout();
-          resetMatches();
-        }
+          //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+          //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+          modelCtrl.$parsers.unshift(function (inputValue) {
+            hasFocus = true;
 
-        if (isEditable) {
-          return inputValue;
-        }
+            if (minLength === 0 || inputValue && inputValue.length >= minLength) {
+              if (waitTime > 0) {
+                cancelPreviousTimeout();
+                scheduleSearchWithTimeout(inputValue);
+              } else {
+                getMatchesAsync(inputValue);
+              }
+            } else {
+              isLoadingSetter(originalScope, false);
+              cancelPreviousTimeout();
+              resetMatches();
+            }
 
-        if (!inputValue) {
-          // Reset in case user had typed something previously.
-          modelCtrl.$setValidity('editable', true);
-          return null;
-        }
+            if (isEditable) {
+              return inputValue;
+            }
 
-        modelCtrl.$setValidity('editable', false);
-        return undefined;
-      });
+            if (!inputValue) {
+              // Reset in case user had typed something previously.
+              modelCtrl.$setValidity('editable', true);
+              return null;
+            }
 
-      modelCtrl.$formatters.push(function(modelValue) {
-        var candidateViewValue, emptyViewValue;
-        var locals = {};
+            modelCtrl.$setValidity('editable', false);
+            return undefined;
+          });
 
-        // The validity may be set to false via $parsers (see above) if
-        // the model is restricted to selected values. If the model
-        // is set manually it is considered to be valid.
-        if (!isEditable) {
-          modelCtrl.$setValidity('editable', true);
-        }
+          modelCtrl.$formatters.push(function (modelValue) {
+            var candidateViewValue, emptyViewValue;
+            var locals = {};
 
-        if (inputFormatter) {
-          locals.$model = modelValue;
-          return inputFormatter(originalScope, locals);
-        }
+            // The validity may be set to false via $parsers (see above) if
+            // the model is restricted to selected values. If the model
+            // is set manually it is considered to be valid.
+            if (!isEditable) {
+              modelCtrl.$setValidity('editable', true);
+            }
 
-        //it might happen that we don't have enough info to properly render input value
-        //we need to check for this situation and simply return model value if we can't apply custom formatting
-          locals[getParserResult().itemName] = modelValue;
-          candidateViewValue = getParserResult().viewMapper(originalScope, locals);
-          locals[getParserResult().itemName] = undefined;
-          emptyViewValue = getParserResult().viewMapper(originalScope, locals);
+            if (inputFormatter) {
+              locals.$model = modelValue;
+              return inputFormatter(originalScope, locals);
+            }
 
-        return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
-      });
-    };
+            //it might happen that we don't have enough info to properly render input value
+            //we need to check for this situation and simply return model value if we can't apply custom formatting
+            locals[getParserResult().itemName] = modelValue;
+            candidateViewValue = getParserResult().viewMapper(originalScope, locals);
+            locals[getParserResult().itemName] = undefined;
+            emptyViewValue = getParserResult().viewMapper(originalScope, locals);
 
-    function extractOptions(ngModelCtrl) {
-      var ngModelOptions;
+            return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
+          });
+        };
 
-      if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
-        // guarantee a value
-        ngModelOptions = ngModelCtrl.$options || {};
+        function extractOptions(ngModelCtrl) {
+          var ngModelOptions;
 
-        // mimic 1.6+ api
-        ngModelOptions.getOption = function (key) {
-          return ngModelOptions[key];
-        };
-      } else { // in angular >=1.6 $options is always present
-        ngModelOptions = ngModelCtrl.$options;
-      }
+          if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
+            // guarantee a value
+            ngModelOptions = ngModelCtrl.$options || {};
+
+            // mimic 1.6+ api
+            ngModelOptions.getOption = function (key) {
+              return ngModelOptions[key];
+            };
+          } else { // in angular >=1.6 $options is always present
+            ngModelOptions = ngModelCtrl.$options;
+          }
+
+          return ngModelOptions;
+        }
 
-      return ngModelOptions;
-    }
   }])
 
   .directive('uibTypeahead', function() {