Skip to content

Commit b335b05

Browse files
committed
Merge branch 'master' into autosize-refactor
2 parents 512679e + 91c2d42 commit b335b05

File tree

567 files changed

+695442
-141739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

567 files changed

+695442
-141739
lines changed

.ackrc

-6
This file was deleted.

.agignore

-1
This file was deleted.

.eslintrc

+18-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@
33
"extends": [
44
"eslint:recommended"
55
],
6+
"parserOptions": {
7+
"ecmaVersion": 5,
8+
},
69
"env": {
710
"commonjs": true
811
},
12+
"globals": {
13+
"Promise": true,
14+
"Float32Array": true,
15+
"Float64Array": true,
16+
"Uint8Array": true,
17+
"Int16Array": true,
18+
"Int32Array": true,
19+
"ArrayBuffer": true
20+
},
921
"rules": {
1022
"no-trailing-spaces": [2],
1123
"no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
@@ -14,7 +26,7 @@
1426
"indent": [2, 4, {"SwitchCase": 1}],
1527
"max-len": [0, 80],
1628
"brace-style": [0, "stroustrup", {"allowSingleLine": true}],
17-
"curly": [0, "multi"],
29+
"curly": [2, "multi-line"],
1830
"camelcase": [0, {"properties": "never"}],
1931
"comma-spacing": [2, {"before": false, "after": true}],
2032
"comma-style": [2, "last"],
@@ -32,20 +44,24 @@
3244
"space-in-parens": [2, "never"],
3345
"space-before-function-paren": [2, "never"],
3446
"space-before-blocks": [2],
47+
"spaced-comment": [2, "always"],
48+
"no-tabs": [2],
3549
"no-multi-spaces": [2],
3650
"no-whitespace-before-property": [2],
3751
"no-unexpected-multiline": [2],
3852
"no-floating-decimal": [2],
3953
"space-infix-ops": [2, {"int32Hint": true}],
4054
"quotes": [2, "single"],
4155
"dot-notation": [2],
56+
"dot-location": [2, "property"],
4257
"operator-linebreak": [2, "after"],
4358
"eqeqeq": [2],
44-
"new-cap": [0],
59+
"new-cap": [2, { "capIsNewExceptionPattern": "^MathJax\\.." }],
4560
"no-redeclare": [2, {"builtinGlobals": true}],
4661
"no-shadow": [0, {"builtinGlobals": true}],
4762
"block-scoped-var": [2],
4863
"no-unused-vars": [2],
64+
"no-undef-init": [2],
4965
"no-use-before-define": [2, "nofunc"],
5066
"no-loop-func": [2],
5167
"no-console": [0],

.github/ISSUE_TEMPLATE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Thanks for your interest in plotly.js!
2+
3+
Before opening an issue, please search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/plotly/plotly.js/issues/new).
4+
5+
Bug reports must be accompanied with a reproducible example. We recommend using [codepen](http://codepen.io/), [jsfiddle](https://jsfiddle.net/) or [jsbin](https://jsbin.com) to share your example.
6+
7+
Note that GitHub issues are reserved for bug reports and feature requests only. Implementation questions should be asked on community.plot.ly (tagged [`plotly-js`](http://community.plot.ly/c/plotly-js)) or on Stack Overflow (tagged [`plotly`](https://stackoverflow.com/questions/tagged/plotly)).
8+
9+
Comments on GitHub issues or pull requests should add content to the discussions. Approbation comments such as *+1* or *I would like this feature to be implemented as well* will be deleted by the maintainers. Please use [GitHub reactions](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) instead.

.github/PULL_REQUEST_TEMPLATE.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Thanks for your interest in plotly.js!
2+
3+
Developers are strongly encouraged to first make a PR to their own plotly.js fork and ask one of the maintainers to review the modifications there. Once the pull request is deemed satisfactory, the developer will be asked to make a pull request to the main plotly.js repo and may be asked to squash some commits before doing so.
4+
5+
Before opening a pull request, developer should:
6+
7+
- `git rebase` their local branch off the latest `master`
8+
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps)
9+
- write an overview of what the PR attempts to do.
10+
11+
Note that it is forbidden to force push (i.e. `git push -f`) to remote branches associated with opened pull requests. Force pushes make it hard for maintainers to keep track of updates. Therefore, if required, please `git merge master` into your PR branch instead of `git rebase master`.

.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
node_modules
22

33
build/*
4-
54
!build/plotcss.js
65
!build/ploticon.js
76
!build/README.md
87

98
npm-debug.log*
9+
*.sublime*
10+
11+
.*
12+
!.gitignore
13+
!.npmignore
14+
!.eslintrc
15+
!.eslintignore

.npmignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
build/*
2-
32
!build/plotcss.js
43
!build/ploticon.js
54
!build/README.md
65

76
devtools
87
test
9-
dist/extras/mathjax
8+
dist/extras
109

1110
circle.yml
12-
docker-compose.yml
1311
bower.json
1412

1513
.ackrc

0 commit comments

Comments
 (0)