From 6e6ebc59477503561c8f2da2a4f68559d1bb47fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 3 Apr 2016 09:43:33 -0400
Subject: [PATCH] trying to fix karma issue

---
 karma.conf.js                                    | 1 -
 package.json                                     | 4 ++--
 public/app/features/dashboard/dashnav/dashnav.ts | 9 +--------
 public/vendor/angular/.bower.json                | 2 +-
 public/vendor/angular/angular.js                 | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index cbb0abff7c6..dc082924b11 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -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',
 
diff --git a/package.json b/package.json
index 4b526f5a4f3..d741bab574e 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index 14dfa8cc67a..2d5b66cb13c 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -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;
diff --git a/public/vendor/angular/.bower.json b/public/vendor/angular/.bower.json
index b7b5e0bb59f..4221ce7cb09 100644
--- a/public/vendor/angular/.bower.json
+++ b/public/vendor/angular/.bower.json
@@ -13,6 +13,6 @@
     "commit": "5a07c5107b4d24f41744a02b07717d55bad88e70"
   },
   "_source": "git://github.com/angular/bower-angular.git",
-  "_target": "1.5.3",
+  "_target": "~1.5.3",
   "_originalSource": "angular"
 }
\ No newline at end of file
diff --git a/public/vendor/angular/angular.js b/public/vendor/angular/angular.js
index 9ef1f59c0b7..5e6fb2c363d 100644
--- a/public/vendor/angular/angular.js
+++ b/public/vendor/angular/angular.js
@@ -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>');
\ No newline at end of file