fix: section popup text too long

change: remove eval
windingwind · May 23, 2022 · e9442aa · e9442aa
1 parent 5e8a687
commit e9442aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/events.ts b/src/events.ts
@@ -751,7 +751,7 @@ class AddonEvents extends AddonBase {
 
       let _newLine: string = "";
       try {
-        eval("_newLine = `" + templateText + "`");
+        _newLine = new Function("return `" + templateText + "`")();
       } catch (e) {
         alert(e);
         return;
@@ -815,7 +815,10 @@ class AddonEvents extends AddonBase {
 
         let _newLine: string = "";
         try {
-          eval("_newLine = `" + templateText + "`");
+          _newLine = new Function(
+            "topItem, itemNotes, copyNoteImage",
+            "return `" + templateText + "`"
+          )(topItem, itemNotes, copyNoteImage);
         } catch (e) {
           alert(e);
           continue;
@@ -883,7 +886,10 @@ class AddonEvents extends AddonBase {
         }</a></p>`;
         let _newLine: string = "";
         try {
-          eval("_newLine = `" + templateText + "`");
+          _newLine = new Function(
+            "noteItem, topItem, link",
+            "return `" + templateText + "`"
+          )(noteItem, topItem, link);
         } catch (e) {
           alert(e);
           continue;

diff --git a/src/views.ts b/src/views.ts
@@ -124,7 +124,10 @@ class AddonViews extends AddonBase {
       );
       button.setAttribute("id", buttonParam.id);
       button.setAttribute("eventType", buttonParam.eventType);
-      button.innerHTML = buttonParam.text;
+      button.innerHTML =
+        buttonParam.text.length > 30
+          ? `${buttonParam.text.slice(0, 30)}...`
+          : buttonParam.text;
       popup.append(button);
       const message = new EditorMessage("", {
         itemID: editorInstances._item.id,