From 2a0ee4d809765e60b02bef25876ca5c656672c6c Mon Sep 17 00:00:00 2001
From: buck54321 <buck54321@gmail.com>
Date: Sun, 9 Dec 2018 16:05:10 -0600
Subject: [PATCH] inline js moved from extras.tmpl to index.js. removed errors
 in statistics.tmpl. moved windows.tmpl inline js to stimulus.

---
 public/index.js                               |  7 +++++
 .../js/controllers/ticketwindow_controller.js | 15 ++++++++++
 views/extras.tmpl                             | 10 +++----
 views/statistics.tmpl                         | 20 ++++---------
 views/windows.tmpl                            | 29 +++++--------------
 5 files changed, 40 insertions(+), 41 deletions(-)
 create mode 100644 public/js/controllers/ticketwindow_controller.js

diff --git a/public/index.js b/public/index.js
index d8ec348b2..a868fac62 100644
--- a/public/index.js
+++ b/public/index.js
@@ -27,6 +27,13 @@ $.ajaxSetup({
   cache: true
 })
 
+{
+  let navBar = document.getElementById('navBar')
+  window.DCRThings = {}
+  window.DCRThings.targetBlockTime = navBar.dataset.blocktime
+  window.DCRThings.ticketPoolSize = navBar.dataset.poolsize
+}
+
 function getSocketURI (loc) {
   var protocol = (loc.protocol === 'https:') ? 'wss' : 'ws'
   return protocol + '://' + loc.host + '/ws'
diff --git a/public/js/controllers/ticketwindow_controller.js b/public/js/controllers/ticketwindow_controller.js
new file mode 100644
index 000000000..3930f0e6a
--- /dev/null
+++ b/public/js/controllers/ticketwindow_controller.js
@@ -0,0 +1,15 @@
+/* global Turbolinks */
+import { Controller } from 'stimulus'
+
+export default class extends Controller {
+  static get targets () {
+    return ['pagesize']
+  }
+
+  setPageSize () {
+    Turbolinks.visit(
+      window.location.pathname + '?offset=' + this.pagesizeTarget.dataset.offset +
+      '&rows=' + this.pagesizeTarget.selectedOptions[0].value
+    )
+  }
+}
diff --git a/views/extras.tmpl b/views/extras.tmpl
index 45eff673a..54d671594 100644
--- a/views/extras.tmpl
+++ b/views/extras.tmpl
@@ -29,7 +29,10 @@
 {{end}}
 
 {{define "navbar"}}
-<header class="top-nav">
+<header class="top-nav"
+        id="navBar"
+        data-blocktime="{{.BlockTimeUnix}}"
+        data-poolsize="{{.ChainParams.TicketPoolSize}}">
     <div class="container">
         <div class="d-flex align-items-center flex-wrap">
             <div class="d-flex align-items-center">
@@ -89,11 +92,6 @@
             </nav>
         </div>
     </div>
-    <script data-turbolinks-eval="false">
-        var DCRThings = {};
-        DCRThings.targetBlockTime = {{$.BlockTimeUnix}};
-        DCRThings.ticketPoolSize = {{$.ChainParams.TicketPoolSize}};
-    </script>
 </header>
 <div id="watermark">HODL<br>HODL<br>HODL</div>
 {{end}}
diff --git a/views/statistics.tmpl b/views/statistics.tmpl
index 1ddcc4ed2..4f3c64ff9 100644
--- a/views/statistics.tmpl
+++ b/views/statistics.tmpl
@@ -116,7 +116,7 @@
                     <div width="45%" class="card">
                         <div class="card-header proof-of-stake">Tickets In Mempool</div>
                         <div class="card-body card-body-padding-top">
-                            <span class="stat-data" id="bsubsidy_total">{{.TicketsInMempool}}</span>
+                            <span class="stat-data">{{.TicketsInMempool}}</span>
                             </br>
                             <span class="stat-details unit">Ticket{{if gt .TicketsInMempool 1}}s{{end}}</span>
                         </div>
@@ -124,7 +124,7 @@
                     <div width="45%" class="card">
                         <div class="card-header proof-of-stake">Votes In Mempool</div>
                         <div class="card-body card-body-padding-top">
-                            <span class="stat-data" id="bsubsidy_total">{{.VotesInMempool}}</span>
+                            <span class="stat-data">{{.VotesInMempool}}</span>
                             </br>
                                 <span class="stat-details unit">Vote{{if gt .VotesInMempool 1}}s{{end}}</span>
                         </div>
@@ -132,7 +132,7 @@
                     <div width="45%" class="card">
                         <div class="card-header proof-of-stake">Ticket Price</div>
                         <div class="card-body card-body-padding-top">
-                            <span  class="stat-data" id="bsubsidy_total">{{template "decimalParts" (float64AsDecimalParts .TicketPrice 8 false)}}</span>
+                            <span  class="stat-data">{{template "decimalParts" (float64AsDecimalParts .TicketPrice 8 false)}}</span>
                             </br>
                             <span class="stat-details unit">DCR</span>
                         </div>
@@ -177,7 +177,7 @@
                     <div width="45%" class="card">
                         <div class="card-header proof-of-stake">Ticket Rewards</div>
                         <div class="card-body card-body-padding-top">
-                            <span  class="stat-data" id="bsubsidy_total"
+                            <span  class="stat-data"
                                    data-toggle="tooltip"
                                    title="Price based on continous re-staking and variable ticket price.">
                                     +{{printf "%.2f" .TicketsROI}}%
@@ -197,7 +197,7 @@
                     <div width="45%" class="card">
                         <div class="card-header proof-of-stake">Ticket Pool Size</div>
                         <div class="card-body card-body-padding-top">
-                            <span class="stat-data" id="bsubsidy_total">{{intComma .TicketPoolSize}}</span>
+                            <span class="stat-data">{{intComma .TicketPoolSize}}</span>
                             </br>
                             {{if ge .TicketPoolSizePerToTarget 100.0}}
                             <span class="stat-details">+{{printf "%.2f" (floatsubtract .TicketPoolSizePerToTarget 100.0)}}% above target 40,960</span>
@@ -209,7 +209,7 @@
                     <div width="45%" class="card">
                         <div class="card-header proof-of-stake">Ticket Pool Value</div>
                         <div class="card-body card-body-padding-top">
-                            <span class="stat-data no-decimal" id="bsubsidy_total">{{template "decimalParts" (float64AsDecimalParts  .TicketPoolValue 8 true)}}</span>
+                            <span class="stat-data no-decimal">{{template "decimalParts" (float64AsDecimalParts  .TicketPoolValue 8 true)}}</span>
                             </br>
                             <span class="stat-details unit">DCR</span>
                             </br>
@@ -221,14 +221,6 @@
         </div>
         {{end}}
         {{template "footer" . }}
-
-        <script>
-          // enable tool tips
-          $(document).ready(function(){
-              $('[data-toggle="tooltip"]').tooltip();
-          });
-
-        </script>
     </body>
 </html>
 {{end}}
diff --git a/views/windows.tmpl b/views/windows.tmpl
index a65fcf182..0cf777f60 100644
--- a/views/windows.tmpl
+++ b/views/windows.tmpl
@@ -3,9 +3,9 @@
 <html lang="en">
 
 {{template "html-head" "Decred Windows List"}}
-<body class="{{ theme }}">
+<body class="{{ theme }}" data-controller="ticketwindow">
     {{template "navbar" . }}
-    <div class="container main" data-controller="time">
+    <div class="container main">
         <h4>Ticket Price Windows</h4><h6>The ticket price and mining difficulty are adjusted every {{$.WindowSize}} blocks on {{toLowerCase .NetName}} (~12 hours).</h6>
 
         {{block "windowsPagination" .}}
@@ -19,10 +19,13 @@
                 {{template "listViewRouting" "windows"}}
 
                 <span class="fs12 nowrap text-right">
-                    <label class="mb-0 mr-1" for="windows-pagesize">Page Size</label>
+                    <label class="mb-0 mr-1" for="windowsPagesize">Page Size</label>
                     <select
                         name="windows-pagesize"
-                        id="windows-pagesize"
+                        data-target="ticketwindow.pagesize"
+                        data-action="change->ticketwindow#setPageSize"
+                        data-offset="{{$.OffsetWindow}}"
+                        id="windowsPagesize"
                         class="form-control-sm mb-2 mr-sm-2 mb-sm-0 {{if lt $pendingWindows 20}}disabled{{end}}"
                         {{if lt $pendingWindows 20}}disabled="disabled"{{end}}
                     >
@@ -112,7 +115,7 @@
                             <td>{{.FormattedSize}}</td>
                             <td class="text-right">{{template "decimalParts" (float64AsDecimalParts .Difficulty 0 true)}}</td>
                             <td class="text-right">{{printf "%.2f" (toFloat64Amount .TicketPrice)}}</td>
-                            <td class="text-right jsonly" data-target="time.age" data-age="{{.StartTime}}"></td>
+                            <td class="text-right jsonly" data-controller="time" data-target="time.age" data-age="{{.StartTime}}"></td>
                             <td>{{.StartTime}}</td>
                         </tr>
                     {{end}}
@@ -129,22 +132,6 @@
 
 {{ template "footer" . }}
 
-<script>
-    $("#windows-pagesize").change(function(ev) {
-        var pagesize = "20"
-        var offset = {{$.OffsetWindow}}
-        if (ev.currentTarget.id.indexOf("windows-pagesize") != -1){
-            pagesize = $("#windows-pagesize option:selected").val()
-        }
-
-        Turbolinks.visit(
-            window.location.pathname
-            + "?offset="+ offset
-            + "&rows=" + pagesize
-        )
-    })
-</script>
-
 </body>
 </html>
 {{ end }}