8000 plotly.js image test by etpinard · Pull Request #7 · plotly/plotly.js · GitHub
[go: up one dir, main page]

Skip to content

plotly.js image test #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.

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

Merged
merged 68 commits into from
Nov 17, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
3a3382e
put build-baseline-images in tasks/
etpinard Nov 13, 2015
3bbe42d
put image request options getter in tasks/util
etpinard Nov 13, 2015
407fa49
add image server path to tasks/util/constants.js
etpinard Nov 13, 2015
346b55f
update pixel comp script:
etpinard Nov 13, 2015
40a9c00
add npm run test-image script
etpinard Nov 13, 2015
beb5490
fix path
perigee Nov 13, 2015
1d31653
mv 3d mocks to test/image/mocks
etpinard Nov 13, 2015
a3d719d
update doc
perigee Nov 13, 2015
563f14a
mv gl2d testplots to test/image/mocks
etpinard Nov 13, 2015
f14fd76
rm remains of testplot-*
etpinard Nov 13, 2015
2038690
use mock in mocks/ for pummel dashbaord button
etpinard Nov 13, 2015
f8c0a90
rename and clean up test dashboard button lists
etpinard Nov 13, 2015
d755422
rm data-ref annotations from gl2d mocks
etpinard Nov 13, 2015
e92f04a
fix path in gl2d test buttons
etpinard Nov 16, 2015
60efb07
image test README to test/image
etpinard Nov 16, 2015
708c6e5
Merge branch 'master' into image-test
etpinard Nov 16, 2015
e7691c2
make gl2d mocks valid JSON
etpinard Nov 16, 2015
6de726c
put image viewer in functional state
etpinard Nov 16, 2015
1bb53f0
Update README.md
perigee Nov 16, 2015
1179ed1
tmp commit git diff --cached!
etpinard Nov 16, 2015
cc99801
mv docker part doc to docker_part_readme.md
perigee Nov 16, 2015
bf05f6c
mv docker part doc to docker_part_readme.md
perigee Nov 16, 2015
5e41e5a
add image docker test bash wrapper in tasks/
etpinard Nov 16, 2015
93d1be6
add make baseline script
etpinard Nov 16, 2015
7352e87
Merge branch 'image-test' of github.com:plotly/plotly.js into image-test
etpinard Nov 16, 2015
f5ed930
Merge branch 'master' into image-test
etpinard Nov 16, 2015
da056c5
add scroll-bar to image viewer buttons
etpinard Nov 16, 2015
e2b2b41
make image server inder look for plotly.js in build/
etpinard Nov 16, 2015
a0158fa
update docker docs
etpinard Nov 16, 2015
efee288
add sample circleci config file
perigee Nov 16, 2015
d1f864c
update cartesian, polar and geo baselines
etpinard Nov 16, 2015
c2a358a
add gl3d mocks
etpinard Nov 16, 2015
d81c600
don't test gl2d mocks just yet:
etpinard Nov 16, 2015
274dd96
change the script
perigee Nov 16, 2015
f4df76c
merge doc
perigee Nov 16, 2015
26a8c0a
test only image-test branch for the moment
perigee Nov 16, 2015
cb37d4b
add port
perigee Nov 16, 2015
3bcf09b
add gl2d baselines:
etpinard Nov 16, 2015
ab202dd
work around for docker exec
perigee Nov 16, 2015
8b3b950
Merge branch 'image-test' of github.com:plotly/plotly.js into image-test
etpinard Nov 16, 2015
d044e6f
install node, and install pkgs
perigee Nov 16, 2015
ae779f3
Merge branch 'image-test' of github.com:plotly/plotly.js into image-test
perigee Nov 16, 2015
e243b7d
add artifacts
perigee Nov 16, 2015
d59eea9
add cibundle.js task:
etpinard Nov 17, 2015
fe148e4
add citest-jasmine npm script, use it circle test
etpinard Nov 17, 2015
7aa375c
fix typos related to cibundle
etpinard Nov 17, 2015
5176af6
add back docker exec call in test_image.sh
etpinard Nov 17, 2015
864c2a2
restart monit
perigee Nov 17, 2015
03d2012
add service
perigee Nov 17, 2015
769117c
rm preprocess in cibuild script (already done on postinstall)
etpinard Nov 17, 2015
0cce8d2
make gl2d buttons the default in test_dashboard
etpinard Nov 17, 2015
cf9f2c3
Merge branch 'image-test' of github.com:plotly/plotly.js into image-test
etpinard Nov 17, 2015
0f787af
try putting 'monit restart' in same docker run cmd as test
etpinard Nov 17, 2015
adb546f
add sudo
perigee Nov 17, 2015
7d72bc6
merge
perigee Nov 17, 2015
d0de8a7
comment out
perigee Nov 17, 2015
5cc9b92
rm monit restart cmd in circle yml
etpinard Nov 17, 2015
c2fe95e
[testing] make grid line color by red by default
etpinard Nov 17, 2015
393b969
bump sleep time to 20 after docker run
etpinard Nov 17, 2015
fa92c36
try image 0.2.0
etpinard Nov 17, 2015
d59fdd9
try running cibuild in 'post'
etpinard Nov 17, 2015
2a03509
cp test/image index.html to image server
etpinard Nov 17, 2015 8000
8b19f4c
split the commands
perigee Nov 17, 2015
a7e2594
use image 0.2.1 instead
perigee Nov 17, 2015
dc2121e
Revert "[testing] make grid line color by red by default"
perigee Nov 17, 2015
a1be235
move docker run into dependencies sector
perigee Nov 17, 2015
036577b
rm branch-only circle spec
etpinard Nov 17, 2015
44957ab
put docker instructions in test/image/README.md
etpinard Nov 17, 2015
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
Prev Previous commit
Next Next commit
Merge branch 'master' into image-test
  • Loading branch information
