Skip to content

Import dependent functions #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shatee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Import dependent functions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"classes": true,
"defaultParams": true,
"destructuring": true,
"forOf": true,
"generators": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": true,
Expand Down
3,897 changes: 3,296 additions & 601 deletions dist/canvasjs.js
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions dist/canvasjs.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
"babel-preset-stage-1": "^6.1.18",
"babelify": "^7.2.0",
"browserify": "^12.0.1",
"eslint": "^3.15.0",
"ghooks": "^1.0.1",
"uglify-js": "^2.6.1",
"npm-bump": "0.0.15"
"npm-bump": "0.0.15",
"uglify-js": "^2.6.1"
},
"browserify": {
"transform": [
Expand Down
3 changes: 2 additions & 1 deletion src/core/axis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@

import CanvasJSObject from './canvasjs';
import TextBlock from './text_block';
import {extend, numberFormat, getLineDashArray} from '../helpers/utils';
import {extend, numberFormat, getLineDashArray, convertToNumber, addToDateTime, dateFormat} from '../helpers/utils';
import {constants} from '../constants/culture';

function Axis(chart, options, type, position) {

Expand Down
3 changes: 2 additions & 1 deletion src/core/charts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ import {
numberFormat,
getLineDashArray,
intToHexColorString,
compareDataPointX
compareDataPointX,
dateFormat
} from '../helpers/utils';

import {
Expand Down
6 changes: 5 additions & 1 deletion src/helpers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

import {constants} from '../constants/culture';

export function extend(derived, base) {
derived.prototype = inherit(base.prototype);
derived.prototype.constructor = derived;
Expand Down Expand Up @@ -283,7 +285,7 @@ export function addEvent(obj, eventType, fn, useCapture) {
}

//#region formatting functions/methods
export function dateFormat() {
function _dateFormat() {

var reg = /D{1,4}|M{1,4}|Y{1,4}|h{1,2}|H{1,2}|m{1,2}|s{1,2}|f{1,3}|t{1,2}|T{1,2}|K|z{1,3}|"[^"]*"|'[^']*'/g;

Expand Down Expand Up @@ -419,6 +421,8 @@ export function dateFormat() {
};
};

export const dateFormat = _dateFormat();

export function numberFormat(v, fs, cultureInfo) {
if (v === null)
return "";
Expand Down