From d5865db457ef6f96aa32662a8219fdf73478ae20 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 15 Aug 2020 17:27:03 -0400 Subject: Popup API refactor (#732) * Simplify how parent/child are set * Remove unused public frameId property * Change use of getFrame * Simplify parent access * Use property for the container * Remove isProxy * Public function API parity * Public property API parity --- ext/fg/js/frontend.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ext/fg/js/frontend.js') diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js index 0c18fb2a..88038cd9 100644 --- a/ext/fg/js/frontend.js +++ b/ext/fg/js/frontend.js @@ -347,7 +347,13 @@ class Frontend { } _ignoreElements() { - return this._popup === null || this._popup.isProxy() ? [] : [this._popup.getContainer()]; + if (this._popup !== null) { + const container = this._popup.container; + if (container !== null) { + return [container]; + } + } + return []; } async _ignorePoint(x, y) { @@ -526,7 +532,6 @@ class Frontend { _broadcastRootPopupInformation() { if ( this._popup !== null && - !this._popup.isProxy() && this._depth === 0 && this._frameId === 0 ) { -- cgit v1.2.3