Fix geo plot hover interaction for Firefox #5607
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -715,6 +715,18 @@ lib.isIOS = function() { | |
| return IS_IOS_REGEX.test(window.navigator.userAgent); | ||
| }; | ||
|
|
||
| var FIREFOX_VERSION_REGEX = /Firefox\/(\d+)\.\d+/; | ||
| lib.getFirefoxVersion = function() { | ||
| var match = FIREFOX_VERSION_REGEX.exec(window.navigator.userAgent); | ||
| if(match && match.length === 2) { | ||
| var versionInt = parseInt(match[1]); | ||
| if(!isNaN(versionInt)) { | ||
| return versionInt; | ||
| } | ||
| } | ||
| return null; | ||
| }; | ||
|
|
||
| lib.isD3Selection = function(obj) { | ||
| return obj instanceof d3.selection; | ||
| }; | ||
|
|
@@ -1267,3 +1279,27 @@ lib.join2 = function(arr, mainSeparator, lastSeparator) { | |
| lib.bigFont = function(size) { | ||
| return Math.round(1.2 * size); | ||
| }; | ||
|
|
||
| var firefoxVersion = lib.getFirefoxVersion(); | ||
| // see https://bugzilla.mozilla.org/show_bug.cgi?id=1684973 | ||
| var isProblematicFirefox = firefoxVersion !== null && firefoxVersion < 86; | ||
|
|
||
| /** | ||
| * Return the mouse position from the last event registered by D3. | ||
| * @returns An array with two numbers, representing the x and y coordinates of the mouse pointer | ||
| * at the event relative to the targeted node. | ||
| */ | ||
| lib.getPositionFromD3Event = function() { | ||
|
There was a problem hiding this comment. Non-blocking suggestion to avoid if statement inside the function: lib.getPositionFromD3Event = isProblematicFirefox ?
function() {
// layerX and layerY are non-standard, so we only fallback to them when we have to:
return [
d3.event.layerX,
d3.event.layerY
];
} : function() {
return [
d3.event.offsetX,
d3.event.offsetY
];
};There was a problem hiding this comment. Personally I find ternary operators way harder to read - but I'd say that's just personal preference in the end :D There was a problem hiding this comment. I think the point of @archmoj's comment was not so much about whether to use if (isProblematicFirefox) {
lib.getPositionFromD3Event = function() {...}
} else {
lib.getPositionFromD3Event = function() {...}
} |
||
| if(isProblematicFirefox) { | ||
| // layerX and layerY are non-standard, so we only fallback to them when we have to: | ||
| return [ | ||
| d3.event.layerX, | ||
| d3.event.layerY | ||
| ]; | ||
| } else { | ||
| return [ | ||
| d3.event.offsetX, | ||
| d3.event.offsetY | ||
| ]; | ||
| } | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It appears regex.
execwas not used in any other places of our code.Wondering is it is possible to convert this regex.
execto a regex.test?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately not, as regex.test does only return true or false, but we need to evaluate the exact version of Firefox in the user agent string.
However, exec has the same compatibility as test: see mdn