Merge branch 'v3.1.x'

e789d0df · Torkel Ödegaard · e8e84638 · 89dc3b88 · e789d0df
Commit e789d0df authored Jul 27, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

public/app/features/dashboard/timeSrv.js
+1 -1

No files found.
--- a/public/app/features/dashboard/timeSrv.js
+++ b/public/app/features/dashboard/timeSrv.js
@@ -13,7 +13,7 @@ define([
  module.service('timeSrv', function($rootScope, $timeout, $routeParams, timer) {
    var self = this;

-    $rootScope.onAppEvent('zoom-out', function(e, factor) { self.zoomOut(factor); }, $rootScope);
+    $rootScope.$on('zoom-out', function(e, factor) { self.zoomOut(factor); });

    this.init = function(dashboard) {
      timer.cancel_all();