Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 844d376

Browse files
fix(typeahead): Rebased from master.
2 parents c56812e + d9bbf78 commit 844d376

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Diff for: karma.conf.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = function(config) {
1818
'misc/test-lib/jquery-1.8.2.min.js',
1919
'node_modules/angular/angular.js',
2020
'node_modules/angular-mocks/angular-mocks.js',
21+
'node_modules/angular-sanitize/angular-sanitize.js',
2122
'misc/test-lib/helpers.js',
2223
'src/**/*.js',
2324
'template/**/*.js'

Diff for: package.json

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
11
{
22
"author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
33
"name": "angular-ui-bootstrap",
4-
"version": "0.13.4-SNAPSHOT",
4+
"version": "0.13.0-SNAPSHOT",
55
"homepage": "http://angular-ui.github.io/bootstrap/",
66
"dependencies": {},
7-
"scripts":{
8-
"test": "grunt"
9-
},
107
"repository": {
118
"type": "git",
129
"url": "https://github.com/angular-ui/bootstrap.git"
1310
},
1411
"devDependencies": {
15-
"angular": "^1.4.3",
16-
"angular-mocks": "^1.4.3",
12+
"angular": "^1.3.15",
13+
"angular-mocks": "^1.3.15",
14+
"angular-sanitize": "^1.3.15",
1715
"grunt": "^0.4.5",
1816
"grunt-contrib-concat": "^0.5.1",
1917
"grunt-contrib-copy": "^0.8.0",
2018
"grunt-contrib-jshint": "^0.11.1",
21-
"grunt-contrib-uglify": "^0.9.1",
19+
"grunt-contrib-uglify": "^0.8.0",
2220
"grunt-contrib-watch": "^0.6.1",
23-
"grunt-conventional-changelog": "^3.0.0",
21+
"grunt-conventional-changelog": "^1.1.0",
2422
"grunt-ddescribe-iit": "0.0.6",
2523
"grunt-html2js": "^0.3.0",
26-
"grunt-karma": "^0.12.0",
24+
"grunt-karma": "^0.10.1",
25+
"grunt-ngdocs": "~0.1.1",
2726
"jasmine-core": "^2.2.0",
28-
"karma": "^0.13.3",
29-
"karma-chrome-launcher": "^0.2.0",
30-
"karma-coverage": "^0.4.2",
27+
"karma": "^0.12.31",
28+
"karma-chrome-launcher": "^0.1.7",
29+
"karma-coverage": "^0.2.7",
3130
"karma-firefox-launcher": "^0.1.4",
3231
"karma-jasmine": "^0.3.5",
3332
"node-markdown": "0.1.1",
34-
"semver": "^5.0.1",
35-
"shelljs": "^0.5.1"
33+
"semver": "^4.3.3",
34+
"shelljs": "^0.4.0"
3635
},
3736
"license": "MIT"
3837
}

Diff for: template/typeahead/typeahead-match.html

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

0 commit comments

Comments
 (0)