Merge pull request #8252 from ppisljar/vislibaxis/1

renaming x-axis to axis
elastic · Sep 14, 2016 · 785221f · 785221f
2 parents df588bf + ecce922
commit 785221f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js
@@ -6,10 +6,10 @@ import expect from 'expect.js';
 import $ from 'jquery';
 import VislibLibDataProvider from 'ui/vislib/lib/data';
 import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
-import VislibLibXAxisProvider from 'ui/vislib/lib/x_axis';
+import VislibLibAxisProvider from 'ui/vislib/lib/axis';
 
 describe('Vislib xAxis Class Test Suite', function () {
-  let XAxis;
+  let Axis;
   let Data;
   let persistedState;
   let xAxis;
@@ -82,7 +82,7 @@ describe('Vislib xAxis Class Test Suite', function () {
   beforeEach(ngMock.inject(function (Private) {
     Data = Private(VislibLibDataProvider);
     persistedState = new (Private(PersistedStatePersistedStateProvider))();
-    XAxis = Private(VislibLibXAxisProvider);
+    Axis = Private(VislibLibAxisProvider);
 
     el = d3.select('body').append('div')
       .attr('class', 'x-axis-wrapper')
@@ -92,7 +92,7 @@ describe('Vislib xAxis Class Test Suite', function () {
       .attr('class', 'x-axis-div');
 
     dataObj = new Data(data, {}, persistedState);
-    xAxis = new XAxis({
+    xAxis = new Axis({
       el: $('.x-axis-div')[0],
       xValues: dataObj.xValues(),
       ordered: dataObj.get('ordered'),

diff --git a/src/ui/public/vislib/lib/x_axis.js → src/ui/public/vislib/lib/axis.js b/src/ui/public/vislib/lib/x_axis.js → src/ui/public/vislib/lib/axis.js
@@ -3,19 +3,19 @@ import $ from 'jquery';
 import _ from 'lodash';
 import moment from 'moment';
 import VislibLibErrorHandlerProvider from 'ui/vislib/lib/_error_handler';
-export default function XAxisFactory(Private) {
+export default function AxisFactory(Private) {
 
   const ErrorHandler = Private(VislibLibErrorHandlerProvider);
 
   /**
    * Adds an x axis to the visualization
    *
-   * @class XAxis
+   * @class Axis
    * @constructor
    * @param args {{el: (HTMLElement), xValues: (Array), ordered: (Object|*),
    * xAxisFormatter: (Function), _attr: (Object|*)}}
    */
-  class XAxis extends ErrorHandler {
+  class Axis extends ErrorHandler {
     constructor(args) {
       super();
       this.el = args.el;
@@ -509,5 +509,5 @@ export default function XAxisFactory(Private) {
     };
   }
 
-  return XAxis;
+  return Axis;
 };
diff --git a/src/ui/public/vislib/lib/handler/types/point_series.js b/src/ui/public/vislib/lib/handler/types/point_series.js
@@ -1,7 +1,7 @@
 import VislibComponentsZeroInjectionInjectZerosProvider from 'ui/vislib/components/zero_injection/inject_zeros';
 import VislibLibHandlerHandlerProvider from 'ui/vislib/lib/handler/handler';
 import VislibLibDataProvider from 'ui/vislib/lib/data';
-import VislibLibXAxisProvider from 'ui/vislib/lib/x_axis';
+import VislibLibAxisProvider from 'ui/vislib/lib/axis';
 import VislibLibYAxisProvider from 'ui/vislib/lib/y_axis';
 import VislibLibAxisTitleProvider from 'ui/vislib/lib/axis_title';
 import VislibLibChartTitleProvider from 'ui/vislib/lib/chart_title';
@@ -11,7 +11,7 @@ export default function ColumnHandler(Private) {
   const injectZeros = Private(VislibComponentsZeroInjectionInjectZerosProvider);
   const Handler = Private(VislibLibHandlerHandlerProvider);
   const Data = Private(VislibLibDataProvider);
-  const XAxis = Private(VislibLibXAxisProvider);
+  const Axis = Private(VislibLibAxisProvider);
   const YAxis = Private(VislibLibYAxisProvider);
   const AxisTitle = Private(VislibLibAxisTitleProvider);
   const ChartTitle = Private(VislibLibChartTitleProvider);
@@ -39,7 +39,7 @@ export default function ColumnHandler(Private) {
         data: data,
         axisTitle: new AxisTitle(vis.el, data.get('xAxisLabel'), data.get('yAxisLabel')),
         chartTitle: new ChartTitle(vis.el),
-        xAxis: new XAxis({
+        xAxis: new Axis({
           el                : vis.el,
           xValues           : data.xValues(),
           ordered           : data.get('ordered'),