Commit efaff840 by spenceralger

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

Fixed dashboard scripts
parents 335462b5 ff50e6e7
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -15,11 +15,12 @@ vendor/angular/angular-strap.js ...@@ -15,11 +15,12 @@ vendor/angular/angular-strap.js
app/components/extend-jquery.js app/components/extend-jquery.js
app/components/settings.js app/components/settings.js
app/services/alertSrv.js app/services/alertSrv.js
app/components/kbn.js
vendor/moment.js
vendor/modernizr-2.6.1.js vendor/modernizr-2.6.1.js
app/services/dashboard.js app/services/dashboard.js
app/services/fields.js app/services/fields.js
app/services/filterSrv.js app/services/filterSrv.js
vendor/moment.js
app/services/kbnIndex.js app/services/kbnIndex.js
app/services/querySrv.js app/services/querySrv.js
app/services/timer.js app/services/timer.js
...@@ -34,7 +35,6 @@ app/directives/dashUpload.js ...@@ -34,7 +35,6 @@ app/directives/dashUpload.js
app/directives/kibanaPanel.js app/directives/kibanaPanel.js
app/directives/ngBlur.js app/directives/ngBlur.js
app/directives/ngModelOnBlur.js app/directives/ngModelOnBlur.js
app/components/kbn.js
app/directives/tip.js app/directives/tip.js
app/directives/all.js app/directives/all.js
app/filters/all.js app/filters/all.js
......
define([ define([
'angular', 'angular',
'jquery',
'kbn',
'underscore', 'underscore',
'config', 'config',
'moment',
'modernizr' 'modernizr'
], ],
function (angular, _, config, Modernizr) { function (angular, $, kbn, _, config, moment, Modernizr) {
'use strict'; 'use strict';
var module = angular.module('kibana.services'); var module = angular.module('kibana.services');
...@@ -280,12 +283,12 @@ function (angular, _, config, Modernizr) { ...@@ -280,12 +283,12 @@ function (angular, _, config, Modernizr) {
this.script_load = function(file) { this.script_load = function(file) {
return $http({ return $http({
url: "dashboards/"+file, url: "app/dashboards/"+file,
method: "GET", method: "GET",
transformResponse: function(response) { transformResponse: function(response) {
/*jshint -W054 */ /*jshint -W054 */
var _f = new Function("ARGS",response); var _f = new Function('ARGS','kbn','_','moment','window','document','angular','require','define','$','jQuery',response);
return _f($routeParams); return _f($routeParams,kbn,_,moment);
} }
}).then(function(result) { }).then(function(result) {
if(!result) { if(!result) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment