[Cleanup] Moving some files around, to account for directive name cha…

…nges
elastic · Mar 31, 2016 · 8ccbc12 · 8ccbc12
1 parent 7a6ea3d
commit 8ccbc12
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js
@@ -2,12 +2,12 @@ import _ from 'lodash';
 import $ from 'jquery';
 import angular from 'angular';
 import chrome from 'ui/chrome';
-import 'ui/directives/config';
+import 'ui/directives/kbn_top_nav';
 import 'ui/courier';
 import 'ui/config';
 import 'ui/notify';
 import 'ui/typeahead';
-import 'ui/navbar';
+import 'ui/navbar_extensions';
 import 'ui/share';
 import 'plugins/kibana/dashboard/directives/grid';
 import 'plugins/kibana/dashboard/components/panel/panel';

diff --git a/src/plugins/kibana/public/discover/index.js b/src/plugins/kibana/public/discover/index.js
@@ -1,6 +1,6 @@
 import 'plugins/kibana/discover/saved_searches/saved_searches';
 import 'plugins/kibana/discover/directives/timechart';
-import 'ui/navbar';
+import 'ui/navbar_extensions';
 import 'ui/collapsible_sidebar';
 import 'plugins/kibana/discover/components/field_chooser/field_chooser';
 import 'plugins/kibana/discover/controllers/discover';

diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import 'plugins/kibana/visualize/saved_visualizations/saved_visualizations';
 import 'plugins/kibana/visualize/editor/sidebar';
 import 'plugins/kibana/visualize/editor/agg_filter';
-import 'ui/navbar';
+import 'ui/navbar_extensions';
 import 'ui/visualize';
 import 'ui/collapsible_sidebar';
 import 'ui/share';

diff --git a/src/ui/public/chrome/directives/index.js b/src/ui/public/chrome/directives/index.js
@@ -1,4 +1,4 @@
-import 'ui/directives/config';
+import 'ui/directives/kbn_top_nav';
 
 import './app_switcher';
 import kbnChromeProv from './kbn_chrome';

diff --git a/src/ui/public/directives/__tests__/config.js → ...ublic/directives/__tests__/kbn_top_nav.js b/src/ui/public/directives/__tests__/config.js → ...ublic/directives/__tests__/kbn_top_nav.js
@@ -5,9 +5,9 @@ import $ from 'jquery';
 
 import navbarExtensionsRegistry from 'ui/registry/navbar_extensions';
 import Registry from 'ui/registry/_registry';
-import 'ui/navbar';
+import 'ui/navbar_extensions';
 
-describe('Config Directive', function () {
+describe('kbnTopNav Directive', function () {
 
   var build = function () {};
   let $testScope = null;

diff --git a/src/ui/public/directives/config.js → src/ui/public/directives/kbn_top_nav.js b/src/ui/public/directives/config.js → src/ui/public/directives/kbn_top_nav.js
diff --git a/src/ui/public/navbar/__tests__/navbar.js → ...extensions/__tests__/navbar_extensions.js b/src/ui/public/navbar/__tests__/navbar.js → ...extensions/__tests__/navbar_extensions.js
@@ -6,7 +6,7 @@ import _ from 'lodash';
 
 import navbarExtensionsRegistry from 'ui/registry/navbar_extensions';
 import Registry from 'ui/registry/_registry';
-import 'ui/navbar';
+import 'ui/navbar_extensions';
 
 const defaultMarkup = `
   <navbar-extensions name="testing"></navbar-extensions>`;

diff --git a/src/ui/public/navbar/navbar.js → ...ic/navbar_extensions/navbar_extensions.js b/src/ui/public/navbar/navbar.js → ...ic/navbar_extensions/navbar_extensions.js