handle edge case where page title has <html> elements, also changed a…

…nimation speed of save indicator
tconfrey · Feb 28, 2024 · c16e71a · c16e71a
1 parent e820f7b
commit c16e71a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/app/BTAppNode.js b/app/BTAppNode.js
@@ -187,7 +187,10 @@ class BTAppNode extends BTNode {
  // Node title as shown in tree, <a> for url. Compare to BTNode.displayTag = plain tag text
  let txt = "";
  if (this._keyword) txt += `<span class='keyword'>${this._keyword} </span>`; // TODO etc
- return txt + BTAppNode._orgTextToHTML(this.title);
+
+ // first escape any html entities
+ let title = this.title.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+ return txt + BTAppNode._orgTextToHTML(title);
  }
 
  url() {
@@ -512,7 +515,7 @@ class BTAppNode extends BTNode {
  });
  window.postMessage({'function': 'groupAndPositionTabs', 'tabGroupId': this.tabGroupId,
  'windowId': this.windowId, 'tabInfo': tabInfo,
- 'groupName': BTAppNode.displayTagFromTitle(this.displayTag)});
+ 'groupName': BTAppNode.displayNameFromTitle(this.displayTag)});
  }
 
  putInGroup() {

diff --git a/app/BTNode.js b/app/BTNode.js
@@ -13,7 +13,7 @@ class BTNode {
  this._title = title;
  this._parentId = parentId;
  this._URL = BTNode.URLFromTitle(title);
- this._displayTag = BTNode.displayTagFromTitle(title);
+ this._displayTag = BTNode.displayNameFromTitle(title);
  this._childIds = [];
  this._tagPath = '';
  this.generateUniqueTagPath();
@@ -32,7 +32,7 @@ class BTNode {
  set title(ttl) {
  this._title = ttl;
  this._URL = BTNode.URLFromTitle(ttl); // regenerate URL when title is changed
- this._displayTag = BTNode.displayTagFromTitle(ttl);
+ this._displayTag = BTNode.displayNameFromTitle(ttl);
  }
  get title() {
  return this._title;
@@ -124,8 +124,11 @@ class BTNode {
  return hits ? hits[1] : ""; 
  }
 
- static displayTagFromTitle(title) {
- // Visible tag for this node. Pull tags out, use url if no tag
+ static displayNameFromTitle(title) {
+ // Visible title for this node. Pull displayed title out, use url if none
+
+ // first escape any html entities
+ title = title.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
  let outputStr = title.replace(/\[\[(.*?)\]\[(.*?)\]\]/gm, (match, $1, $2) =>
  {return $2 || $1;});
  return outputStr;

diff --git a/app/bt.js b/app/bt.js
@@ -207,7 +207,7 @@ function brainZoom(iteration = 0) {
  return;
  }
  $("#brain").attr("src", path);
- const interval = 150; //iteration == 4 ? 200 : 100;
+ const interval = (iteration <= 4 ? 150 : 50);
  setTimeout(function() {brainZoom(++iteration);}, interval);
 
 }

diff --git a/versions/Release-Candidate/app/BTAppNode.js b/versions/Release-Candidate/app/BTAppNode.js
@@ -187,7 +187,10 @@ class BTAppNode extends BTNode {
  // Node title as shown in tree, <a> for url. Compare to BTNode.displayTag = plain tag text
  let txt = "";
  if (this._keyword) txt += `<span class='keyword'>${this._keyword} </span>`; // TODO etc
- return txt + BTAppNode._orgTextToHTML(this.title);
+
+ // first escape any html entities
+ let title = this.title.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+ return txt + BTAppNode._orgTextToHTML(title);
  }
 
  url() {
@@ -512,7 +515,7 @@ class BTAppNode extends BTNode {
  });
  window.postMessage({'function': 'groupAndPositionTabs', 'tabGroupId': this.tabGroupId,
  'windowId': this.windowId, 'tabInfo': tabInfo,
- 'groupName': BTAppNode.displayTagFromTitle(this.displayTag)});
+ 'groupName': BTAppNode.displayNameFromTitle(this.displayTag)});
  }
 
  putInGroup() {

diff --git a/versions/Release-Candidate/app/BTNode.js b/versions/Release-Candidate/app/BTNode.js
@@ -13,7 +13,7 @@ class BTNode {
  this._title = title;
  this._parentId = parentId;
  this._URL = BTNode.URLFromTitle(title);
- this._displayTag = BTNode.displayTagFromTitle(title);
+ this._displayTag = BTNode.displayNameFromTitle(title);
  this._childIds = [];
  this._tagPath = '';
  this.generateUniqueTagPath();
@@ -32,7 +32,7 @@ class BTNode {
  set title(ttl) {
  this._title = ttl;
  this._URL = BTNode.URLFromTitle(ttl); // regenerate URL when title is changed
- this._displayTag = BTNode.displayTagFromTitle(ttl);
+ this._displayTag = BTNode.displayNameFromTitle(ttl);
  }
  get title() {
  return this._title;
@@ -124,8 +124,11 @@ class BTNode {
  return hits ? hits[1] : ""; 
  }
 
- static displayTagFromTitle(title) {
- // Visible tag for this node. Pull tags out, use url if no tag
+ static displayNameFromTitle(title) {
+ // Visible title for this node. Pull displayed title out, use url if none
+
+ // first escape any html entities
+ title = title.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
  let outputStr = title.replace(/\[\[(.*?)\]\[(.*?)\]\]/gm, (match, $1, $2) =>
  {return $2 || $1;});
  return outputStr;

diff --git a/versions/Release-Candidate/app/bt.js b/versions/Release-Candidate/app/bt.js
@@ -207,7 +207,7 @@ function brainZoom(iteration = 0) {
  return;
  }
  $("#brain").attr("src", path);
- const interval = 150; //iteration == 4 ? 200 : 100;
+ const interval = (iteration <= 4 ? 150 : 50);
  setTimeout(function() {brainZoom(++iteration);}, interval);
 
 }