Merge branch 'master' into testing

1 files changed, 2 insertions, 2 deletions

diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index d8dec4df..b2f18b97 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -50,7 +50,7 @@ class PopupProxyHost {
     }
 
     createPopup(parentId, depth) {
-        const parent = (typeof parentId === 'string' && this.popups.hasOwnProperty(parentId) ? this.popups[parentId] : null);
+        const parent = (typeof parentId === 'string' && hasOwn(this.popups, parentId) ? this.popups[parentId] : null);
         const id = `${this.nextId}`;
         if (parent !== null) {
             depth = parent.depth + 1;
@@ -70,7 +70,7 @@ class PopupProxyHost {
     }
 
     getPopup(id) {
-        if (!this.popups.hasOwnProperty(id)) {
+        if (!hasOwn(this.popups, id)) {
             throw new Error('Invalid popup ID');
         }