Przeglądaj źródła

Fixed the loading of the dashboard scripts, feeding them the needed args and fixing the path that they are fetch from.

Spencer Alger 12 lat temu
rodzic
commit
ff50e6e753

Plik diff jest za duży
+ 1 - 1
dist/app/app.js


+ 1 - 1
dist/app/components/require.config.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 require.config({baseUrl:"app",paths:{config:"../config",settings:"components/settings",kbn:"components/kbn",css:"../vendor/require/css",text:"../vendor/require/text",moment:"../vendor/moment",filesaver:"../vendor/filesaver",angular:"../vendor/angular/angular","angular-strap":"../vendor/angular/angular-strap","angular-sanitize":"../vendor/angular/angular-sanitize",timepicker:"../vendor/angular/timepicker",datepicker:"../vendor/angular/datepicker",underscore:"components/underscore.extended","underscore-src":"../vendor/underscore",bootstrap:"../vendor/bootstrap/bootstrap",jquery:"../vendor/jquery/jquery-1.8.0","extend-jquery":"components/extend-jquery","jquery.flot":"../vendor/jquery/jquery.flot","jquery.flot.pie":"../vendor/jquery/jquery.flot.pie","jquery.flot.selection":"../vendor/jquery/jquery.flot.selection","jquery.flot.stack":"../vendor/jquery/jquery.flot.stack","jquery.flot.time":"../vendor/jquery/jquery.flot.time",modernizr:"../vendor/modernizr-2.6.1",elasticjs:"../vendor/elasticjs/elastic-angular-client"},shim:{underscore:{exports:"_"},angular:{deps:["jquery"],exports:"angular"},bootstrap:{deps:["jquery"]},modernizr:{exports:"Modernizr"},jquery:{exports:"jQuery"},"jquery.flot":["jquery"],"jquery.flot.pie":["jquery","jquery.flot"],"jquery.flot.selection":["jquery","jquery.flot"],"jquery.flot.stack":["jquery","jquery.flot"],"jquery.flot.time":["jquery","jquery.flot"],"angular-sanitize":["angular"],"angular-cookies":["angular"],"angular-loader":["angular"],"angular-mocks":["angular"],"angular-resource":["angular"],"angular-route":["angular"],"angular-touch":["angular"],"angular-strap":["angular","bootstrap","timepicker","datepicker"],timepicker:["jquery","bootstrap"],datepicker:["jquery","bootstrap"],elasticjs:["angular","../vendor/elasticjs/elastic"]}});

+ 1 - 1
dist/app/panels/bettermap/leaflet.amd.js

@@ -1,3 +1,3 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 

Plik diff jest za duży
+ 1 - 1
dist/app/panels/bettermap/leaflet/leaflet.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/bettermap/leaflet/plugins.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/bettermap/module.js


+ 1 - 1
dist/app/panels/column/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define("panels/column/module",["angular","app","underscore","config"],function(a,b,c,d){var e=a.module("kibana.panels.column",[]);b.useModule(e),e.controller("column",["$scope","$rootScope","$timeout",function(a,b,d){a.panelMeta={status:"Stable",description:"A pseudo panel that lets you add other panels to be arranged in a column withdefined heights."};var e={panels:[]};c.defaults(a.panel,e),a.init=function(){a.reset_panel()},a.toggle_row=function(b){b.collapse=b.collapse?!1:!0,b.collapse||d(function(){a.send_render()})},a.send_render=function(){a.$broadcast("render")},a.add_panel=function(b){a.panel.panels.push(b)},a.reset_panel=function(b){a.new_panel={loading:!1,error:!1,sizeable:!1,span:12,height:"150px",editable:!0,type:b}}}]),e.directive("columnEdit",["$compile","$timeout",function(b,d){return{scope:{new_panel:"=panel",row:"=",config:"=",dashboards:"=",type:"=type"},link:function(e,f){e.$on("render",function(){d(function(){e.panel=e.new_panel;var d="<div ng-include src=\"partial('panelgeneral')\"></div>";c.isUndefined(e.type)||""===e.type||(d=d+"<div ng-include src=\"'app/panels/"+e.type+"/editor.html'\"></div>"),f.html(b(a.element(d))(e))})})}}}]),e.filter("withoutColumn",function(){return function(){return c.without(d.panel_names,"column")}})});

