open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! resolve about:blank iframes to their parent URL

Browse Source
This commit is contained in:
tophf 2020-02-24 13:06:56 +03:00
parent 5583c7a798
commit 84dceb7ea5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
popup/popup.js
View File

@ -11,6 +11,7 @@ let installed;
let tabURL; let tabURL;
const handleEvent = {}; const handleEvent = {};
const ABOUT_BLANK = 'about:blank';
const ENTRY_ID_PREFIX_RAW = 'style-'; const ENTRY_ID_PREFIX_RAW = 'style-';
const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW; const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW;
@ -83,7 +84,7 @@ function toggleSideBorders(state = prefs.get('popup.borders')) {
function initTabUrls() { function initTabUrls() {
return getActiveTab() return getActiveTab()
.then((tab = {}) => .then((tab = {}) =>
FIREFOX && tab.status === 'loading' && tab.url === 'about:blank' FIREFOX && tab.status === 'loading' && tab.url === ABOUT_BLANK
? waitForTabUrlFF(tab) ? waitForTabUrlFF(tab)
: tab) : tab)
.then(tab => new Promise(resolve => .then(tab => new Promise(resolve =>
@ -159,7 +160,7 @@ function initPopup(frames) {
// so we'll wait a bit to handle popup being invoked right after switching // so we'll wait a bit to handle popup being invoked right after switching
if (retryCountdown > 0 && ( if (retryCountdown > 0 && (
tab.status !== 'complete' || tab.status !== 'complete' ||
FIREFOX && tab.url === 'about:blank')) { FIREFOX && tab.url === ABOUT_BLANK)) {
setTimeout(ping, 100, tab, --retryCountdown); setTimeout(ping, 100, tab, --retryCountdown);
return; return;
} }
@ -206,12 +207,13 @@ function sortTabFrames(frames) {
if (known.has(f.parentFrameId) || f.parentFrameId < 0) { if (known.has(f.parentFrameId) || f.parentFrameId < 0) {
known.set(frameId, f); known.set(frameId, f);
unknown.delete(frameId); unknown.delete(frameId);
if (f.url === ABOUT_BLANK) f.url = known.get(f.parentFrameId).url;
} }
} }
lastSize = unknown.size; // guard against an infinite loop due to a weird frame structure lastSize = unknown.size; // guard against an infinite loop due to a weird frame structure
} }
const sortedFrames = [...known.values(), ...unknown.values()]; const sortedFrames = [...known.values(), ...unknown.values()];
const urls = new Set(['about:blank']); const urls = new Set([ABOUT_BLANK]);
for (const f of sortedFrames) { for (const f of sortedFrames) {
f.isDupe = urls.has(f.url); f.isDupe = urls.has(f.url);
urls.add(f.url); urls.add(f.url);
@ -226,7 +228,7 @@ function createWriterElement(frame) {
// For this URL // For this URL
const urlLink = template.writeStyle.cloneNode(true); const urlLink = template.writeStyle.cloneNode(true);
const isAboutBlank = url === 'about:blank'; const isAboutBlank = url === ABOUT_BLANK;
Object.assign(urlLink, { Object.assign(urlLink, {
href: 'edit.html?url-prefix=' + encodeURIComponent(url), href: 'edit.html?url-prefix=' + encodeURIComponent(url),
title: `url-prefix("${url}")`, title: `url-prefix("${url}")`,