Skip to content

Commit 3054411

Browse files
committed
patch plotly.js source to support phantomjs/shinytest
reverts part of plotly/plotly.js#5380
1 parent a00122b commit 3054411

File tree

12 files changed

+139
-87
lines changed

12 files changed

+139
-87
lines changed

inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,9 @@
439439
},
440440
{
441441
"name": "plotly-htmlwidgets-css",
442-
"version": "1.57.1",
442+
"version": "2.0.0",
443443
"src": {
444-
"href": "plotly-htmlwidgets-css-1.57.1"
444+
"href": "plotly-htmlwidgets-css-2.0.0"
445445
},
446446
"meta": null,
447447
"script": null,
@@ -452,9 +452,9 @@
452452
},
453453
{
454454
"name": "plotly-main",
455-
"version": "1.57.1",
455+
"version": "2.0.0",
456456
"src": {
457-
"href": "plotly-main-1.57.1"
457+
"href": "plotly-main-2.0.0"
458458
},
459459
"meta": null,
460460
"script": "plotly-latest.min.js",
Loading

inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"plotly_afterplot-A": "\"plot\"",
1818
"plotly_click-A": "[{\"curveNumber\":0,\"pointNumber\":7,\"x\":24.4,\"y\":3.19,\"customdata\":\"Merc 240D\"}]",
1919
"plotly_hover-A": null,
20+
"plotly_relayout-A": "{\"width\":962,\"height\":400}",
2021
"plotType": "ggplotly"
2122
},
2223
"output": {
@@ -456,9 +457,9 @@
456457
},
457458
{
458459
"name": "plotly-htmlwidgets-css",
459-
"version": "1.57.1",
460+
"version": "2.0.0",
460461
"src": {
461-
"href": "plotly-htmlwidgets-css-1.57.1"
462+
"href": "plotly-htmlwidgets-css-2.0.0"
462463
},
463464
"meta": null,
464465
"script": null,
@@ -469,9 +470,9 @@
469470
},
470471
{
471472
"name": "plotly-main",
472-
"version": "1.57.1",
473+
"version": "2.0.0",
473474
"src": {
474-
"href": "plotly-main-1.57.1"
475+
"href": "plotly-main-2.0.0"
475476
},
476477
"meta": null,
477478
"script": "plotly-latest.min.js",
Loading

inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"plotly_brushing-A": "{\"x\":[23.95978500551268,25.98332414553473],\"y\":[3.0020072289156627,3.5073743975903615]}",
2020
"plotly_click-A": "[{\"curveNumber\":0,\"pointNumber\":7,\"x\":24.4,\"y\":3.19,\"customdata\":\"Merc 240D\"}]",
2121
"plotly_hover-A": null,
22+
"plotly_relayout-A": "{\"width\":962,\"height\":400}",
2223
"plotly_selected-A": "[{\"curveNumber\":0,\"pointNumber\":7,\"x\":24.4,\"y\":3.19,\"customdata\":\"Merc 240D\"}]",
2324
"plotly_selecting-A": "[{\"curveNumber\":0,\"pointNumber\":7,\"x\":24.4,\"y\":3.19,\"customdata\":\"Merc 240D\"}]",
2425
"plotType": "ggplotly"
@@ -460,9 +461,9 @@
460461
},
461462
{
462463
"name": "plotly-htmlwidgets-css",
463-
"version": "1.57.1",
464+
"version": "2.0.0",
464465
"src": {
465-
"href": "plotly-htmlwidgets-css-1.57.1"
466+
"href": "plotly-htmlwidgets-css-2.0.0"
466467
},
467468
"meta": null,
468469
"script": null,
@@ -473,9 +474,9 @@
473474
},
474475
{
475476
"name": "plotly-main",
476-
"version": "1.57.1",
477+
"version": "2.0.0",
477478
"src": {
478-
"href": "plotly-main-1.57.1"
479+
"href": "plotly-main-2.0.0"
479480
},
480481
"meta": null,
481482
"script": "plotly-latest.min.js",
Loading

inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"plotly_click-A": null,
2121
"plotly_deselect-A": "\"plot\"",
2222
"plotly_hover-A": null,
23+
"plotly_relayout-A": "{\"width\":962,\"height\":400}",
2324
"plotly_selected-A": null,
2425
"plotly_selecting-A": null,
2526
"plotType": "ggplotly"
@@ -461,9 +462,9 @@
461462
},
462463
{
463464
"name": "plotly-htmlwidgets-css",
464-
"version": "1.57.1",
465+
"version": "2.0.0",
465466
"src": {
466-
"href": "plotly-htmlwidgets-css-1.57.1"
467+
"href": "plotly-htmlwidgets-css-2.0.0"
467468
},
468469
"meta": null,
469470
"script": null,
@@ -474,9 +475,9 @@
474475
},
475476
{
476477
"name": "plotly-main",
477-
"version": "1.57.1",
478+
"version": "2.0.0",
478479
"src": {
479-
"href": "plotly-main-1.57.1"
480+
"href": "plotly-main-2.0.0"
480481
},
481482
"meta": null,
482483
"script": "plotly-latest.min.js",
Loading

inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

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

inst/plotlyjs.R

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)