зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1528774 - Remove unnecessary code in GridItem's onGridCheckboxClick. r=nchevobbe
Removed unnecessary code in GridItem.js file's onGridCheckboxClick function and updated the render function so that the onInspectIconClick call triggers the stopPropagation function. Differential Revision: https://phabricator.services.mozilla.com/D37612 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
d0817ff762
Коммит
7c12423a03
|
@ -83,22 +83,8 @@ class GridItem extends PureComponent {
|
||||||
this.props.onSetGridOverlayColor(this.props.grid.nodeFront, color);
|
this.props.onSetGridOverlayColor(this.props.grid.nodeFront, color);
|
||||||
}
|
}
|
||||||
|
|
||||||
onGridCheckboxClick(e) {
|
onGridCheckboxClick() {
|
||||||
// If the click was on the svg icon to select the node in the inspector, bail out.
|
|
||||||
const originalTarget =
|
|
||||||
e.nativeEvent && e.nativeEvent.explicitOriginalTarget;
|
|
||||||
if (
|
|
||||||
originalTarget &&
|
|
||||||
originalTarget.namespaceURI === "http://www.w3.org/2000/svg"
|
|
||||||
) {
|
|
||||||
// We should be able to cancel the click event propagation after the following reps
|
|
||||||
// issue is implemented : https://github.com/firefox-devtools/reps/issues/95 .
|
|
||||||
e.preventDefault();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { grid, onToggleGridHighlighter } = this.props;
|
const { grid, onToggleGridHighlighter } = this.props;
|
||||||
|
|
||||||
onToggleGridHighlighter(grid.nodeFront);
|
onToggleGridHighlighter(grid.nodeFront);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,8 +150,11 @@ class GridItem extends PureComponent {
|
||||||
onDOMNodeMouseOut: () => onHideBoxModelHighlighter(),
|
onDOMNodeMouseOut: () => onHideBoxModelHighlighter(),
|
||||||
onDOMNodeMouseOver: () =>
|
onDOMNodeMouseOver: () =>
|
||||||
onShowBoxModelHighlighterForNode(grid.nodeFront),
|
onShowBoxModelHighlighterForNode(grid.nodeFront),
|
||||||
onInspectIconClick: () =>
|
onInspectIconClick: (_, e) => {
|
||||||
this.onGridInspectIconClick(grid.nodeFront),
|
// Stoping click propagation to avoid firing onGridCheckboxClick()
|
||||||
|
e.stopPropagation();
|
||||||
|
this.onGridInspectIconClick(grid.nodeFront);
|
||||||
|
},
|
||||||
})
|
})
|
||||||
),
|
),
|
||||||
dom.div({
|
dom.div({
|
||||||
|
|
Загрузка…
Ссылка в новой задаче