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

Merge pull request #502 from spenceralger/fix-js-dashboards

Browse Source 
Fixed dashboard scripts
This commit is contained in:
spenceralger 2013-09-16 11:11:20 -07:00
commit efaff8405d
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/app/app.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/build.txt vendored
View File

@ -15,11 +15,12 @@ vendor/angular/angular-strap.js
app/components/extend-jquery.js
app/components/settings.js
app/services/alertSrv.js
app/components/kbn.js
vendor/moment.js
vendor/modernizr-2.6.1.js
app/services/dashboard.js
app/services/fields.js
app/services/filterSrv.js
vendor/moment.js
app/services/kbnIndex.js
app/services/querySrv.js
app/services/timer.js
@ -34,7 +35,6 @@ app/directives/dashUpload.js
app/directives/kibanaPanel.js
app/directives/ngBlur.js
app/directives/ngModelOnBlur.js
app/components/kbn.js
app/directives/tip.js
app/directives/all.js
app/filters/all.js

11
src/app/services/dashboard.js
View File

@ -1,10 +1,13 @@
define([
'angular',
'jquery',
'kbn',
'underscore',
'config',
'moment',
'modernizr'
],
function (angular, _, config, Modernizr) {
function (angular, $, kbn, _, config, moment, Modernizr) {
'use strict';
var module = angular.module('kibana.services');
@ -280,12 +283,12 @@ function (angular, _, config, Modernizr) {
this.script_load = function(file) {
return $http({
url: "dashboards/"+file,
url: "app/dashboards/"+file,
method: "GET",
transformResponse: function(response) {
/*jshint -W054 */
var _f = new Function("ARGS",response);
return _f($routeParams);
var _f = new Function('ARGS','kbn','_','moment','window','document','angular','require','define','$','jQuery',response);
return _f($routeParams,kbn,_,moment);
}
}).then(function(result) {
if(!result) {