Skip to content
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.

Sign up for GitHub

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

Jump to bottom

5094 firefox tests #5095

Merged
merged 8 commits into from
Aug 18, 2022
Merged

5094 firefox tests #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1045f78
Add original mouse/touch events to cursor event detail
diarmidmackenzie Aug 12, 2022
5cc91a9
Undo change made by mistake
diarmidmackenzie Aug 12, 2022
5462067
Example for cursor mouse events
diarmidmackenzie Aug 12, 2022
d33ab7b
Documentation updates for original events on cursor
diarmidmackenzie Aug 12, 2022
a043f72
originalEvent -> mouseEvent and touchEvent
diarmidmackenzie Aug 15, 2022
fb260f7
Fix broken tests on firefox
diarmidmackenzie Aug 17, 2022
461962e
Merge branch 'master' into 5094-firefox-tests
diarmidmackenzie Aug 17, 2022
d5fd5eb
Fix lint error arising from merge
diarmidmackenzie Aug 17, 2022
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
3 changes: 2 additions & 1 deletion src/components/cursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ module.exports.Component = registerComponent('cursor', {
function addOriginalEvent (detail, evt) {
if (originalEvent instanceof MouseEvent) {
detail.mouseEvent = originalEvent;
} else if (originalEvent instanceof TouchEvent) {
} else if (typeof TouchEvent !== 'undefined' &&
originalEvent instanceof TouchEvent) {
detail.touchEvent = originalEvent;
}
}
Expand Down
64 changes: 34 additions & 30 deletions tests/components/cursor.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* global assert, process, setup, suite, test, CustomEvent, MouseEvent, TouchEvent */
var entityFactory = require('../helpers').entityFactory;
var once = require('../helpers').once;
const touchEventSupported = (typeof TouchEvent !== 'undefined');

suite('cursor', function () {
var cameraEl;
Expand Down Expand Up @@ -512,41 +513,44 @@ suite('cursor', function () {
component.onCursorUp(mouseUp);
});

test('original touchstart event', function (done) {
component.intersection = intersection;
component.intersectedEl = intersectedEl;
const touchStart = new TouchEvent('touchstart');
once(el, 'mousedown', function (e) {
assert.equal(e.detail.touchEvent, touchStart);
done();
// Some browsers (e.g. Firefox) don't support TouchEvent as a constructor
if (touchEventSupported) {
test('original touchstart event', function (done) {
component.intersection = intersection;
component.intersectedEl = intersectedEl;
const touchStart = new TouchEvent('touchstart');
once(el, 'mousedown', function (e) {
assert.equal(e.detail.touchEvent, touchStart);
done();
});
component.onCursorDown(touchStart);
});
component.onCursorDown(touchStart);
});

test('original touchend event', function (done) {
component.intersection = intersection;
component.intersectedEl = intersectedEl;
const touchEnd = new TouchEvent('touchend');
once(el, 'mouseup', function (e) {
assert.equal(e.detail.touchEvent, touchEnd);
done();
test('original touchend event', function (done) {
component.intersection = intersection;
component.intersectedEl = intersectedEl;
const touchEnd = new TouchEvent('touchend');
once(el, 'mouseup', function (e) {
assert.equal(e.detail.touchEvent, touchEnd);
done();
});
component.isCursorDown = true;
component.onCursorUp(touchEnd);
});
component.isCursorDown = true;
component.onCursorUp(touchEnd);
});

test('original touchend event on click', function (done) {
component.intersection = intersection;
component.intersectedEl = intersectedEl;
component.cursorDownEl = intersectedEl;
const touchEnd = new TouchEvent('touchend');
once(el, 'click', function (e) {
assert.equal(e.detail.touchEvent, touchEnd);
done();
test('original touchend event on click', function (done) {
component.intersection = intersection;
component.intersectedEl = intersectedEl;
component.cursorDownEl = intersectedEl;
const touchEnd = new TouchEvent('touchend');
once(el, 'click', function (e) {
assert.equal(e.detail.touchEvent, touchEnd);
done();
});
component.isCursorDown = true;
component.onCursorUp(touchEnd);
});
component.isCursorDown = true;
component.onCursorUp(touchEnd);
});
}
});
});

Expand Down