summaryrefslogtreecommitdiff
path: root/ext/fg
diff options
context:
space:
mode:
authorsiikamiika <siikamiika@users.noreply.github.com>2020-03-19 00:00:42 +0200
committersiikamiika <siikamiika@users.noreply.github.com>2020-04-05 19:57:37 +0300
commit6806e7055f312ad1ff382118255ffe1004b7eace (patch)
tree018c02d893996f887d2b4a2fe71c6ded5610d18a /ext/fg
parent3684a479c5e12efe63c54e5532a264d157a6816d (diff)
show iframe popups in root frame
Diffstat (limited to 'ext/fg')
-rw-r--r--ext/fg/js/frontend-initialize.js21
-rw-r--r--ext/fg/js/frontend.js3
-rw-r--r--ext/fg/js/popup.js19
3 files changed, 41 insertions, 2 deletions
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 3a191247..7f70d9c4 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -20,6 +20,7 @@
* Frontend
* PopupProxy
* PopupProxyHost
+ * apiForward
*/
async function main() {
@@ -29,7 +30,25 @@ async function main() {
const {id, depth=0, parentFrameId, url, proxy=false} = data;
let popup;
- if (proxy) {
+ if (!proxy && (window !== window.parent)) {
+ let rootPopupInformationResolve;
+ const rootPopupInformationPromise = new Promise((resolve) => (rootPopupInformationResolve = resolve));
+
+ const runtimeMessageCallback = ({action, params}, sender, callback) => {
+ if (action === 'rootPopupInformation') {
+ chrome.runtime.onMessage.removeListener(runtimeMessageCallback);
+ callback();
+ rootPopupInformationResolve(params);
+ return false;
+ }
+ };
+ chrome.runtime.onMessage.addListener(runtimeMessageCallback);
+ apiForward('rootPopupInformationGet');
+
+ const {popupId, frameId} = await rootPopupInformationPromise;
+
+ popup = new PopupProxy(popupId, 0, null, frameId, url);
+ } else if (proxy) {
popup = new PopupProxy(null, depth + 1, id, parentFrameId, url);
} else {
const popupHost = new PopupProxyHost();
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index d6c5eac6..af5341c4 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -52,7 +52,8 @@ class Frontend extends TextScanner {
]);
this._runtimeMessageHandlers = new Map([
- ['popupSetVisibleOverride', ({visible}) => { this.popup.setVisibleOverride(visible); }]
+ ['popupSetVisibleOverride', ({visible}) => { this.popup.setVisibleOverride(visible); }],
+ ['rootPopupInformationGet', () => { this.popup.broadcastRootPopupInformation(); }]
]);
}
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index e6e93a76..e6596a1a 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -17,6 +17,7 @@
*/
/* global
+ * apiForward
* apiGetMessageToken
* apiInjectStylesheet
*/
@@ -79,6 +80,20 @@ class Popup {
return false;
}
+ async broadcastRootPopupInformation() {
+ if (this._depth === 0) {
+ try {
+ const {frameId} = await this._frameIdPromise;
+ if (typeof frameId === 'number') {
+ this._frameId = frameId;
+ }
+ } catch (e) {
+ // NOP
+ }
+ apiForward('rootPopupInformation', {popupId: this._id, frameId: this._frameId});
+ }
+ }
+
async setOptions(options) {
this._options = options;
this.updateTheme();
@@ -202,6 +217,10 @@ class Popup {
// NOP
}
+ if (this._depth === 0) {
+ apiForward('rootPopupInformation', {popupId: this._id, frameId: this._frameId});
+ }
+
if (this._messageToken === null) {
this._messageToken = await apiGetMessageToken();
}