Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-05-14 00:22:41 +08:00
commit da96236a03
14 changed files with 3 additions and 2495 deletions

View file

@ -1206,7 +1206,7 @@
}
case "DOMMouseScroll": {
this._autoScrollPopup.hidePopup();
event.preventDefault();
aEvent.preventDefault();
break;
}
case "popuphidden": {