fine-tune choosing fetch type

StigNygaard · May 9, 2024 · 4d8f666 · 4d8f666
1 parent f9e5629
commit 4d8f666
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/WebExtension/contentscript.js b/WebExtension/contentscript.js
@@ -387,10 +387,10 @@
 
  context.debug(' *** fetchMode: ' + imgrequest.fetchMode + ' ***');
 
- const pageHostname = (new URL(imgrequest.baseURI))?.hostname; // TODO ideally check against window.location instead of Node.baseURI ?!?
- const imgHostname = (new URL(imgrequest.imageURL))?.hostname;
+ const pageOrigin = (new URL(window.location))?.origin;
+ const imgOrigin = (new URL(propertiesObj.URL))?.origin;
  if ( imgrequest.fetchMode === 'devFrontendFetch' ||
- imgrequest.fetchMode === 'devAutoFetch' && ((pageHostname === imgHostname) || propertiesObj.URL.startsWith('data:') || propertiesObj.URL.startsWith('blob:') || propertiesObj.URL.startsWith('file:')) ) { // Do frontend fetch...
+ imgrequest.fetchMode === 'devAutoFetch' && ((pageOrigin === imgOrigin) || imgOrigin.startsWith('data:') || imgOrigin.startsWith('blob:') || imgOrigin.startsWith('file:')) ) { // Do frontend fetch...
  if (imgrequest.fetchMode !== 'devAutoFetch') {
  console.warn(`xIFr: Forced FRONTEND fetch (${imgrequest.fetchMode})`);
  }