Skip to content

Commit 3de73d5

Browse files
etpinardetpinard
committed
Merge pull request #4 from plotly/fix-d3-geo-dblclick
More consistent geo maps configs
2 parents 19886d2 + 050e53b commit 3de73d5

Some content is hidden

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

41 files changed

+112120
-112434
lines changed

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@ node_modules
33
build/*
44
!build/README.md
55

6-
dist/*
7-
!dist/README.md
8-
96
npm-debug.log

‎devtools/test_dashboard/index.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111

1212
<script type="text/javascript" src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
1313

14-
<script type="text/javascript" src="../../dist/plotly.js" charset="utf-8"></script>
15-
<script>PLOTLYENV = { TOPOJSON_URL: '../../src/assets/topojson/' };</script>
14+
<!-- use dev plotly.js build -->
15+
<script type="text/javascript" src="../../build/plotly.js" charset="utf-8"></script>
16+
17+
<!-- use local topojson files -->
18+
<script>Plotly.setPlotConfig({ topojsonURL: '../../dist/topojson/' });</script>
1619

1720
<script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
1821

19-
<!-- helper functions to manipulate graph div -->
22+
<!-- helper functions to manipulate the graph div -->
2023
<script>
2124
var Tabs = {
2225
getGraph: function() {

‎dist/plotly-geo-assets.js‎

Lines changed: 42 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-with-meta.js‎

Lines changed: 56656 additions & 56258 deletions
Large diffs are not rendered by default.

‎dist/plotly.js‎

Lines changed: 55284 additions & 56043 deletions
Large diffs are not rendered by default.

‎dist/plotly.min.js‎

Lines changed: 35 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/topojson/africa_110m.json renamed to dist/topojson/africa_110m.json

File renamed without changes.

src/assets/topojson/africa_50m.json renamed to dist/topojson/africa_50m.json

File renamed without changes.

src/assets/topojson/asia_110m.json renamed to dist/topojson/asia_110m.json

File renamed without changes.

src/assets/topojson/asia_50m.json renamed to dist/topojson/asia_50m.json

File renamed without changes.

0 commit comments

Comments
 (0)