IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 00:25:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

pass dateMath to ScriptedDashboard script

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2015-10-13 12:29:42 +09:00
parent e873574e8c
commit 4588c5a19a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/dashboard/dashboardLoaderSrv.js
View File

@ -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)) {