Update Zotero to f0cff95

Merge contains following changes: commit f0cff95 Author: Dan Stillman <[email protected]> Date: Sun Feb 16 14:45:41 2020 -0500 Don't include `script` and `style` elements in innerText JSDOM doesn't support `innerText` [1], so our shim was just forwarding `textContent`. Instead, remove `script` and `style` elements, which won't do the same thing as in the browser but will hopefully remove most unwanted content. Addresses zotero#111 [1] jsdom/jsdom#1245 Bug: T245092 Change-Id: I5e24a0f1813960802e50c38f4b80f9bc0f23ef95
mvolz · Feb 24, 2020 · 7297a18 · 7297a18
1 parent 74ca904
commit 7297a18
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/modules/translators b/modules/translators
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "translation-server",
-	"version": "2.0.1",
+	"version": "2.0.3",
 	"description": "Zotero translation server",
 	"license": "AGPL-3.0-only",
 	"main": "index.js",

diff --git a/src/translation/translate.js b/src/translation/translate.js
@@ -63,7 +63,13 @@ Object.defineProperty(Attr.interface.prototype, 'innerText', {
 });
 var Node = require('jsdom/lib/jsdom/living/generated/Node');
 Object.defineProperty(Node.interface.prototype, 'innerText', {
-	get: function() { return this.textContent },
+	get: function() {
+		// innerText in the browser is more sophisticated, but this removes most unwanted content
+		// https://github.com/jsdom/jsdom/issues/1245#issuecomment-584677454
+		var el = this.cloneNode(true);
+		el.querySelectorAll('script,style').forEach(s => s.remove())
+		return el.textContent
+	},
 	set: function(value) { this.textContent = value },
 	configurable: true,
 });
+3 −3		ACLWeb.js
+1 −54		Atypon Journals.js
+64 −55		Cambridge Core.js
+103 −55		CanLII.js
+58 −21		Idref.js
+138 −48		PubMed.js
+9 −3		ScienceDirect.js
+30 −19		Twitter.js
+2 −2		WorldCat Discovery Service.js
+3 −3		package-lock.json
+1 −1		package.json