maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

prevent failure when kibana is included outside of its normal environment

Browse source
This commit is contained in:
spalger 2015-08-10 18:59:56 -07:00
parent 7671fc689a
commit cdb5df7b54
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/plugins/kibana/public/kibana.js
View file

@ -4,14 +4,18 @@ require('plugins/kibana/dashboard/index');
require('plugins/kibana/settings/index');
require('plugins/kibana/doc/index');
var chrome = require('ui/chrome');
var routes = require('ui/routes');
var modules = require('ui/modules');
var kibanaLogoUrl = require('ui/images/kibana.png');
require('ui/routes')
routes
.otherwise({
redirectTo: '/discover'
});
require('ui/chrome')
chrome
.setBrand({
'logo': 'url(' + kibanaLogoUrl + ') left no-repeat',
'smallLogo': 'url(' + kibanaLogoUrl + ') left no-repeat'
@ -50,10 +54,10 @@ require('ui/chrome')
});
});
var vars = require('ui/chrome').getInjectedVars();
require('ui/modules').get('kibana')
.constant('kbnIndex', vars.kbnIndex)
.constant('esShardTimeout', vars.esShardTimeout)
modules
.get('kibana')
.constant('kbnIndex', chrome.getInjected('kbnIndex'))
.constant('esShardTimeout', chrome.getInjected('kbnIndex'))
.constant('esUrl', (function () {
var a = document.createElement('a');
a.href = '/elasticsearch';

5
src/ui/public/chrome/api/apps.js
View file

@ -31,8 +31,9 @@ module.exports = function (chrome, internals) {
return internals.app.id;
};
chrome.getInjectedVars = function () {
return internals.vars;
chrome.getInjected = function (name, def) {
if (name == null) return _.clone(internals.vars) || {};
return _.get(internals.vars, name, def);
};
};