From f79ca565ec7c527fc1936833743bb3cbf475c499 Mon Sep 17 00:00:00 2001
From: joeuhren <46763106+joeuhren@users.noreply.github.com>
Date: Fri, 20 Nov 2020 17:50:14 -0700
Subject: [PATCH] Latest TX & AddrHistory: dataTables entries logic simplified

---
 views/includes/address_history.pug | 15 ++++++---------
 views/index.pug                    | 16 ++++++++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/views/includes/address_history.pug b/views/includes/address_history.pug
index 0707b26..0a9c04a 100644
--- a/views/includes/address_history.pug
+++ b/views/includes/address_history.pug
@@ -1,15 +1,12 @@
 script.
   var hashAddress = "#{address.a_id}";
   var setting_maxTxCount = parseInt("#{settings.txcount}");
-  var lengthMenuOpts = [ 10, 25, 50, 75, 100 ];
-  if (setting_maxTxCount >= 250) {
-    lengthMenuOpts.push(250);
-  }
-  if (setting_maxTxCount >= 500) {
-    lengthMenuOpts.push(500);
-  }
-  if (setting_maxTxCount >= 1000) {
-    lengthMenuOpts.push(1000);
+  var lengthMenuOpts = [];
+  var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
+  for (i=0; i < lengthMenuOptsAdd.length; i++) {
+    if (setting_maxTxCount >= lengthMenuOptsAdd[i]) {
+      lengthMenuOpts.push(lengthMenuOptsAdd[i]);
+    }
   }
   if (setting_maxTxCount < 50) {
     var displayLengthMax = setting_maxTxCount;
diff --git a/views/index.pug b/views/index.pug
index 513412a..e7a0a41 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -3,17 +3,17 @@ extends layout
 block content
   script.
     var setting_maxTxCount = parseInt("#{settings.index.last_txs}");
-    var lengthMenuOpts = [ 10, 25, 50, 75, 100 ];
-    if (setting_maxTxCount >= 500) {
-      lengthMenuOpts.push(500);
+    var lengthMenuOpts = [];
+    var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
+    for (i=0; i < lengthMenuOptsAdd.length; i++) {
+      if (setting_maxTxCount >= lengthMenuOptsAdd[i]) {
+        lengthMenuOpts.push(lengthMenuOptsAdd[i]);
+      }
     }
-    if (setting_maxTxCount >= 1000) {
-      lengthMenuOpts.push(1000);
-    }
-    if (setting_maxTxCount < (lengthMenuOpts[lengthMenuOpts.length-1])) {
+    if (setting_maxTxCount < 10) {
       var displayLengthMax = setting_maxTxCount;
     } else {
-      var displayLengthMax = (lengthMenuOpts[lengthMenuOpts.length-1]);
+      var displayLengthMax = 10;
     }
     $(document).ready(function(){
       var stable = $('#block-table').dataTable({