diff --git a/src/app/app.js b/src/app/app.js index 046ec3ff35d..df42f7b14f9 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -14,7 +14,7 @@ define([ 'extend-jquery', 'bindonce', ], -function (angular, $, _, appLevelRequire, config) { +function (angular, $, _, appLevelRequire) { "use strict"; diff --git a/src/app/controllers/p_loginCtrl.js b/src/app/controllers/p_loginCtrl.js index c547fe885f8..1c729a843d7 100644 --- a/src/app/controllers/p_loginCtrl.js +++ b/src/app/controllers/p_loginCtrl.js @@ -1,9 +1,7 @@ define([ 'angular', - 'app', - 'lodash' ], -function (angular, app) { +function (angular) { 'use strict'; var module = angular.module('grafana.controllers'); @@ -17,7 +15,7 @@ function (angular, app) { return; } - $http.post('/login', $scope.loginModel).then(function(results) { + $http.post('/login', $scope.loginModel).then(function() { $location.path('/'); }, function(err) { if (err.status === 401) { diff --git a/src/app/panels/overview/module.js b/src/app/panels/overview/module.js index 0a3521a0566..1dbc7807a8c 100644 --- a/src/app/panels/overview/module.js +++ b/src/app/panels/overview/module.js @@ -36,19 +36,9 @@ function (angular, app, _, timeSeries) { _.defaults($scope.panel, _d); $scope.init = function() { - panelSrv.init(this); - - if (!$scope.skipDataOnInit) { - $scope.get_data(); - } - //$scope.$on('refresh', $scope.render); - //$scope.render(); }; $scope.get_data = function() { - delete $scope.panel.error; - $scope.panelMeta.loading = true; - $scope.rangeUnparsed = $scope.filter.timeRange(false); var metricsQuery = { @@ -101,7 +91,7 @@ function (angular, app, _, timeSeries) { $scope.openEditor = function() { }; - $scope.init(); + panelSrv.init($scope); }); });