Skip to content

Commit

Permalink
Merger Peter developments
Browse files Browse the repository at this point in the history
  • Loading branch information
Alessandro Burato committed Sep 12, 2016
1 parent 2c8df17 commit 1958f6a
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 38 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master

where X.Y.Z is the semver of most recent plotly.js release.

## [1.16.3-d16] -- 2016-09-12

### Changed
- Merged Peter developments for treemaps


## [1.16.3-d16] -- 2016-09-08

### Changed
Expand Down
12 changes: 6 additions & 6 deletions dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.

It be can imported as minified javascript
- using dist file `dist/plotly.min.js`
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.16.3-d16.min.js
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.16.3-d17.min.js

or as raw javascript:
- using dist file `dist/plotly.js`
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.16.3-d16.js
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.16.3-d17.js
- using CommonJS with `require('plotly.js')`

If you would like to have access to the attribute meta information (including attribute descriptions as on the [schema reference page](https://plot.ly/javascript/reference/)), use dist file `dist/plotly-with-meta.js`
Expand All @@ -49,7 +49,7 @@ The main plotly.js bundle weights in at:

| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
|-----------|---------------|----------------------|---------------------|
| 3.9 MB | 1.6 MB | 499.9 kB | 4 MB |
| 3.9 MB | 1.6 MB | 499.1 kB | 4 MB |

## Partial bundles

Expand All @@ -67,13 +67,13 @@ The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`,
| dist bundle (minified) | `dist/plotly-cartesian.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-cartesian-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.16.3-d16.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.16.3-d16.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.16.3-d17.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.16.3-d17.min.js |
| CommonJS | `require('plotly.js/lib/index-cartesian')` |

| Raw size | Minified size | Minified + gzip size |
|------|-----------------|------------------------|
| 1.6 MB | 620.3 kB | 202 kB |
| 1.6 MB | 618.3 kB | 201.3 kB |

----------------

Expand Down
24 changes: 12 additions & 12 deletions dist/plotly-cartesian.min.js

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions dist/plotly.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plotly.js",
"version": "1.16.3-d16",
"version": "1.16.3-d17",
"description": "The open source javascript graphing library that powers plotly",
"license": "MIT",
"main": "./lib/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/geo_assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ var saneTopojson = require('sane-topojson');


// package version injected by `npm run preprocess`
exports.version = '1.16.3-d16';
exports.version = '1.16.3-d17';

exports.topojson = saneTopojson;
2 changes: 1 addition & 1 deletion src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
var Plotly = require('./plotly');

// package version injected by `npm run preprocess`
exports.version = '1.16.3-d16';
exports.version = '1.16.3-d17';

// plot api
exports.plot = Plotly.plot;
Expand Down

0 comments on commit 1958f6a

Please sign in to comment.