Merge pull request #733 from sirensolutions/issue-732

do not load kibi directives when app != kibana
sirensolutions · Feb 17, 2016 · ea7772d · ea7772d
2 parents 8f4348c + 545c4c0
commit ea7772d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js
@@ -11,7 +11,7 @@ module.exports = function (kibana) {
 
  uiExports: {
  app: {
- title: 'Kibana',
+ title: 'Kibi',
  description: 'the kibana you know and love',
  //icon: 'plugins/kibana/settings/sections/about/barcode.svg',
  main: 'plugins/kibana/kibana',

diff --git a/src/ui/public/chrome/chrome.html b/src/ui/public/chrome/chrome.html
@@ -54,7 +54,7 @@
  </li>
  </ul>
 
- <kibi-dashboard-search class="kibi-fill-2"></kibi-dashboard-search>
+ <kibi-dashboard-search ng-if="chrome.getApp().id === 'kibana'" class="kibi-fill-2"></kibi-dashboard-search>
 
  </div>
  <!-- /Full navbar -->
@@ -74,10 +74,8 @@
  config-close="pickerTemplate.close">
  </config>
 
- <kibi-nav-bar chrome="chrome" ng-show="chrome.getVisible() || chrome.getKibiNavbarVisible()"></kibi-nav-bar>
-
- <!-- kibi: directive for the relational filter panel with the dashboards graph -->
- <kibi-relational-filter-panel></kibi-relational-filter-panel>
+ <kibi-nav-bar chrome="chrome" ng-if="chrome.getApp().id === 'kibana'" ng-show="chrome.getVisible() || chrome.getKibiNavbarVisible()"></kibi-nav-bar>
+ <kibi-relational-filter-panel ng-if="chrome.getApp().id === 'kibana'" ></kibi-relational-filter-panel>
 
  <div class="application" ng-class="'tab-' + chrome.getActiveTabId('-none-') + ' ' + chrome.getApplicationClasses()" ng-view></div>
 </div>
diff --git a/src/ui/public/chrome/chrome.js b/src/ui/public/chrome/chrome.js
@@ -8,11 +8,6 @@ require('ui/timefilter');
 require('ui/private');
 require('ui/promises');
 
-require('ui/kibi/styles/kibi'); // kibi: added to style the logo
-require('ui/kibi/directives/kibi_nav_bar'); // kibi: added so we can inject our own kibi-nav-bar
-require('ui/kibi/directives/kibi_dashboard_search'); // kibi: added so we can inject our own kibi-dashboard-search bar
-require('ui/kibi/directives/kibi_relational_filter_panel'); // kibi: add the dashboards graph panel
-
 var metadata = require('ui/metadata');
 
 var chrome = {};
@@ -49,4 +44,11 @@ chrome.bootstrap = function () {
  angular.bootstrap(document, ['kibana']);
 };
 
+if (chrome.getApp && chrome.getApp() && chrome.getApp().id === 'kibana') {
+ require('ui/kibi/styles/kibi'); // kibi: added to style the logo
+ require('ui/kibi/directives/kibi_nav_bar'); // kibi: added so we can inject our own kibi-nav-bar
+ require('ui/kibi/directives/kibi_dashboard_search'); // kibi: added so we can inject our own kibi-dashboard-search bar
+ require('ui/kibi/directives/kibi_relational_filter_panel'); // kibi: add the dashboards graph panel
+}
+
 module.exports = chrome;