Plik diff jest za duży
+ 1 - 1
dist/app/panels/dashcontrol/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/derivequeries/module.js


+ 1 - 1
dist/app/panels/fields/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define("panels/fields/module",["angular","app","underscore"],function(a,b,c){var d=a.module("kibana.panels.fields",[]);b.useModule(d),d.controller("fields",["$scope",function(a){a.panelMeta={status:"Deprecated",description:"You should not use this table, it does not work anymore. The table panel nowintegrates a field selector. This module will soon be removed."};var b={style:{},arrange:"vertical",micropanel_position:"right"};c.defaults(a.panel,b),a.init=function(){}}])});

+ 1 - 1
dist/app/panels/filtering/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define("panels/filtering/module",["angular","app","underscore"],function(a,b,c){var d=a.module("kibana.panels.filtering",[]);b.useModule(d),d.controller("filtering",["$scope","filterSrv","$rootScope","dashboard",function(a,b,d,e){a.panelMeta={status:"Beta",description:"A controllable list of all filters currently applied to the dashboard. You almost certainly want one of these on your dashboard somewhere."};var f={};c.defaults(a.panel,f),a.init=function(){a.filterSrv=b},a.remove=function(a){b.remove(a),e.refresh()},a.toggle=function(a){b.list[a].active=!b.list[a].active,e.refresh()},a.refresh=function(){d.$broadcast("refresh")},a.render=function(){d.$broadcast("render")},a.show_key=function(a){return!c.contains(["type","id","alias","mandate","active","editing"],a)},a.isEditable=function(a){var b=["time"];return c.contains(b,a.type)?!1:!0}}])});

Plik diff jest za duży
+ 1 - 1
dist/app/panels/histogram/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/hits/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/map/lib/map.europe.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/map/lib/map.usa.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/map/lib/map.world.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/map/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/pie/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/query/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/table/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/terms/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/text/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/timepicker/module.js


Plik diff jest za duży
+ 1 - 1
dist/app/panels/trends/module.js


+ 2 - 2
dist/build.txt

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

Plik diff jest za duży
+ 1 - 1
dist/vendor/filesaver.js


+ 1 - 1
dist/vendor/require/css-build.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define(function(){function a(a,b){var d=c.readFileSync(a,"utf8");0===d.indexOf("")&&(d=d.substring(1)),b(d)}function b(a){return a.replace(/[\r\n]+/g," ").replace(/[\t]/g," ")}var c=require.nodeRequire("fs"),d={},e=!1,f={load:function(c,e,f,g){f(!0),a(g.baseUrl+c,function(a){d[c]=b(a)})},write:function(a,b,c){e||(e=!0,c("define('"+a+"-embed', function()\n{\n"+"	function embed_css(content)\n"+"	{\n"+"		var head = document.getElementsByTagName('head')[0],\n"+"		style = document.createElement('style'),\n"+"		rules = document.createTextNode(content);\n"+"		style.type = 'text/css';\n"+"		if(style.styleSheet)\n"+"			style.styleSheet.cssText = rules.nodeValue;\n"+"		else style.appendChild(rules);\n"+"			head.appendChild(style);\n"+"	}\n"+"	return embed_css;\n"+"});\n")),c("define('"+a+"!"+b+"', ['"+a+"-embed'], \n"+"function(embed)\n{\n"+"	embed(\n	'"+d[b].replace(/'/g,"\\'")+"'\n	);\n"+"	return true;\n"+"});\n")},writeFile:function(){},onLayerEnd:function(){}};return f});

Plik diff jest za duży
+ 1 - 1
dist/vendor/require/require.js


+ 1 - 1
dist/vendor/require/tmpl.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-15
+/*! kibana - v3.0.0m3pre - 2013-09-16
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define(["module"],function(a){var b=a.config&&a.config()||{};return{load:function(a,c,d){var e=c.toUrl(a);c(["text!"+a],function(a){b.registerTemplate&&b.registerTemplate(e,a),d(a)})}}});

Plik diff jest za duży
+ 1 - 1
dist/vendor/timezone.js


+ 7 - 4
src/app/services/dashboard.js

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

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików