Merge pull request #11756 from FranciscoPombal/fix_webui_stats_race

WebUI: fix populating statistics window

src/webui/www/private/scripts/client.js

@@ -622,7 +622,7 @@ window.addEvent('load', function() {
         $('DHTNodes').set('html', 'QBT_TR(DHT: %1 nodes)QBT_TR[CONTEXT=StatusBar]'.replace("%1", serverState.dht_nodes));
 
         // Statistics dialog
-        if (document.getElementById("statisticspage")) {
+        if (document.getElementById("statisticsContent")) {
             $('AlltimeDL').set('html', window.qBittorrent.Misc.friendlyUnit(serverState.alltime_dl, false));
             $('AlltimeUL').set('html', window.qBittorrent.Misc.friendlyUnit(serverState.alltime_ul, false));
             $('TotalWastedSession').set('html', window.qBittorrent.Misc.friendlyUnit(serverState.total_wasted_session, false));

src/webui/www/private/views/statistics.html

@@ -1,5 +1,6 @@
-<h3>QBT_TR(User statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
+<div id="statisticsContent">
-<table style="width:100%">
+    <h3>QBT_TR(User statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
+    <table style="width:100%">
         <tr>
             <td>QBT_TR(All-time upload:)QBT_TR[CONTEXT=StatsDialog]</td>
             <td id="AlltimeUL" class="statisticsValue"></td>
@@ -20,10 +21,9 @@
             <td>QBT_TR(Connected peers:)QBT_TR[CONTEXT=StatsDialog]</td>
             <td id="TotalPeerConnections" class="statisticsValue"></td>
         </tr>
-</table>
+    </table>
-
+    <h3>QBT_TR(Cache statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
-<h3>QBT_TR(Cache statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
+    <table style="width:100%">
-<table style="width:100%">
         <tr>
             <td>QBT_TR(Read cache hits:)QBT_TR[CONTEXT=StatsDialog]</td>
             <td id="ReadCacheHits" class="statisticsValue"></td>
@@ -32,10 +32,9 @@
             <td>QBT_TR(Total buffer size:)QBT_TR[CONTEXT=StatsDialog]</td>
             <td id="TotalBuffersSize" class="statisticsValue"></td>
         </tr>
-</table>
+    </table>
-
+    <h3>QBT_TR(Performance statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
-<h3>QBT_TR(Performance statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
+    <table style="width:100%">
-<table style="width:100%">
         <tr>
             <td>QBT_TR(Write cache overload:)QBT_TR[CONTEXT=StatsDialog]</td>
             <td id="WriteCacheOverload" class="statisticsValue"></td>
@@ -56,4 +55,5 @@
             <td>QBT_TR(Total queued size:)QBT_TR[CONTEXT=StatsDialog]</td>
             <td id="TotalQueuedSize" class="statisticsValue"></td>
         </tr>
-</table>
+    </table>
+</div>