Merge branch 'v3.1.x'

This commit is contained in:
Torkel Ödegaard 2016-07-27 10:21:16 +02:00
commit e789d0df63

View File

@ -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();