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

Disable PointerEvents in Firefox until they work. #6999

Merged
merged 2 commits into from
Sep 4, 2018
Merged

Disable PointerEvents in Firefox until they work. #6999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7d77b4
Disable PointerEvents in Firefox until they work.
mramato Sep 1, 2018
7da26d6
Update CHANGES
mramato Sep 4, 2018
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Change Log
* Added `heightReference` to `BoxGraphics`, `CylinderGraphics` and `EllipsoidGraphics`, which can be used to clamp these entity types to terrain [#6932](https://github.com/AnalyticalGraphicsInc/cesium/pull/6932)

##### Fixes :wrench:
* Fixed Firefox camera control issues with mouse and touch events. [#6372](https://github.com/AnalyticalGraphicsInc/cesium/issues/6372)
* Several performance improvements and fixes to the 3D Tiles traversal code. [#6390](https://github.com/AnalyticalGraphicsInc/cesium/pull/6390)
* Improved load performance when `skipLevelOfDetail` is false.
* Fixed a bug that caused some skipped tiles to load when `skipLevelOfDetail` is true.
Expand Down
4 changes: 3 additions & 1 deletion Source/Core/FeatureDetection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@ define([
//we still need to use it if it exists in order to support browsers
//that rely on it, such as the Windows WebBrowser control which defines
//PointerEvent but sets navigator.pointerEnabled to false.
hasPointerEvents = typeof PointerEvent !== 'undefined' && (!defined(theNavigator.pointerEnabled) || theNavigator.pointerEnabled);

//Firefox disabled because of https://github.com/AnalyticalGraphicsInc/cesium/issues/6372
hasPointerEvents = !isFirefox() && typeof PointerEvent !== 'undefined' && (!defined(theNavigator.pointerEnabled) || theNavigator.pointerEnabled);
}
return hasPointerEvents;
}
Expand Down
6 changes: 0 additions & 6 deletions Specs/Core/ScreenSpaceEventHandlerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ defineSuite([

beforeAll(function(){
usePointerEvents = FeatureDetection.supportsPointerEvents();

//See https://github.com/AnalyticalGraphicsInc/cesium/issues/6539
if (FeatureDetection.isFirefox()) {
usePointerEvents = false;
spyOn(FeatureDetection, 'supportsPointerEvents').and.returnValue(false);
}
});

beforeEach(function() {
Expand Down
6 changes: 0 additions & 6 deletions Specs/Scene/CameraEventAggregatorSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ defineSuite([

beforeAll(function() {
usePointerEvents = FeatureDetection.supportsPointerEvents();

//See https://github.com/AnalyticalGraphicsInc/cesium/issues/6539
if (FeatureDetection.isFirefox()) {
usePointerEvents = false;
spyOn(FeatureDetection, 'supportsPointerEvents').and.returnValue(false);
}
canvas = createCanvas(1024, 768);
});

Expand Down
6 changes: 0 additions & 6 deletions Specs/Scene/ScreenSpaceCameraControllerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ defineSuite([
}
beforeAll(function() {
usePointerEvents = FeatureDetection.supportsPointerEvents();

//See https://github.com/AnalyticalGraphicsInc/cesium/issues/6539
if (FeatureDetection.isFirefox()) {
usePointerEvents = false;
spyOn(FeatureDetection, 'supportsPointerEvents').and.returnValue(false);
}
canvas = createCanvas(1024, 768);
});

Expand Down