Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
jinwoo-kim-nhn committed Jun 19, 2018
2 parents e82ced6 + dee5019 commit a375e22
Show file tree
Hide file tree
Showing 80 changed files with 2,582 additions and 2,268 deletions.
4 changes: 2 additions & 2 deletions dist/tui-chart.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* tui-chart
* @fileoverview tui-chart
* @author NHN Ent. FE Development Lab <[email protected]>
* @version 3.1.1
* @version 3.1.2
* @license MIT
* @link https://github.com/nhnent/tui.chart
* bundle created at "Tue May 15 2018 11:02:57 GMT+0900 (KST)"
* bundle created at "Tue Jun 19 2018 10:11:13 GMT+0900 (KST)"
*/
.tui-chart {
position: relative;
Expand Down
4,364 changes: 2,223 additions & 2,141 deletions dist/tui-chart.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/tui-chart.min.css

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions dist/tui-chart.min.js

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tui-chart",
"author": "NHN Ent. FE Development Lab <[email protected]>",
"version": "3.1.1",
"version": "3.1.2",
"main": "dist/tui-chart",
"license": "MIT",
"description": "TOAST UI Application: Chart",
Expand Down
6 changes: 4 additions & 2 deletions src/js/charts/areaChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import rawDataHandler from '../models/data/rawDataHandler';
import Series from '../components/series/areaChartSeries';
import snippet from 'tui-code-snippet';

export default class AreaChart extends ChartBase {
class AreaChart extends ChartBase {
/**
* Area chart.
* @constructs AreaChart
Expand Down Expand Up @@ -69,8 +69,8 @@ export default class AreaChart extends ChartBase {

/**
* Add data ratios.
* @override
* from axisTypeMixer
* @override
*/
addDataRatios(limitMap) {
const chartTypes = this.chartTypes || [this.chartType];
Expand Down Expand Up @@ -216,3 +216,5 @@ export default class AreaChart extends ChartBase {
this._dynamicDataHelper.restartAnimation();
}
}

export default AreaChart;
6 changes: 4 additions & 2 deletions src/js/charts/barChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import rawDataHandler from '../models/data/rawDataHandler';
import predicate from '../helpers/predicate';
import snippet from 'tui-code-snippet';

export default class BarChart extends ChartBase {
class BarChart extends ChartBase {
/**
* Bar chart.
* @constructs BarChart
Expand Down Expand Up @@ -121,8 +121,8 @@ export default class BarChart extends ChartBase {

/**
* Add data ratios.
* @override
* modified from axisTypeMixer
* @override
*/
addDataRatios(limitMap) {
const {options: {series: seriesOption = {}}, chartType} = this;
Expand All @@ -131,3 +131,5 @@ export default class BarChart extends ChartBase {
this.dataProcessor.addDataRatios(limitMap[chartType], stackType, chartType);
}
}

export default BarChart;
6 changes: 4 additions & 2 deletions src/js/charts/boxplotChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import ChartBase from './chartBase';
import rawDataHandler from '../models/data/rawDataHandler';

export default class BoxplotChart extends ChartBase {
class BoxplotChart extends ChartBase {
/**
* Boxplot chart.
* @constructs BoxplotChart
Expand Down Expand Up @@ -82,8 +82,8 @@ export default class BoxplotChart extends ChartBase {

/**
* Add data ratios.
* @override
* modified from axisTypeMixer
* @override
*/
addDataRatios(limitMap) {
const {options: {series: seriesOption = {}}, chartType} = this;
Expand All @@ -92,3 +92,5 @@ export default class BoxplotChart extends ChartBase {
this.dataProcessor.addDataRatios(limitMap[chartType], stackType, chartType);
}
}

export default BoxplotChart;
4 changes: 3 additions & 1 deletion src/js/charts/bubbleChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ChartBase from './chartBase';
import chartConst from '../const';
import snippet from 'tui-code-snippet';

export default class BubbleChart extends ChartBase {
class BubbleChart extends ChartBase {
/**
* Bubble chart.
* @constructs BubbleChart
Expand Down Expand Up @@ -111,3 +111,5 @@ export default class BubbleChart extends ChartBase {
this.dataProcessor.addDataRatiosForCoordinateType(this.chartType, limitMap, true);
}
}

export default BubbleChart;
6 changes: 4 additions & 2 deletions src/js/charts/bulletChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import ChartBase from './chartBase';
import rawDataHandler from '../models/data/rawDataHandler';

export default class BulletChart extends ChartBase {
class BulletChart extends ChartBase {
/**
* Bullet chart.
* @constructs BulletChart
Expand Down Expand Up @@ -73,8 +73,8 @@ export default class BulletChart extends ChartBase {

/**
* Add data ratios.
* @override
* modified from axisTypeMixer
* @override
*/
addDataRatios(limitMap) {
this.dataProcessor.addDataRatios(
Expand All @@ -84,3 +84,5 @@ export default class BulletChart extends ChartBase {
);
}
}

export default BulletChart;
4 changes: 3 additions & 1 deletion src/js/charts/chartBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import boundsAndScaleBuilder from '../models/boundsAndScaleBuilder.js';
import predicate from '../helpers/predicate';
import snippet from 'tui-code-snippet';

export default class ChartBase {
class ChartBase {
/**
* Chart base.
* @constructs ChartBase
Expand Down Expand Up @@ -715,3 +715,5 @@ export default class ChartBase {
}
}
}

export default ChartBase;
8 changes: 5 additions & 3 deletions src/js/charts/colorSpectrum.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
*/
import colorutil from '../helpers/colorutil';

export default class ColorSpectrum {
class ColorSpectrum {
/**
* ColorSpectrum create a color spectrum and provide color value.
* @constructs ColorSpectrum
* @private
* @param {string} startColor hex color
* @param {string} endColor hex color
* @private
*/
constructor(startColor, endColor) {
this.start = colorutil.colorNameToHex(startColor);
Expand All @@ -37,7 +37,7 @@ export default class ColorSpectrum {
/**
* Get hex color.
* @param {number} ratio ratio
* @returns {string} hex color
* @returns {string} hexcolor
*/
getColor(ratio) {
let hexColor = this.colorMap[ratio];
Expand All @@ -53,3 +53,5 @@ export default class ColorSpectrum {
return hexColor || null;
}
}

export default ColorSpectrum;
6 changes: 4 additions & 2 deletions src/js/charts/columnChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ChartBase from './chartBase';
import chartConst from '../const';
import rawDataHandler from '../models/data/rawDataHandler';

export default class ColumnChart extends ChartBase {
class ColumnChart extends ChartBase {
/**
* Column chart.
* @constructs ColumnChart
Expand Down Expand Up @@ -83,8 +83,8 @@ export default class ColumnChart extends ChartBase {

/**
* Add data ratios.
* @override
* modified from axisTypeMixer
* @override
*/
addDataRatios(limitMap) {
const {series: seriesOption = {}} = this.options;
Expand All @@ -94,3 +94,5 @@ export default class ColumnChart extends ChartBase {
this.dataProcessor.addDataRatios(limitMap[chartType], stackType, chartType);
}
}

export default ColumnChart;
9 changes: 4 additions & 5 deletions src/js/charts/columnLineComboChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import predicate from '../helpers/predicate';
import validTypeMakerForYAxisOptions from './validTypeMakerForYAxisOptions';
import snippet from 'tui-code-snippet';

export default class ColumnLineComboChart extends ChartBase {
class ColumnLineComboChart extends ChartBase {
/**
* Column and Line Combo chart.
* @constructs ColumnLineComboChart
Expand Down Expand Up @@ -53,11 +53,11 @@ export default class ColumnLineComboChart extends ChartBase {

/**
* Make yAxis options.
* from verticalTypeComboMixer
* @param {Array.<string>} chartTypes chart types
* @param {?object} yAxisOptions yAxis options
* @returns {{column: ?object, line: ?object}} options map
* @private
* from verticalTypeComboMixer
*/
_makeYAxisOptions(chartTypes, yAxisOptions) {
const options = {};
Expand Down Expand Up @@ -139,7 +139,6 @@ export default class ColumnLineComboChart extends ChartBase {
* @param {boolean} isSingleYAxis - whether single y axis or not
* @returns {{options: object, areaType: string, chartType: string, additionalParams: object}}
* @private
* from verticalTypeComboMixer
*/
_makeYAxisScaleOption(name, chartType, isSingleYAxis) {
const yAxisOption = this.yAxisOptions[chartType];
Expand All @@ -163,7 +162,6 @@ export default class ColumnLineComboChart extends ChartBase {
* Set additional parameter for making y axis scale option.
* @param {{isSingleYAxis: boolean}} additionalOptions - additional options
* @private
* from verticalTypeComboMixer
*/
_setAdditionalOptions(additionalOptions) {
const {dataProcessor} = this;
Expand All @@ -187,7 +185,6 @@ export default class ColumnLineComboChart extends ChartBase {
/**
* Add data ratios.
* @override
* from axisTypeMixer
*/
addDataRatios(limitMap) {
const chartTypes = this.chartTypes || [this.chartType];
Expand All @@ -201,3 +198,5 @@ export default class ColumnLineComboChart extends ChartBase {
chartTypes.forEach(addDataRatio);
}
}

export default ColumnLineComboChart;
4 changes: 3 additions & 1 deletion src/js/charts/componentManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const COMPONENT_FACTORY_MAP = {
title
};

export default class ComponentManager {
class ComponentManager {
/**
* ComponentManager manages components of chart.
* @param {object} params parameters
Expand Down Expand Up @@ -373,3 +373,5 @@ export default class ComponentManager {
return !!this.get(name);
}
}

export default ComponentManager;
4 changes: 3 additions & 1 deletion src/js/charts/dynamicDataHelper.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import chartConst from '../const';
import predicate from '../helpers/predicate';

export default class DynamicDataHelper {
class DynamicDataHelper {
constructor(chart) {
const firstRenderCheck = () => {
this.isInitRenderCompleted = true;
Expand Down Expand Up @@ -234,3 +234,5 @@ export default class DynamicDataHelper {
}
}
}

export default DynamicDataHelper;
4 changes: 3 additions & 1 deletion src/js/charts/heatmapChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ChartBase from './chartBase';
import ColorSpectrum from './colorSpectrum';
import chartConst from '../const';

export default class HeatmapChart extends ChartBase {
class HeatmapChart extends ChartBase {
/**
* Heatmap chart is a graphical representation of data where the individual values contained
* in a matrix are represented as colors.
Expand Down Expand Up @@ -123,3 +123,5 @@ export default class HeatmapChart extends ChartBase {
this.componentManager.register('mouseEventDetector', 'mouseEventDetector');
}
}

export default HeatmapChart;
4 changes: 3 additions & 1 deletion src/js/charts/lineAreaComboChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import validTypeMakerForYAxisOptions from './validTypeMakerForYAxisOptions';
import DynamicDataHelper from './dynamicDataHelper';
import snippet from 'tui-code-snippet';

export default class LineAreaComboChart extends ChartBase {
class LineAreaComboChart extends ChartBase {
/**
* Line and Area Combo chart.
* @constructs LineAreaComboChart
Expand Down Expand Up @@ -305,3 +305,5 @@ export default class LineAreaComboChart extends ChartBase {
this._dynamicDataHelper.restartAnimation();
}
}

export default LineAreaComboChart;
4 changes: 3 additions & 1 deletion src/js/charts/lineChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Series from '../components/series/lineChartSeries';
import rawDataHandler from '../models/data/rawDataHandler';
import snippet from 'tui-code-snippet';

export default class LineChart extends ChartBase {
class LineChart extends ChartBase {
/**
* Line chart.
* @param {Array.<Array>} rawData - raw data
Expand Down Expand Up @@ -240,3 +240,5 @@ export default class LineChart extends ChartBase {
this._dynamicDataHelper.restartAnimation();
}
}

export default LineChart;
4 changes: 3 additions & 1 deletion src/js/charts/lineScatterComboChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import ChartBase from './chartBase';
import snippet from 'tui-code-snippet';

export default class LineScatterComboChart extends ChartBase {
class LineScatterComboChart extends ChartBase {
/**
* Line and Scatter Combo chart.
* @constructs LineScatterComboChart
Expand Down Expand Up @@ -82,3 +82,5 @@ export default class LineScatterComboChart extends ChartBase {
this.componentManager.register('mouseEventDetector', 'mouseEventDetector');
}
}

export default LineScatterComboChart;
4 changes: 3 additions & 1 deletion src/js/charts/mapChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import MapChartMapModel from './mapChartMapModel';
import MapChartDataProcessor from '../models/data/mapChartDataProcessor';
import ColorSpectrum from './colorSpectrum';

export default class MapChart extends ChartBase {
class MapChart extends ChartBase {
/**
* Map chart.
* @constructs MapChart
Expand Down Expand Up @@ -87,3 +87,5 @@ export default class MapChart extends ChartBase {
this.dataProcessor.addDataRatios(limitMap.legend);
}
}

export default MapChart;
Loading

0 comments on commit a375e22

Please sign in to comment.