From f351cdaf230ae2828df52754ae16a59019b1a3a9 Mon Sep 17 00:00:00 2001 From: J Paterson Date: Thu, 29 Oct 2020 09:04:54 -0700 Subject: [PATCH 1/5] update gl-plot3d version --- package-lock.json | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09c442ac104..7e3befe381a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4971,9 +4971,8 @@ } }, "gl-plot3d": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-2.4.6.tgz", - "integrity": "sha512-CkrNvDKu0p74Di2g2Oc9kU+s1Oe+wi4cIfHzXABp8DvfoRl0/bayqJ9q8EcRAqMeQQxQZYGvJkk4hlBwI758Jw==", + "version": "git://github.com/jdpaterson/gl-plot3d.git#8f96f0362366394a188b2f7451faf4b48da85433", + "from": "git://github.com/jdpaterson/gl-plot3d.git#8f96f0362366394a188b2f7451faf4b48da85433", "requires": { "3d-view": "^2.0.0", "a-big-triangle": "^1.0.3", diff --git a/package.json b/package.json index e953fa40921..62f7ca0f5b4 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.3.1", "gl-plot2d": "^1.4.5", - "gl-plot3d": "^2.4.6", + "gl-plot3d": "git://github.com/jdpaterson/gl-plot3d.git#8f96f0362366394a188b2f7451faf4b48da85433", "gl-pointcloud2d": "^1.0.3", "gl-scatter3d": "^1.2.3", "gl-select-box": "^1.0.4", From 61b599fc8eb7f6728f8e30b420a46d84d62576aa Mon Sep 17 00:00:00 2001 From: J Paterson Date: Thu, 29 Oct 2020 13:45:43 -0700 Subject: [PATCH 2/5] fix scroll while panning test --- test/jasmine/tests/gl3d_plot_interact_test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/jasmine/tests/gl3d_plot_interact_test.js b/test/jasmine/tests/gl3d_plot_interact_test.js index eee0e2a2395..3910032b49f 100644 --- a/test/jasmine/tests/gl3d_plot_interact_test.js +++ b/test/jasmine/tests/gl3d_plot_interact_test.js @@ -941,15 +941,15 @@ describe('Test gl3d drag and wheel interactions', function() { var sceneTarget; var relayoutCallback = jasmine.createSpy('relayoutCallback'); - function assertEvent(e) { - expect(e.defaultPrevented).toEqual(true); + function assertEvent(e, passive) { + expect(e.defaultPrevented).toEqual(!passive); relayoutCallback(); } - gd.addEventListener('touchend', assertEvent); - gd.addEventListener('touchstart', assertEvent); - gd.addEventListener('touchmove', assertEvent); - gd.addEventListener('wheel', assertEvent); + gd.addEventListener('touchend', (e) => assertEvent(e, true)); + gd.addEventListener('touchstart', (e) => assertEvent(e, true)); + gd.addEventListener('touchmove', (e) => assertEvent(e, false)); + gd.addEventListener('wheel', (e) => assertEvent(e, false)); Plotly.plot(gd, mock) .then(function() { From cb116d0fc20d5f53ec9123ac99b9075bab0eb4a2 Mon Sep 17 00:00:00 2001 From: J Paterson Date: Thu, 29 Oct 2020 13:57:40 -0700 Subject: [PATCH 3/5] use eslint friendly syntax --- test/jasmine/tests/gl3d_plot_interact_test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/jasmine/tests/gl3d_plot_interact_test.js b/test/jasmine/tests/gl3d_plot_interact_test.js index 3910032b49f..72d5e045049 100644 --- a/test/jasmine/tests/gl3d_plot_interact_test.js +++ b/test/jasmine/tests/gl3d_plot_interact_test.js @@ -946,10 +946,10 @@ describe('Test gl3d drag and wheel interactions', function() { relayoutCallback(); } - gd.addEventListener('touchend', (e) => assertEvent(e, true)); - gd.addEventListener('touchstart', (e) => assertEvent(e, true)); - gd.addEventListener('touchmove', (e) => assertEvent(e, false)); - gd.addEventListener('wheel', (e) => assertEvent(e, false)); + gd.addEventListener('touchend', function(e) { assertEvent(e, true); }); + gd.addEventListener('touchstart', function(e) { assertEvent(e, true); }); + gd.addEventListener('touchmove', function(e) { assertEvent(e, true); }); + gd.addEventListener('wheel', function(e) { assertEvent(e, true); }); Plotly.plot(gd, mock) .then(function() { From f4d03e4e7e29e1f1eeb1914942f1a94156b41b70 Mon Sep 17 00:00:00 2001 From: J Paterson Date: Thu, 29 Oct 2020 14:27:27 -0700 Subject: [PATCH 4/5] update values passed to assertEvent use non-blocking assert syntax --- test/jasmine/tests/gl3d_plot_interact_test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/jasmine/tests/gl3d_plot_interact_test.js b/test/jasmine/tests/gl3d_plot_interact_test.js index 72d5e045049..92ef3de8003 100644 --- a/test/jasmine/tests/gl3d_plot_interact_test.js +++ b/test/jasmine/tests/gl3d_plot_interact_test.js @@ -942,14 +942,14 @@ describe('Test gl3d drag and wheel interactions', function() { var relayoutCallback = jasmine.createSpy('relayoutCallback'); function assertEvent(e, passive) { - expect(e.defaultPrevented).toEqual(!passive); + expect(e.defaultPrevented).not.toEqual(passive); relayoutCallback(); } gd.addEventListener('touchend', function(e) { assertEvent(e, true); }); gd.addEventListener('touchstart', function(e) { assertEvent(e, true); }); - gd.addEventListener('touchmove', function(e) { assertEvent(e, true); }); - gd.addEventListener('wheel', function(e) { assertEvent(e, true); }); + gd.addEventListener('touchmove', function(e) { assertEvent(e, false); }); + gd.addEventListener('wheel', function(e) { assertEvent(e, false); }); Plotly.plot(gd, mock) .then(function() { From 95ca0d91cc556b421591ce51a01fb33edfe338d0 Mon Sep 17 00:00:00 2001 From: "J. Paterson" Date: Mon, 2 Nov 2020 02:43:40 +0000 Subject: [PATCH 5/5] bump gl-plot3d to ^2.4.7 --- package-lock.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e3befe381a..6d554db946f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4971,8 +4971,9 @@ } }, "gl-plot3d": { - "version": "git://github.com/jdpaterson/gl-plot3d.git#8f96f0362366394a188b2f7451faf4b48da85433", - "from": "git://github.com/jdpaterson/gl-plot3d.git#8f96f0362366394a188b2f7451faf4b48da85433", + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-2.4.7.tgz", + "integrity": "sha512-mLDVWrl4Dj0O0druWyHUK5l7cBQrRIJRn2oROEgrRuOgbbrLAzsREKefwMO0bA0YqkiZMFMnV5VvPA9j57X5Xg==", "requires": { "3d-view": "^2.0.0", "a-big-triangle": "^1.0.3", diff --git a/package.json b/package.json index 62f7ca0f5b4..ced8201c818 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.3.1", "gl-plot2d": "^1.4.5", - "gl-plot3d": "git://github.com/jdpaterson/gl-plot3d.git#8f96f0362366394a188b2f7451faf4b48da85433", + "gl-plot3d": "^2.4.7", "gl-pointcloud2d": "^1.0.3", "gl-scatter3d": "^1.2.3", "gl-select-box": "^1.0.4",