From 4588c5a19a087540cbe4d943bf83ec81cba7c73d Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Tue, 13 Oct 2015 12:29:42 +0900 Subject: [PATCH] pass dateMath to ScriptedDashboard script --- public/app/features/dashboard/dashboardLoaderSrv.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/app/features/dashboard/dashboardLoaderSrv.js b/public/app/features/dashboard/dashboardLoaderSrv.js index f2fc3c9c03f..85e6374e0a3 100644 --- a/public/app/features/dashboard/dashboardLoaderSrv.js +++ b/public/app/features/dashboard/dashboardLoaderSrv.js @@ -4,8 +4,9 @@ define([ 'lodash', 'jquery', 'kbn', + 'app/core/utils/datemath', ], -function (angular, moment, _, $, kbn) { +function (angular, moment, _, $, kbn, dateMath) { 'use strict'; var module = angular.module('grafana.services'); @@ -59,8 +60,8 @@ function (angular, moment, _, $, kbn) { }; /*jshint -W054 */ - var script_func = new Function('ARGS','kbn','_','moment','window','document','$','jQuery', 'services', result.data); - var script_result = script_func($routeParams, kbn, _ , moment, window, document, $, $, services); + var script_func = new Function('ARGS','kbn','dateMath','_','moment','window','document','$','jQuery', 'services', result.data); + var script_result = script_func($routeParams, kbn, dateMath, _ , moment, window, document, $, $, services); // Handle async dashboard scripts if (_.isFunction(script_result)) {