Merge remote-tracking branch 'origin/issue-2884' into issue-2884

karma.conf.js

@@ -18,6 +18,7 @@ module.exports = function(config) {
       'misc/test-lib/jquery-1.8.2.min.js',
       'node_modules/angular/angular.js',
       'node_modules/angular-mocks/angular-mocks.js',
+      'node_modules/angular-sanitize/angular-sanitize.js',
       'misc/test-lib/helpers.js',
       'src/**/*.js',
       'template/**/*.js'

package.json

@@ -1,38 +1,37 @@
 {
   "author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
   "name": "angular-ui-bootstrap",
-  "version": "0.13.4-SNAPSHOT",
+  "version": "0.13.0-SNAPSHOT",
   "homepage": "http://angular-ui.github.io/bootstrap/",
   "dependencies": {},
-  "scripts":{
-    "test": "grunt"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular-ui/bootstrap.git"
   },
   "devDependencies": {
-    "angular": "^1.4.3",
-    "angular-mocks": "^1.4.3",
+    "angular": "^1.3.15",
+    "angular-mocks": "^1.3.15",
+    "angular-sanitize": "^1.3.15",
     "grunt": "^0.4.5",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-copy": "^0.8.0",
     "grunt-contrib-jshint": "^0.11.1",
-    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-contrib-uglify": "^0.8.0",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-conventional-changelog": "^3.0.0",
+    "grunt-conventional-changelog": "^1.1.0",
     "grunt-ddescribe-iit": "0.0.6",
     "grunt-html2js": "^0.3.0",
-    "grunt-karma": "^0.12.0",
+    "grunt-karma": "^0.10.1",
+    "grunt-ngdocs": "~0.1.1",
     "jasmine-core": "^2.2.0",
-    "karma": "^0.13.3",
-    "karma-chrome-launcher": "^0.2.0",
-    "karma-coverage": "^0.4.2",
+    "karma": "^0.12.31",
+    "karma-chrome-launcher": "^0.1.7",
+    "karma-coverage": "^0.2.7",
     "karma-firefox-launcher": "^0.1.4",
     "karma-jasmine": "^0.3.5",
     "node-markdown": "0.1.1",
-    "semver": "^5.0.1",
-    "shelljs": "^0.5.1"
+    "semver": "^4.3.3",
+    "shelljs": "^0.4.0"
   },
   "license": "MIT"
 }

template/typeahead/typeahead-match.html

@@ -1 +1 @@
-<a href tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>
+<a tabindex="-1" ng-bind-html="match.label | typeaheadHighlight:query"></a>