messagegui: some refactoring

Author: thyttan

apps/messagegui/app.js

@@ -265,7 +265,7 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
   //print("msgIdx",msgIdx);
   //print(msg);
 
-  let cacheObj = {};
+  let updatedProcessed = {};
   let startIdx = 0;
   let stopIdx = 0;
   let initiatedFrom = alreadyProcessed===undefined ?
@@ -281,15 +281,15 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
   if (initiatedFrom === "other function") {
     startIdx = Math.max(msgIdx-1, 0);
     stopIdx = Math.min(msgIdx+2, MESSAGES.length);
-    Object.assign(cacheObj, {startIdx:startIdx, stopIdx:stopIdx})
+    Object.assign(updatedProcessed, {startIdx:startIdx, stopIdx:stopIdx})
   } else if (initiatedFrom === "scrolling up") {
     startIdx = Math.max(msgIdx, 0);
     stopIdx = alreadyProcessed.startIdx;
-    Object.assign(cacheObj, {startIdx:startIdx, stopIdx:alreadyProcessed.stopIdx})
+    Object.assign(updatedProcessed, {startIdx:startIdx, stopIdx:alreadyProcessed.stopIdx})
   } else if (initiatedFrom === "scrolling down") {
     startIdx = alreadyProcessed.stopIdx;
     stopIdx = Math.min(msgIdx+1, MESSAGES.length);
-    Object.assign(cacheObj, {startIdx:alreadyProcessed.startIdx, stopIdx:stopIdx})
+    Object.assign(updatedProcessed, {startIdx:alreadyProcessed.startIdx, stopIdx:stopIdx})
   }
   //print(startIdx, stopIdx);
 
@@ -354,7 +354,7 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
   }
 
   Object.assign(
-    cacheObj,
+    updatedProcessed,
     {
       lines : allLines2,
       titleLines : titleLines,
@@ -376,36 +376,23 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
         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 &&
-        Math.max(msgIdx,(alreadyProcessed&&alreadyProcessed.stopIdx)||0) <
-          MESSAGES.length-1) {
+      if (scrollIdx>=allLines2.length-1 && scrollIdx!=prevScrollIdx && updatedProcessed.stopIdx < MESSAGES.length-1) {
         setTimeout(() => {
           E.showScroller();
-          showMessageScroller2(MESSAGES[Math.max(stopIdx,
-            (alreadyProcessed&&alreadyProcessed.stopIdx)||0)], true, cacheObj);
-        }, 1);
+          showMessageScroller2(MESSAGES[updatedProcessed.stopIdx], true, updatedProcessed);
+        }, 40);
       }
-      if (scrollIdx==0 && scrollIdx!=prevScrollIdx &&
-        Math.min(
-          msgIdx,
-          (alreadyProcessed&&alreadyProcessed.startIdx)===undefined ?
-            MESSAGES.length : alreadyProcessed.startIdx)
-        > 0) {
+      if (scrollIdx==0 && scrollIdx!=prevScrollIdx && updatedProcessed.startIdx>0) {
         setTimeout(() => {
           E.showScroller();
-          showMessageScroller2(MESSAGES[Math.min(startIdx-1,
-            ((alreadyProcessed&&alreadyProcessed.startIdx)===undefined
-              ?MESSAGES.length
-              :alreadyProcessed.startIdx-1)
-          )]
-            , true, cacheObj);
-        }, 1);
+          showMessageScroller2(MESSAGES[updatedProcessed.startIdx-1], true, updatedProcessed);
+        }, 40);
       }
       prevScrollIdx=scrollIdx;
     }, select : function(scrollIdx, touch) {
       let touchedMsg;
       for (let i=0; i<titleLines.length; i++) {
-        if (scrollIdx>=titleLines[i]) {touchedMsg = MESSAGES[i + cacheObj.startIdx];}
+        if (scrollIdx>=titleLines[i]) {touchedMsg = MESSAGES[i + updatedProcessed.startIdx];}
       };
       if (touch.type == 0) {
         WU.show();