etpinard committed Nov 16, 2015
commit 708c6e511c9d379b23e609110cb3f150591d2318
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ node_modules
build/*
!build/README.md

dist/*
!dist/README.md

npm-debug.log
72 changes: 72 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
// environments
"browser": true, // Define globals exposed by modern browsers.
"jquery": false, // Define globals exposed by jQuery.
"node": true, // Define globals exposed by Node.js.
"jasmine": true, // Define globals exposed by jasmine

// enforcing (true means bug us about it)
"camelcase": false, // Force all variable names to use either camelCase style or UPPER_CASE with underscores.
"curly": false, // This option requires you to always put curly braces around blocks in loops and conditionals.
"eqeqeq": true, // Prohibit use of == and != in favor of === and !==.
"es3": true, // This option tells JSHint that your code needs to adhere to ECMAScript 3 spec (old browsers)
"forin": false, // This option requires all for in loops to filter object's items.
"freeze": true, // This options prohibits overwriting prototypes of native objects such as Array, Date and so on.
"immed": true, // This option prohibits the use of immediate function invocations without wrapping them in parentheses.
"indent": 4, // Enforce tab width of 4 spaces.
"latedef": "nofunc", // Prohibit use of a variable before it is defined.
"maxcomplexity": false, // This option lets you control cyclomatic complexity throughout your code.
"maxdepth": 6, // This option lets you control how nested do you want your blocks to be
"maxlen": 120, // Enforce line length to 120 characters
"newcap": true, // Require capitalized names for constructor functions.
"noarg": true, // This option prohibits the use of arguments.caller and arguments.callee.
"noempty": true, // This option warns when you have an empty block in your code.
"nonbsp": true, // This option warns about "non-breaking whitespace" characters.
"nonew": true, // This option prohibits the use of constructor functions for side-effects.
"plusplus": false, // This option prohibits the use of unary increment and decrement operators.
"quotmark": "single", // Enforce use of single quotation marks for strings.
"strict": true, // Enforce placing 'use strict' at the top function scope
"trailing": true, // Prohibit trailing whitespace.
"undef": true, // Prohibit use of explicitly undeclared variables.
"unused": true, // Warn when variables are defined but never used.

// relaxing (true means DON'T bug us about it)
"asi": false, // This option suppresses warnings about missing semicolons.
"boss": false, // This option suppresses warnings about the use of assignments in cases where comparisons are expected.
"debug": false, // This option suppresses warnings about the debugger statements in your code.
"eqnull": true, // Suppress warnings about == null comparisons.
"esnext": true, // This option tells JSHint that your code uses ECMAScript 6 specific syntax.
"evil": false, // This option suppresses warnings about the use of eval.
"expr": false, // This option suppresses warnings about the use of expressions where normally you would expect to see assignments or function calls.
"funcscope": false, // This option suppresses warnings about declaring variables inside of control structures while accessing them later from the outside.
"globalstrict": false, // This option suppresses warnings about the use of global strict mode.
"iterator": false, // This option suppresses warnings about the __iterator__ property.
"lastsemic": false, // This option suppresses warnings about missing semicolons
"laxbreak": false, // This option suppresses most of the warnings about possibly unsafe line breakings in your code.
"laxcomma": false, // This option suppresses warnings about comma-first coding style
"loopfunc": false, // This option suppresses warnings about functions inside of loops.
"maxerr": 500, // This options allows you to set the maximum amount of warnings JSHint will produce before giving up.
"moz": false, // This options tells JSHint that your code uses Mozilla JavaScript extensions.
"multistr": false, // This option suppresses warnings about multi-line strings.
"notypeof": false, // This option suppresses warnings about invalid typeof operator values.
"proto": false, // This option suppresses warnings about the __proto__ property.
"scripturl": false, // This option suppresses warnings about the use of script-targeted URLs—such as javascript:...
"shadow": false, // This option suppresses warnings about variable shadowing
"sub": false, // This option suppresses warnings about using [] notation when it can be expressed in dot notation
"supernew": false, // This option suppresses warnings about "weird" constructions like new function () { ... } and new Object;
"validthis": false, // This option suppresses warnings about possible strict violations when the code is running in strict mode
"noyield": false, // This option suppresses warnings about generator functions with no yield statement in them.

// global pre defined variables
"predef": [
"JSON",
"Uint8Array",
"Uint16Array",
"Uint32Array",
"Int8Array",
"Int16Array",
"Int32Array",
"Float32Array",
"Float64Array"
]
}
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yolos!
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015 Plotly, Inc

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
92 changes: 92 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# [plotly.js](https://plot.ly/javascript/getting-started/)

[![npm version](https://img.shields.io/npm/v/plotly.svg)](https://www.npmjs.com/package/plotly)

To get started, check out <https://plot.ly/javascript/getting-started/>!

## Table of contents

* [Quick start](#quick-start)
* [Bugs and feature requests](#bugs-and-feature-requests)
* [Documentation](#documentation)
* [Contributing](#contributing)
* [Community](#community)
* [Clients for R, Python, and MATLAB](#clients-for-r-python-and-matlab)
* [Creators](#creators)
* [Copyright and license](#copyright-and-license)


## Quick start

Several quick start options are available:

* [Download the latest release](https://github.com/plotly/plotly.js/releases/v1.0.0/plotly.js.zip).
* Clone the repo: `git clone https://github.com/plotly/plotly.js.git`.
* Install with [npm](https://www.npmjs.com): `npm install plotly`.
* Use the plotly.js CDN hosted by Fastly:

```html
<!-- Latest compiled and minified plotly.js JavaScript -->
<script type="text/javascript" src="https://cdn.plot.ly/plotly-latest.min.js">
```

Read the [Getting started page](https://plot.ly/javascript/getting-started/) for examples.

## Bugs and feature requests

Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/plotly/plotly.js/blob/master/CONTRIBUTING.md) and 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).

## Documentation

Plotly.js documentation, in the repo documentation, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at <https://plot.ly/javascript/getting-started/>. The docs may also be run locally.

You can also suggest new documentation examples by submitting a [Codepen](http://codepen.io/tag/plotly/) on community.plot.ly (tagged [`plotly-js`](community.plot.ly/c/plotly-js).

## Contributing

Please read through our [contributing guidelines](https://github.com/plotly/plotly.js/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

## Community

Get updates on plotly.js's development and chat with the project maintainers and community members.

* Follow [@plotlygraphs on Twitter](https://twitter.com/plotlygraphs).
* Implementation help may be found at Stack Overflow (tagged [`plotly`](https://stackoverflow.com/questions/tagged/plotly)) or community.plot.ly (tagged [`plotly-js`](http://community.plot.ly/c/plotly-js).
* Developers should use the keyword `plotly` on packages which modify or add to the functionality of plotly.js when distributing through [npm](https://www.npmjs.com/browse/keyword/plotly) or similar delivery mechanisms for maximum discoverability.
* Direct developer email support can be purchased through a [Plotly Pro](https://plot.ly/products/cloud/) plan.

## Versioning

For transparency into our release cycle and in striving to maintain backward compatibility, plotly.js is maintained under [the Semantic Versioning guidelines](http://semver.org/).

See [the Releases section of our GitHub project](https://github.com/plotly/plotly.js/releases) for changelogs for each release version of plotly.js.

## Clients for R, Python, and MATLAB

Open-source clients to the plotly.js APIs are available at these links:

| | GitHub repo | Getting started |
|---|--------|---------|
|**R / RStudio**| [ropensci/plotly](https://github.com/ropensci/plotly) | [plot.ly/r/getting-started](https:// EED3 plot.ly/r/getting-started) |
|**Python / Pandas / IPython notebook**| [plotly/plotly.py](https://github.com/plotly/plotly.py) | [plot.ly/python/getting-started](https://plot.ly/python/getting-started) |
|**MATLAB**| [plotly/matlab-api](https://github.com/plotly/matlab-api) | [plot.ly/matlab/getting-started](https://plot.ly/matlab/getting-started) |
|**node.js**| [plotly/plotly-nodejs](https://github.com/plotly/plotly-nodejs) | [plot.ly/nodejs/getting-started/](https://plot.ly/nodejs/getting-started/) |
|**Julia**| [plotly/Plotly.jl](https://github.com/plotly/Plotly.jl) | [plot.ly/julia/getting-started/](https://plot.ly/julia/getting-started/) |

plotly.js charts can also be created and saved online for free at [plot.ly/plot](https://plot.ly/plot).

## Creators

| | Github | Twitter |
|---|--------|---------|
|**Alex C. Johnson**| [@alexcjohnson](https://github.com/alexcjohnson) | |
|**Étienne Tétreault-Pinard**| [@etpinard](https://github.com/etpinard) | [@etpinard](https://twitter.com/etpinard) |
|**Mikola Lysenko**| [@mikolalysenko](https://github.com/mikolalysenko) | [@MikolaLysenko](https://twitter.com/MikolaLysenko) |
|**Ben Postlethwaite**| [@bpostlethwaite](https://github.com/bpostlethwaite) | |
|**Chris Parmer**| [@chriddyp](https://github.com/chriddyp) | |

## Copyright and license

Code and documentation copyright 2015 Plotly, Inc.
Code released under [the MIT license](https://github.com/plotly/plotly.js/blob/master/LICENSE).
Docs released under [Creative Commons](https://github.com/plotly/documentation/blob/source/LICENSE).
2 changes: 1 addition & 1 deletion devtools/test_dashboard/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var browserify = require('browserify');
var ecstatic = require('ecstatic');
var _open = require('open');

var makeWatchifiedBundle = require('../../tasks/watch_plotly');
var makeWatchifiedBundle = require('../../tasks/util/make_watchified_bundle');
var shortcutPaths = require('../../tasks/util/shortcut_paths');
var constants = require('../../tasks/util/constants');

Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@
],
"scripts": {
"preprocess": "node tasks/preprocess.js",
"postinstall": "npm run preprocess",
"bundle": "node tasks/bundle.js",
"build": "npm run preprocess && npm run bundle",
"watch": "node tasks/watch_plotly.js",
"lint": "cd src && jshint . || true",
"test-jasmine": "karma start test/jasmine/karma.conf.js",
"test-image": "node test/image/compare_pixels_test.js",
"test": "npm run test-jasmine && npm test-image",
Expand Down Expand Up @@ -97,6 +99,7 @@
"browserify-transform-tools": "^1.5.0",
"ecstatic": "^1.2.0",
"jasmine-core": "^2.3.4",
"jshint": "^2.8.0",
"karma": "^0.13.15",
"karma-browserify": "^4.4.0",
"karma-chrome-launcher": "^0.2.1",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ exports.prependTraces = Plotly.prependTraces;
exports.addTraces = Plotly.addTraces;
exports.deleteTraces = Plotly.deleteTraces;
exports.moveTraces = Plotly.moveTraces;
exports.setPlotConfig = require('./plot_api/set_plot_config');

// unofficial plot methods, use at your own risk
// unofficial 'beta' plot methods, use at your own risk
exports.Plots = Plotly.Plots;
exports.Fx = Plotly.Fx;

// TODO expose snapshot and plot_schema
exports.Snapshot = Plotly.Snapshot;
exports.PlotSchema = Plotly.PlotSchema;

// export d3 used in the bundle
exports.d3 = require('d3');
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions src/plot_api/set_plot_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';

var Plotly = require('../plotly');

/**
* Extends the plot config
*
* @param {object} configObj partial plot configuration object
* to extend the current plot configuration.
*
*/
module.exports = function setPlotConfig(configObj) {
return Plotly.Lib.extendFlat(Plotly.defaultConfig, configObj);
};
61 changes: 30 additions & 31 deletions src/plotly.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,61 +11,60 @@
// promise polyfill
require('es6-promise').polyfill();

