Adding multiple tags support. HTML support (sanitizing) for notes and…

… annotations.
frianasoa · Dec 7, 2023 · 05ba9ab · 05ba9ab
1 parent f71254a
commit 05ba9ab
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 26 deletions.
diff --git a/core/format.js b/core/format.js
@@ -126,25 +126,26 @@ Format = {
  {
  annotationtext = "";
  }
- annotationtext = this.escapehtml(annotationtext);
 
- var contents = "&#x201F;"+annotationtext+"&#8221; ("+Format.creatorshort(item)+" "+Format.year(item)+", p. "+note["annotationPageLabel"]+")";
+ if(!this.isvalidxhtml(annotationtext))
+ {
+ annotationtext = this.escapehtml(annotationtext);
+ }
 
- /**
- Not allow html in comments from pdf for now;
- */
- // comment = Zotero.ZeNotes.Filter.apply(comment, selectors);
+ var contents = "&#x201F;"+annotationtext+"&#8221; ("+Format.creatorshort(item)+" "+Format.year(item)+", p. "+note["annotationPageLabel"]+")";
 
  var comment = note["annotationComment"];
-
-
-
+
  if(comment==null)
  {
  comment = "";
  }
 
- // comment = this.escapehtml(comment);
+ if(!this.isvalidxhtml(comment))
+ {
+ comment = this.escapehtml(comment);
+ }
+
  comment = comment.split("\n").join("<br/>\n");
 
  var annotationpage = JSON.parse(note["annotationPosition"])["pageIndex"];
@@ -179,14 +180,6 @@ Format = {
  filekey: Format.filekey(item),
  }
  return line;
-
- // for(c in notes)
- // {
- // Check later
- // notes[c] = this.xmlescape(notes[c]);
- // } 
-
- // return Object.assign({}, line, notes);
  },
 
  year(item) {
@@ -296,6 +289,34 @@ Format = {
  return filenames;
  },
 
+ isvalidxhtml(txt)
+ {
+ txt = "<div>"+txt+"</div>"
+ var r = true;
+ var parser = null;
+ if (Zotero.platformMajorVersion >= 102) {
+ parser = new DOMParser();
+ }
+ else
+ {
+ parser = Components.classes['@mozilla.org/xmlextras/domparser;1'].createInstance(Components.interfaces.nsIDOMParser);
+ }
+
+ try {
+ var doc = parser.parseFromString(txt, 'application/xhtml+xml');
+ const errorNode = doc.querySelector("parsererror");
+ if(errorNode)
+ {
+ r = false;
+ }
+ }
+ catch (error) {
+ alert(error);
+ r = false
+ }
+ return r;
+ },
+
  escapehtml(s)
  {
  return s

diff --git a/install.rdf b/install.rdf
@@ -5,7 +5,7 @@
  <Description about="urn:mozilla:install-manifest">
  <em:id>[email protected]</em:id>
  <em:name>ZeNotes</em:name>
- <em:version>0.4.8</em:version>
+ <em:version>0.4.9</em:version>
  <em:multiprocessCompatible>true</em:multiprocessCompatible>
  <em:updateURL>https://raw.githubusercontent.com/frianasoa/zenotes/main/zenote-update.json</em:updateURL>
  <em:homepageURL>https://github.com/frianasoa/zenotes</em:homepageURL>

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 2,
  "name": "Ze Notes",
- "version": "0.4.8",
+ "version": "0.4.9",
  "description": "Advanced notes manager",
  "homepage_url": "https://github.com/frianasoa/zenotes",
  "author": "Fanantenana Rianasoa Andriariniaina",

diff --git a/zenote-update.json b/zenote-update.json
@@ -3,9 +3,9 @@
  "[email protected]": {
  "updates": [
  {
- "version": "0.4.8",
- "update_link": "https://github.com/frianasoa/Ze-Notes/releases/download/v0.4.8/zenotes-v0.4.8.xpi",
- "update_hash": "sha256:fd0e88e56b4d3c838344ceb7a78f2c8a5971972497b28f7075852873fda93fc6",
+ "version": "0.4.9",
+ "update_link": "https://github.com/frianasoa/Ze-Notes/releases/download/v0.4.9/zenotes-v0.4.9.xpi",
+ "update_hash": "sha256:117690ec9851fc41e1fe96430bfaf661d0b8719918cbde92258501ee69f1f6bd",
  "applications": {
  "gecko": {
  "strict_min_version": "60.0"

diff --git a/zenote-update.rdf b/zenote-update.rdf
@@ -5,13 +5,13 @@
  <rdf:Seq>
  <rdf:li>
  <rdf:Description>
- <ns1:version>0.4.8</ns1:version>
+ <ns1:version>0.4.9</ns1:version>
  <ns1:targetApplication>
  <rdf:Description>
  <ns1:id>[email protected]</ns1:id>
  <ns1:minVersion>5.0.0</ns1:minVersion>
  <ns1:maxVersion>6.*</ns1:maxVersion>
- <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.4.8/zenotes-v0.4.8.xpi</ns1:updateLink>
+ <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.4.9/zenotes-v0.4.9.xpi</ns1:updateLink>
  </rdf:Description>
  </ns1:targetApplication> 
 
@@ -20,7 +20,7 @@
  <ns1:id>[email protected]</ns1:id>
  <ns1:minVersion>4.999</ns1:minVersion>
  <ns1:maxVersion>6.*</ns1:maxVersion>
- <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.4.8/zenotes-v0.4.8.xpi</ns1:updateLink>
+ <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.4.9/zenotes-v0.4.9.xpi</ns1:updateLink>
  </rdf:Description>
  </ns1:targetApplication>