IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

trying to fix karma issue

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-04-03 09:43:33 -04:00
parent b30b78e442
commit 6e6ebc5947
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
karma.conf.js
View File

@@ -9,7 +9,6 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'vendor/npm/es6-shim/es6-shim.js',
'vendor/npm/es6-promise/dist/es6-promise.js',
'vendor/npm/systemjs/dist/system.src.js',
'test/test-main.js',

4
package.json
View File

@@ -32,7 +32,7 @@
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^0.2.1",
"grunt-git-describe": "~2.3.2",
"grunt-karma": "~0.12.1",
"grunt-karma": "~0.12.2",
"grunt-ng-annotate": "^1.0.1",
"grunt-notify": "^0.4.3",
"grunt-postcss": "^0.8.0",
@@ -43,7 +43,7 @@
"grunt-typescript": "^0.8.0",
"grunt-usemin": "3.0.0",
"jshint-stylish": "~2.1.0",
"karma": "~0.13.15",
"karma": "0.13.22",
"karma-chrome-launcher": "~0.2.2",
"karma-coverage": "0.5.3",
"karma-coveralls": "1.1.2",

9
public/app/features/dashboard/dashnav/dashnav.ts
View File

@@ -7,7 +7,7 @@ import angular from 'angular';
export class DashNavCtrl {
/** @ngInject */
constructor($scope, $rootScope, alertSrv, $location, playlistSrv, backendSrv, contextSrv, $timeout) {
constructor($scope, $rootScope, alertSrv, $location, playlistSrv, backendSrv, $timeout) {
$scope.init = function() {
$scope.onAppEvent('save-dashboard', $scope.saveDashboard);
@@ -103,13 +103,6 @@ export class DashNavCtrl {
}, $scope.handleSaveDashError);
};
$scope.saveDashboardAsHome = function() {
// TODO: this backend method needs to be implemented
backendSrv.post('/api/preferences/set-home-dash', {
homeDashboardId: $scope.dashboard.id
});
};
$scope.handleSaveDashError = function(err) {
if (err.data && err.data.status === "version-mismatch") {
err.isHandled = true;

2
public/vendor/angular/.bower.json vendored
View File

@@ -13,6 +13,6 @@
"commit": "5a07c5107b4d24f41744a02b07717d55bad88e70"
},
"_source": "git://github.com/angular/bower-angular.git",
"_target": "1.5.3",
"_target": "~1.5.3",
"_originalSource": "angular"
}

2
public/vendor/angular/angular.js vendored
View File

@@ -30711,4 +30711,4 @@ $provide.value("$locale", {
})(window, document);
!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');