exports.Lib = require('./lib/lib');
// lib functions
exports.Lib = require('./lib');
exports.util = require('./lib/svg_text_utils');
exports.Queue = require('./lib/queue');

// plot icons svg and plot css
exports.Icons = require('../build/ploticon');
require('../build/plotcss');

// configuration
exports.MathJaxConfig = require('./fonts/mathjax_config');
exports.defaultConfig = require('./plot_config');
exports.defaultConfig = require('./plot_api/plot_config');

// plots
exports.Plots = require('./plots/plots');
exports.Axes = require('./plots/cartesian/axes');
exports.Fx = require('./plots/cartesian/graph_interact');
exports.Scene = require('./plots/gl3d/scene');
exports.Gl3dLayout = require('./plots/gl3d/layout/layout');
exports.Gl3dLayout = require('./plots/gl3d/layout');
exports.Geo = require('./plots/geo/geo');
exports.GeoLayout = require('./plots/geo/layout/layout');
exports.GeoLayout = require('./plots/geo/layout');
exports.Scene2D = require('./plots/gl2d/scene2d');
exports.micropolar = require('./plots/polar/micropolar');

// components
exports.Color = require('./components/color/color');
exports.Drawing = require('./components/drawing/drawing');
exports.Colorscale = require('./components/colorscale/colorscale');
exports.Colorbar = require('./components/colorbar/colorbar');
exports.ErrorBars = require('./components/errorbars/errorbars');
exports.Annotations = require('./components/annotations/annotations');
exports.Shapes = require('./components/shapes/shapes');
exports.Titles = require('./components/titles/titles');
exports.Legend = require('./components/legend/legend');
exports.ModeBar = require('./components/modebar/modebar');
exports.Color = require('./components/color');
exports.Drawing = require('./components/drawing');
exports.Colorscale = require('./components/colorscale');
exports.Colorbar = require('./components/colorbar');
exports.ErrorBars = require('./components/errorbars');
exports.Annotations = require('./components/annotations');
exports.Shapes = require('./components/shapes');
exports.Titles = require('./components/titles');
exports.Legend = require('./components/legend');
exports.ModeBar = require('./components/modebar');

