Skip to content

Commit 255e7ce

Browse files
mchapmanmchapman
committed
fix(build) Update Karma so that Travis CI will work again (hopefully)
1 parent 9d174f1 commit 255e7ce

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

‎dist/forms-angular.js

Lines changed: 1 addition & 4 deletions
Large diffs are not rendered by default.

‎dist/forms-angular.min.js

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/forms-angular.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/controllers/nav.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module fng.controllers {
2020
];
2121

2222
$scope.markupShortcut = function(keys) {
23-
return '<span class="key">' + keys.split('+').join('</span><span class="key">') + '</span>';
23+
return '<span class="key">' + keys.split('+').join('</span> + <span class="key">') + '</span>';
2424
};
2525

2626
$scope.globalShortcuts = function (event) {

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"gulp-tsc": "1.1.1",
5353
"gulp-umd": "0.2.0",
5454
"jasmine-core": "2.3.4",
55-
"karma": "0.13.11",
55+
"karma": "0.13.19",
5656
"karma-jasmine": "0.3.6",
5757
"karma-junit-reporter": "0.3.7",
5858
"karma-ng-html2js-preprocessor": "0.2.0",

0 commit comments

Comments
 (0)