fixes and library updates

background.js

@@ -124,11 +124,15 @@ async function postProcessImage(image) {
 	if (image.src.startsWith("data:image/")) {
 		image.dataUrl = image.src;
 		image.src = "inline." + image.src.substr(11, 3); // this should extract file type - png/jpg
-
-		return;
 	}
-
-	image.dataUrl = await fetchImage(image.src, image);
+	else {
+		try {
+			image.dataUrl = await fetchImage(image.src, image);
+		}
+		catch (e) {
+			console.log(`Cannot fetch image from ${image.src}`);
+		}
+	}
 }
 
 async function postProcessImages(resp) {
@@ -268,6 +272,8 @@ browser.contextMenus.onClicked.addListener(async function(info, tab) {
 });
 
 browser.runtime.onMessage.addListener(async request => {
+	console.log("Received", request);
+
 	if (request.name === 'openNoteInTrilium') {
 		const resp = await triliumServerFacade.callService('POST', 'open/' + request.noteId);
 

content.js

@@ -189,14 +189,21 @@ function getImages(container) {
 			continue;
 		}
 
-		const imageId = randomString(20);
+		const existingImage = images.find(image => image.src === img.src);
 
-		images.push({
-			imageId: imageId,
-			src: img.src
-		});
+		if (existingImage) {
+			img.src = existingImage.imageId;
+		}
+		else {
+			const imageId = randomString(20);
 
-		img.src = imageId;
+			images.push({
+				imageId: imageId,
+				src: img.src
+			});
+
+			img.src = imageId;
+		}
 	}
 
 	return images;

lib/JSDOMParser.js

@@ -1,5 +1,3 @@
-// https://github.com/mozilla/readability/tree/814f0a3884350b6f1adfdebb79ca3599e9806605
-
 /*eslint-env es6:false*/
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -310,6 +308,7 @@
       }
     }
     getElems(this);
+    elems._isLiveNodeList = true;
     return elems;
   }
 

lib/Readability-readerable.js

@@ -1,5 +1,3 @@
-// https://github.com/mozilla/readability/tree/814f0a3884350b6f1adfdebb79ca3599e9806605
-
 /* eslint-env es6:false */
 /* globals exports */
 /*
@@ -26,13 +24,16 @@
 var REGEXPS = {
   // NOTE: These two regular expressions are duplicated in
   // Readability.js. Please keep both copies in sync.
-  unlikelyCandidates: /-ad-|ai2html|banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|foot|gdpr|header|legends|menu|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote/i,
-  okMaybeItsACandidate: /and|article|body|column|main|shadow/i,
+  unlikelyCandidates: /-ad-|ai2html|banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|footer|gdpr|header|legends|menu|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote/i,
+  okMaybeItsACandidate: /and|article|body|column|content|main|shadow/i,
 };
 
 function isNodeVisible(node) {
-  // Have to null-check node.style to deal with SVG and MathML nodes.
-  return (!node.style || node.style.display != "none") && !node.hasAttribute("hidden");
+  // Have to null-check node.style and node.className.indexOf to deal with SVG and MathML nodes.
+  return (!node.style || node.style.display != "none")
+      && !node.hasAttribute("hidden")
+      //check for "fallback-image" so that wikimedia math images are displayed
+      && (!node.hasAttribute("aria-hidden") || node.getAttribute("aria-hidden") != "true" || (node.className && node.className.indexOf && node.className.indexOf("fallback-image") !== -1));
 }
 
 /**