// traces
exports.Scatter = require('./traces/scatter/scatter');
exports.Bars = require('./traces/bars/bars');
exports.Boxes = require('./traces/boxes/boxes');
exports.Heatmap = require('./traces/heatmap/heatmap');
exports.Histogram = require('./traces/histogram/histogram');
exports.Pie = require('./traces/pie/pie');
exports.Contour = require('./traces/contour/contour');
exports.Scatter3D = require('./traces/scatter3d/scatter3d');
exports.Surface = require('./traces/surface/surface');
exports.Mesh3D = require('./traces/mesh3d/mesh3d');
exports.ScatterGeo = require('./traces/scattergeo/scattergeo');
exports.Choropleth = require('./traces/choropleth/choropleth');
exports.ScatterGl = require('./traces/scattergl/scattergl');
exports.Scatter = require('./traces/scatter');
exports.Bars = require('./traces/bars');
exports.Boxes = require('./traces/boxes');
exports.Heatmap = require('./traces/heatmap');
exports.Histogram = require('./traces/histogram');
exports.Pie = require('./traces/pie');
exports.Contour = require('./traces/contour');
exports.Scatter3D = require('./traces/scatter3d');
exports.Surface = require('./traces/surface');
exports.Mesh3D = require('./traces/mesh3d');
exports.ScatterGeo = require('./traces/scattergeo');
exports.Choropleth = require('./traces/choropleth');
exports.ScatterGl = require('./traces/scattergl');

// plot api
require('./plot_api/plot_api');
exports.PlotSchema = require('./plot_api/plot_schema');

// imaging routines
exports.Snapshot = require('./snapshot/snapshot');

// queue for undo/redo
exports.Queue = require('./lib/queue');
exports.Snapshot = require('./snapshot');
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/traces/choropleth/defaults.js
B83A
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('../../plotly');
var Choropleth = require('./choropleth');
var Choropleth = require('./');

module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
var locations, len, z;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/traces/mesh3d/defaults.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('../../plotly');
var Mesh3D = require('./mesh3d');
var Mesh3D = require('./');


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/traces/scatter3d/defaults.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('../../plotly');
var Scatter3D = require('./scatter3d');
var Scatter3D = require('./');


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/traces/scattergeo/defaults.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('../../plotly');
var ScatterGeo = require('./scattergeo');
var ScatterGeo = require('./');


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/traces/scattergl/defaults.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('../../plotly');
var ScatterGl = require('./scattergl');
var ScatterGl = require('./');


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
Expand Down
File renamed without changes.
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.
0