messagegui: at a pretty good state

Author: thyttan

apps/messagegui/app.js

@@ -252,8 +252,6 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
   const WU = require("widget_utils");
   WU.hide();
 
-  //if (alreadyProcessed) print("alreadyPeocessed start and stop idx: ",alreadyProcessed.startIdx, alreadyProcessed.stopIdx);
-
   if (replying) { return; }
   if (persist) {
     cancelReloadTimeout();
@@ -262,8 +260,6 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
   }
 
   let msgIdx = MESSAGES.findIndex((m) =>  m.id == msg.id)
-  //print("msgIdx",msgIdx);
-  //print(msg);
 
   let updatedProcessed = {};
   let startIdx = 0;
@@ -291,7 +287,6 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
     stopIdx = Math.min(msgIdx+1, MESSAGES.length);
     Object.assign(updatedProcessed, {startIdx:alreadyProcessed.startIdx, stopIdx:stopIdx})
   }
-  //print(startIdx, stopIdx);
 
   active = "scroller";
   var bodyFont = fontBig;
@@ -318,16 +313,15 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
       }
     }
     var titleCnt = lines.length;
-    if (titleCnt) lines.push(""); // add blank line after title
-    lines = lines.concat(g.wrapString(msgLocal.body, g.getWidth()-10), [ "---------" ]);
+    if (titleCnt) {lines.push("");} // add blank line after title
+    lines = lines.concat(g.wrapString(msgLocal.body, g.getWidth()-10), ["-".repeat(j+1)]);
     messagesWrapped.push(lines);
   };
   let allLines2 = [];
   for (let i=0;i<messagesWrapped.length;i++) {
     allLines2 = allLines2.concat(messagesWrapped[i]);
   }
 
-  //print("titlelines", titleLines)
   var initScroll = messagesWrapped[0].length;
   if (initiatedFrom === "other function"){
     if (msgIdx==0) initScroll = 0;
@@ -338,8 +332,6 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
     titleLines = alreadyProcessed.titleLines.concat(titleLines.map((x) => x + alreadyProcessed.lines.length));
   }
 
-  //print("titlelines", titleLines)
-
   if (initiatedFrom === "other function"){
     // no-op
   } else if (initiatedFrom === "scrolling up") {
@@ -362,7 +354,7 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
     }
   )
 
-  let prevScrollIdx; // Used to stop multiple triggers of next message by the scroller.
+  let prevScrollIdx; // Used for stopping multiple triggers of next message by the scroller.
 
   E.showScroller({
     scroll : initScroll*g.getFontHeight(),
@@ -371,12 +363,11 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
     // a function to draw a menu item
     draw : function(scrollIdx, r) {
       "ram"
-      //print(scrollIdx, allLines2.length); // FIXME: Remove this print.
       g.setBgColor(titleLines.find((e)=>e==scrollIdx)!==undefined ? g.theme.bg2 : g.theme.bg).
         setColor(titleLines.find((e)=>e==scrollIdx)!==undefined ? g.theme.fg2 : g.theme.fg).
         clearRect(r);
       g.setFont(bodyFont).setFontAlign(0,-1).drawString(allLines2[scrollIdx], r.x+r.w/2, r.y);
-      if (scrollIdx>=allLines2.length-1 && scrollIdx!=prevScrollIdx && updatedProcessed.stopIdx < MESSAGES.length-1) {
+      if (scrollIdx>=allLines2.length-1 && scrollIdx!=prevScrollIdx && updatedProcessed.stopIdx < MESSAGES.length) {
         setTimeout(() => {
           E.showScroller();
           showMessageScroller2(MESSAGES[updatedProcessed.stopIdx], true, updatedProcessed);
@@ -388,21 +379,23 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
           showMessageScroller2(MESSAGES[updatedProcessed.startIdx-1], true, updatedProcessed);
         }, 40);
       }
-      prevScrollIdx=scrollIdx;
+      prevScrollIdx = scrollIdx;
     }, select : function(scrollIdx, touch) {
-      let touchedMsg;
-      for (let i=0; i<titleLines.length; i++) {
-        if (scrollIdx>=titleLines[i]) {touchedMsg = MESSAGES[i + updatedProcessed.startIdx];}
-      };
+      let msgSelectIdx;
+      for (let i = titleLines.length-1; i>=0 ; i--) {
+        if (scrollIdx>=titleLines[i]) {
+          msgSelectIdx = i + updatedProcessed.startIdx;
+          break;
+        }
+      }
       if (touch.type == 0) {
         WU.show();
-        showMessage(touchedMsg.id, true)
+        showMessage(MESSAGES[msgSelectIdx].id, true)
       }
       if (touch.type == 2) {
         WU.show();
-        showMessageSettings(touchedMsg)
+        showMessageSettings(MESSAGES[msgSelectIdx])
       }
-      //showMessage(msg.id, true);
     },
     //back : () => showMessage(messages[idx].id, true)
   });