From e2bf22831ab9aa26a6f30ff75c584202f79dc523 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Mon, 9 Mar 2020 02:10:28 +0200 Subject: [PATCH] start popup depth from 1 on search page --- ext/fg/js/frontend-initialize.js | 2 +- ext/fg/js/popup-proxy-host.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js index bbb789cc..e674724e 100644 --- a/ext/fg/js/frontend-initialize.js +++ b/ext/fg/js/frontend-initialize.js @@ -31,7 +31,7 @@ async function main() { const popupHost = new PopupProxyHost(); await popupHost.prepare(); - popup = popupHost.getOrCreatePopup(); + popup = popupHost.getOrCreatePopup(null, null, depth); } const frontend = new Frontend(popup, ignoreNodes); diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js index 7d86aa67..fdb54cdd 100644 --- a/ext/fg/js/popup-proxy-host.js +++ b/ext/fg/js/popup-proxy-host.js @@ -47,7 +47,7 @@ class PopupProxyHost { ])); } - getOrCreatePopup(id=null, parentId=null) { + getOrCreatePopup(id=null, parentId=null, depth=0) { // Find by existing id if (id !== null) { const popup = this._popups.get(id); @@ -76,7 +76,12 @@ class PopupProxyHost { } // Create new popup - const depth = (parent !== null ? parent.depth + 1 : 0); + if (parent !== null) { + if (depth !== 0) { + throw new Error('Depth cannot be set when parent exists'); + } + depth = parent.depth + 1; + } const popup = new Popup(id, depth, this._frameIdPromise); if (parent !== null) { popup.setParent(parent);