From 254ba9a7942a4fee3a2b2d29d3fed7836bb3d63b Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Mon, 1 Jun 2026 21:05:37 -0400
Subject: [PATCH 01/12] [HTML Report] Render Raid DPS chart early

render the main raid DPS chart early so that it doesn't take forever to appear on large reports. motivated by full raid sim stacks like are published on simulationcraft.org
---
 engine/report/report_html_sim.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engine/report/report_html_sim.cpp b/engine/report/report_html_sim.cpp
index 32dac66b791..4950a699949 100644
--- a/engine/report/report_html_sim.cpp
+++ b/engine/report/report_html_sim.cpp
@@ -377,16 +377,18 @@ void print_html_raid_summary( report::sc_html_stream& os, sim_t& sim )
   {
     raid_dps.width_ += raid_dps.width_ + 12;
     raid_dps.set( "chart.marginLeft", margin );
+    raid_dps.set( "plotOptions.series.animation", false );  // no initial draw animation on the main DPS chart
     os << raid_dps.to_target_div();
-    sim.add_chart_data( raid_dps );
+    os << "<script type=\"text/javascript\">\n" << raid_dps.to_aggregate_string( false ) << "</script>\n";
   }
 
   if ( has_priority )
   {
     priority_dps.width_ += priority_dps.width_ + 12;
     priority_dps.set( "chart.marginLeft", margin );
+    priority_dps.set( "plotOptions.series.animation", false );
     os << priority_dps.to_target_div();
-    sim.add_chart_data( priority_dps );
+    os << "<script type=\"text/javascript\">\n" << priority_dps.to_aggregate_string( false ) << "</script>\n";
   }
 
   if ( !sim.raid_events_str.empty() )

From cc1589da3a61076485d039ff0815f79ba8c803d5 Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Mon, 1 Jun 2026 21:47:57 -0400
Subject: [PATCH 02/12] [HTML Report] Emit grouping classes by default

the section-open / grouped-first / grouped-last classes that separate and round the report's sections were only applied by `validate_section()` on document.ready, causing a noticable layout shift when they snap apart on larger (longer-loading) reports.

instead, we include them directly on the sections we know will be present: section-open for the default-open sections (raid summary and profile sets), grouped-first for hotfixes and grouped-last for the table of contents. this makes the styling and layout mostly correct before document.ready, improving the feel on larger reports.
---
 engine/report/report_html_sim.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engine/report/report_html_sim.cpp b/engine/report/report_html_sim.cpp
index 4950a699949..9060433c013 100644
--- a/engine/report/report_html_sim.cpp
+++ b/engine/report/report_html_sim.cpp
@@ -58,7 +58,7 @@ void print_html_contents( report::sc_html_stream& os, const sim_t& sim )
     }
   }
 
-  os << "<div id=\"table-of-contents\" class=\"section\">\n"
+  os << "<div id=\"table-of-contents\" class=\"section grouped-last\">\n"
      << "<h2 class=\"toggle\">Table of Contents</h2>\n"
      << "<div class=\"toggle-content hide\">\n";
 
@@ -349,7 +349,7 @@ void print_html_sim_summary( report::sc_html_stream& os, sim_t& sim )
 
 void print_html_raid_summary( report::sc_html_stream& os, sim_t& sim )
 {
-  os << "<div id=\"raid-summary\" class=\"section\">\n\n"
+  os << "<div id=\"raid-summary\" class=\"section section-open\">\n\n"
      << "<h2 class=\"toggle open\">Raid Summary</h2>\n"
      << "<div class=\"toggle-content\">\n";
 
@@ -890,7 +890,7 @@ void print_html_hotfixes( report::sc_html_stream& os, const sim_t& sim )
 {
   std::vector<const hotfix::hotfix_entry_t*> entries = hotfix::hotfix_entries();
 
-  os << "<div class=\"section\">\n";
+  os << "<div class=\"section grouped-first\">\n";
   os << "<h2 class=\"toggle\">Current simulator hotfixes</h2>\n";
   os << "<div class=\"toggle-content hide\">\n";
 
@@ -1158,7 +1158,7 @@ void print_profilesets( std::ostream& out, const profileset::profilesets_t& prof
     return;
   }
 
-  out << "<div class=\"section\">\n";
+  out << "<div class=\"section section-open\">\n";
   out << "<h2 class=\"toggle open\">Profile sets</h2>\n";
   out << "<div class=\"toggle-content\">\n";
 

From 9042cfd1614ec8c2f109273fc6517c78fe82f4e6 Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Mon, 1 Jun 2026 23:47:08 -0400
Subject: [PATCH 03/12] [HTML Report] Emit `section-open` for main actor of
 single actor reports

---
 engine/report/report_html_player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index a262bb4575c..efc7a3579b5 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -3721,7 +3721,7 @@ void print_html_player_description( report::sc_html_stream& os, const player_t&
   bool one_player = sim.players_by_name.size() == 1 && !p.is_enemy() && sim.profilesets->n_profilesets() == 0;
 
   // Player Description
-  os << "<div id=\"player" << p.index << "\" class=\"player section\">\n";
+  os << "<div id=\"player" << p.index << "\" class=\"player section" << ( one_player ? " section-open" : "" ) << "\">\n";
 
   os << "<h2 id=\"player" << p.index << "toggle\" class=\"toggle";
   if ( one_player )

From e9f99fec607fd2370e8ef4d60e72f570565fe946 Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Tue, 2 Jun 2026 00:49:07 -0400
Subject: [PATCH 04/12] [HTML Report] Defer actor subsection loading

A significant portion of page load time on larger reports is spent parsing HTML and building the DOM. By enclosiong heavier per-actor subsections (Abilities, Buffs, Procs/Uptimes/Benefits, Resources, Action Priority List, Statistics & Data Analysis, Stats, Gear, Profile, Talents (multi-player only), Parsed Player Effects) in `<script type="text/x-deferred-html">` blocks, the browser will skip parsing these sections, and we can later inject this unparsed HTML into the DOM with a bit of JS once the user actually opens the section. This gives us a report which is interactive much faster by avoiding having the browser do heavy parsing work on sections that may never be opened.
---
 engine/player/player.cpp                 |  8 ++-
 engine/report/data/html_report_script.js | 41 +++++++++---
 engine/report/data/report_data.inc       | 85 +++++++++++++-----------
 engine/report/report_html_player.cpp     | 79 +++++++++++++++-------
 4 files changed, 135 insertions(+), 78 deletions(-)

diff --git a/engine/player/player.cpp b/engine/player/player.cpp
index 7207af253fc..33965b83e7d 100644
--- a/engine/player/player.cpp
+++ b/engine/player/player.cpp
@@ -16440,9 +16440,10 @@ void player_t::print_parsed_effects( report::sc_html_stream& os ) const
   if ( !sim->report_details )
     return;
 
-  os << R"(<div class="player-section parsed_effects">)"
-     << R"(<h3 class="toggle">Parsed Player Effects</h3>)"
-     << R"(<div class="toggle-content hide">)";
+  os << R"(<div class="player-section parsed_effects">)";
+  os.format( R"(<h3 class="toggle" id="player{}_parsed_effects_toggle">Parsed Player Effects</h3>)", index );
+  os << R"(<div class="toggle-content hide">)";
+  os.format( R"(<script type="text/x-deferred-html" data-toggle="player{}_parsed_effects_toggle">)", index );
 
   os << R"(<table class="sc left even"><thead><tr><th colspan="2" class="left">Passive Effects</th>)"
      << R"(<th>Spell</th><th colspan="2">ID</th><th>Value</th><th>Source</th></tr></thead>)";
@@ -16571,6 +16572,7 @@ void player_t::print_parsed_effects( report::sc_html_stream& os ) const
 
   print_custom_parsed_effects( os );
 
+  os << "\n</script>\n";
   os << "</div></div>\n";
 }
 
diff --git a/engine/report/data/html_report_script.js b/engine/report/data/html_report_script.js
index 68d91a4cb48..1b80f46186c 100644
--- a/engine/report/data/html_report_script.js
+++ b/engine/report/data/html_report_script.js
@@ -86,7 +86,7 @@ jQuery(document).ready(function ($) {
             }
         }
     });
-    $('.toggle-details').click(function (e) {
+    $(document).on('click', '.toggle-details', function (e) {
         e.preventDefault();
         e.stopPropagation();
         var $me = $(this);
@@ -99,16 +99,37 @@ jQuery(document).ready(function ($) {
             $row.fadeToggle(150);
         }
     });
-    $('.toggle, .toggle-details').each(function() {
-        if ( __chartData[this.id] === undefined ) return;
-        $(this).one('click', function() {
-            var d = __chartData[this.id];
-            for (var idx in d) {
-                $('#' + d[idx]['target']).highcharts(d[idx]['data']);
-            }
+    function bindChartLoaders($scope) {
+        $scope.find('.toggle, .toggle-details').each(function() {
+            if ( __chartData[this.id] === undefined ) return;
+            $(this).one('click', function() {
+                var d = __chartData[this.id];
+                for (var idx in d) {
+                    $('#' + d[idx]['target']).highcharts(d[idx]['data']);
+                }
+            });
         });
+    }
+    bindChartLoaders($(document));
+    $('.toggle').each(function() {
+        if ( !this.id ) return;
+        var $deferred = $('script[type="text/x-deferred-html"][data-toggle="' + this.id + '"]');
+        if ( !$deferred.length ) return;
+        var inject = function() {
+            $deferred.each(function() {
+                var $injected = $($.parseHTML(this.textContent));
+                $(this).replaceWith($injected);
+                bindChartLoaders($injected);
+            });
+            $('.stripetoprow').oddstripe();
+        };
+        if ( $(this).hasClass('open') ) {
+            inject();
+        } else {
+            $(this).one('click', inject);
+        }
     });
-    $('table.stripetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type').click(function (e) {
+    $(document).on('click', 'table.stripetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) {
         e.preventDefault();
         $(this).children('.toggle-details').first().click();
     });
@@ -202,7 +223,7 @@ jQuery(document).ready(function ($) {
             $cells.removeClass('pulse');
         }, 150);
     }
-    $('.sort').on('click', 'th.toggle-sort', function (e) {
+    $(document).on('click', '.sort th.toggle-sort', function (e) {
         e.preventDefault();
         var $me = $(this);
         var $col = $me.closest('th');
diff --git a/engine/report/data/report_data.inc b/engine/report/data/report_data.inc
index e55d8319aaf..7eaffb45f88 100644
--- a/engine/report/data/report_data.inc
+++ b/engine/report/data/report_data.inc
@@ -1139,46 +1139,51 @@ static const char* __html_report_script[] = {
 " $me.next('.toggle-content').slideToggle(150); var section = $me.parent('.section'); if (section.length) { section.v",
 "alidate_section(); if ($me.hasClass('open')) { var wh = $(window).height() / 3; var pos = section[0].getBoundingClie",
 "ntRect().top; if (pos > wh * 2) { $('html, body').animate( { scrollTop: section.offset().top - wh }, 300); } } } });",
-" $('.toggle-details').click(function (e) { e.preventDefault(); e.stopPropagation(); var $me = $(this); var $row = $m",
-"e.closest('tr').nextAll('.details').first(); if ($me.hasClass('open')) { $me.removeClass('open'); $row.fadeToggle(75",
-"); } else { $me.addClass('open'); $row.fadeToggle(150); } }); $('.toggle, .toggle-details').each(function() { if ( _",
-"_chartData[this.id] === undefined ) return; $(this).one('click', function() { var d = __chartData[this.id]; for (var",
-" idx in d) { $('#' + d[idx]['target']).highcharts(d[idx]['data']); } }); }); $('table.stripetoprow .toprow td:first-",
-"of-type, table.stripebody tbody td:first-of-type').click(function (e) { e.preventDefault(); $(this).children('.toggl",
-"e-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(hoverTimeout); $('#active-hel",
-"p','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(function (e) { var $target = $(thi",
-"s.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HELP FOUND</h3><p>PLEASE REPOR",
-"T AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box').html(content); $('#active-",
-"help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.top - $('#active-help').height",
-"() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#active-help').fadeIn(300); }, ",
-"750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $row; var ret; var idx = i; if",
-" ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret = $row.children('td').eq(idx",
-").text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').length; $row = $row.nextAll('.ch",
-"ildrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td').eq(idx).text().trim(); } ",
-"} return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace(/[^\\d.-]/g,''); } function",
-" numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +strip(getCell(b, i, both)) ||",
-" 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va = getCell(a, i, both); var vb",
-" = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? 1 : -1; } } function pulseco",
-"lumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table.find('.toprow:not(.childrow",
-")').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both && (!cell.length || cell.is",
-"(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.childrow').first(); if (row.leng",
-"th && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length && !cell.is(':empty')) { $.me",
-"rge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find('tbody tr:first-of-type td:n",
-"th-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td:nth-of-type(' + (index + 1)",
-" + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeClass('pulse'); }, 150); } $(",
-"'.sort').on('click', 'th.toggle-sort', function (e) { e.preventDefault(); var $me = $(this); var $col = $me.closest(",
-"'th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); var $sib = $col.siblings('.asc-sorte",
-"d, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index(); var doAlpha = this.dataset.sort",
-"type == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dataset.sortrows == 'both'; if (!($me.",
-"hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sorted', !doAsc); } else { $me.toggleC",
-"lass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('asc-sorted', !isDsc); var srt; if (do",
-"Alpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(a, b, i, dsc, both); }; }; } else {",
-" srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i, dsc, both); }; }; } var $bucket =",
-" $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children('tr').first().nextUntil('.petrow')",
-".addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.sort(srt(idx, isDsc, doRows)); $tbl.",
-"append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = $remain.first(); $bucket = $petrow.",
-"nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length > 1); if ($tbl.hasClass('stripetop",
-"row')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
+" $(document).on('click', '.toggle-details', function (e) { e.preventDefault(); e.stopPropagation(); var $me = $(this",
+"); var $row = $me.closest('tr').nextAll('.details').first(); if ($me.hasClass('open')) { $me.removeClass('open'); $r",
+"ow.fadeToggle(75); } else { $me.addClass('open'); $row.fadeToggle(150); } }); function bindChartLoaders($scope) { $s",
+"cope.find('.toggle, .toggle-details').each(function() { if ( __chartData[this.id] === undefined ) return; $(this).on",
+"e('click', function() { var d = __chartData[this.id]; for (var idx in d) { $('#' + d[idx]['target']).highcharts(d[id",
+"x]['data']); } }); }); } bindChartLoaders($(document)); $('.toggle').each(function() { if ( !this.id ) return; var $",
+"deferred = $('script[type=\"text/x-deferred-html\"][data-toggle=\"' + this.id + '\"]'); if ( !$deferred.length ) ret",
+"urn; var inject = function() { $deferred.each(function() { var $injected = $($.parseHTML(this.textContent)); $(this)",
+".replaceWith($injected); bindChartLoaders($injected); }); $('.stripetoprow').oddstripe(); }; if ( $(this).hasClass('",
+"open') ) { inject(); } else { $(this).one('click', inject); } }); $(document).on('click', 'table.stripetoprow .topro",
+"w td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.preventDefault(); $(this).children('.",
+"toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(hoverTimeout); $('#activ",
+"e-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(function (e) { var $target = ",
+"$(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HELP FOUND</h3><p>PLEASE ",
+"REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box').html(content); $('#ac",
+"tive-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.top - $('#active-help').h",
+"eight() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#active-help').fadeIn(300)",
+"; }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $row; var ret; var idx = ",
+"i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret = $row.children('td').e",
+"q(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').length; $row = $row.nextAll",
+"('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td').eq(idx).text().trim(",
+"); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace(/[^\\d.-]/g,''); } fun",
+"ction numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +strip(getCell(b, i, both",
+")) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va = getCell(a, i, both); v",
+"ar vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? 1 : -1; } } function pu",
+"lsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table.find('.toprow:not(.chi",
+"ldrow)').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both && (!cell.length || ce",
+"ll.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.childrow').first(); if (row",
+".length && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length && !cell.is(':empty')) {",
+" $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find('tbody tr:first-of-type",
+" td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td:nth-of-type(' + (index",
+" + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeClass('pulse'); }, 150);",
+" } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefault(); var $me = $(this); var $col = ",
+"$me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); var $sib = $col.siblings",
+"('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index(); var doAlpha = this.",
+"dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dataset.sortrows == 'both'",
+"; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sorted', !doAsc); } else {",
+" $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('asc-sorted', !isDsc); var",
+" srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(a, b, i, dsc, both); };",
+" }; } else { srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i, dsc, both); }; }; } v",
+"ar $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children('tr').first().nextUnti",
+"l('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.sort(srt(idx, isDsc, doR",
+"ows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = $remain.first(); $bucke",
+"t = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length > 1); if ($tbl.hasClas",
+"s('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
 };
 
 // Automatically generated from file style.css
diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index efc7a3579b5..bc3b596a262 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -1181,10 +1181,11 @@ void print_html_gear( report::sc_html_stream& os, const player_t& p )
   if ( p.items.empty() )
     return;
 
+  os << "<div class=\"player-section gear\">\n";
+  os.printf( "<h3 class=\"toggle\" id=\"player%d_gear_toggle\">Gear</h3>\n", p.index );
+  os << "<div class=\"toggle-content hide\">\n";
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_gear_toggle\">\n", p.index );
   os.printf(
-      "<div class=\"player-section gear\">\n"
-      "<h3 class=\"toggle\">Gear</h3>\n"
-      "<div class=\"toggle-content hide\">\n"
       "<table class=\"sc odd\">\n"
       "<thead>\n"
       "<tr>\n"
@@ -1422,6 +1423,7 @@ void print_html_gear( report::sc_html_stream& os, const player_t& p )
   }
   os << "</tbody>\n"
      << "</table>\n"
+     << "</script>\n"
      << "</div>\n"
      << "</div>\n";
 }
@@ -1437,12 +1439,14 @@ void print_html_profile( report::sc_html_stream& os, const player_t& p,
     profile_str             = util::encode_html( profile_str );
     util::replace_all( profile_str, "\n", "<br>" );
 
-    os << "<div class=\"player-section profile\">\n"
-       << "<h3 class=\"toggle\">Profile</h3>\n"
-       << "<div class=\"toggle-content hide\">\n"
-       << "<div class=\"subsection force-wrap\">\n"
+    os << "<div class=\"player-section profile\">\n";
+    os.printf( "<h3 class=\"toggle\" id=\"player%d_profile_toggle\">Profile</h3>\n", p.index );
+    os << "<div class=\"toggle-content hide\">\n";
+    os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_profile_toggle\">\n", p.index );
+    os << "<div class=\"subsection force-wrap\">\n"
        << "<p>" << profile_str << "</p>\n"
        << "</div>\n"
+       << "</script>\n"
        << "</div>\n"
        << "</div>\n";
   }
@@ -1475,10 +1479,11 @@ void print_html_stats( report::sc_html_stream& os, const player_t& p )
 
   if ( p.collected_data.fight_length.mean() > 0 )
   {
-    os << "<div class=\"player-section stats\">\n"
-       << "<h3 class=\"toggle\">Stats</h3>\n"
-       << "<div class=\"toggle-content hide\">\n"
-       << "<table class=\"sc even\">\n"
+    os << "<div class=\"player-section stats\">\n";
+    os.printf( "<h3 class=\"toggle\" id=\"player%d_charstats_toggle\">Stats</h3>\n", p.index );
+    os << "<div class=\"toggle-content hide\">\n";
+    os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_charstats_toggle\">\n", p.index );
+    os << "<table class=\"sc even\">\n"
        << "<thead>\n"
        << "<tr>\n"
        << "<th></th>\n"
@@ -1838,6 +1843,7 @@ void print_html_stats( report::sc_html_stream& os, const player_t& p )
     }
     os << "</tbody>\n"
        << "</table>\n"
+       << "</script>\n"
        << "</div>\n"
        << "</div>\n";
   }
@@ -2042,11 +2048,14 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
       *points_ptr += _rank;
   }
 
-  os << "<div class=\"player-section talents\">\n"
-     << "<h3 class=\"toggle\">Talents</h3>\n"
-     << "<div class=\"toggle-content hide\">\n";
-
   auto num_players = p.sim->players_by_name.size();
+
+  os << "<div class=\"player-section talents\">\n";
+  os.printf( "<h3 class=\"toggle\" id=\"player%d_talents_toggle\">Talents</h3>\n", p.index );
+  os << "<div class=\"toggle-content hide\">\n";
+  if ( num_players > 1 )
+    os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talents_toggle\">\n", p.index );
+
   if ( num_players == 1 )
   {
     auto max_col = class_columns( p.specialization(), p.is_ptr() ) + spec_columns( p.specialization(), p.is_ptr() );
@@ -2091,6 +2100,9 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
   if ( num_players == 1 )
     os << "</div>\n";
 
+  if ( num_players > 1 )
+    os << "</script>\n";
+
   os << "</div>\n"
      << "</div>\n";
 }
@@ -2475,9 +2487,10 @@ void print_html_sample_sequence_table_entry( report::sc_html_stream& os,
 void print_html_player_action_priority_list( report::sc_html_stream& os, const player_t& p )
 {
   const sim_t& sim = *( p.sim );
-  os << "<div class=\"player-section action-priority-list\">\n"
-     << "<h3 class=\"toggle\">Action Priority List</h3>\n"
-     << "<div class=\"toggle-content hide\">\n";
+  os << "<div class=\"player-section action-priority-list\">\n";
+  os.printf( "<h3 class=\"toggle\" id=\"player%d_apl_toggle\">Action Priority List</h3>\n", p.index );
+  os << "<div class=\"toggle-content hide\">\n";
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_apl_toggle\">\n", p.index );
 
   action_priority_list_t* alist = nullptr;
 
@@ -2641,6 +2654,7 @@ void print_html_player_action_priority_list( report::sc_html_stream& os, const p
   }
 
   // End Action Priority List section
+  os << "\n</script>\n";
   os << "</div>\n"
      << "</div>\n";
 }
@@ -2652,10 +2666,11 @@ void print_html_player_statistics( report::sc_html_stream& os, const player_t& p
 {
   // Statistics & Data Analysis
 
-  os << "<div class=\"player-section analysis\">\n"
-        "<h3 class=\"toggle\">Statistics & Data Analysis</h3>\n"
-        "<div class=\"toggle-content hide\">\n"
-        "<table class=\"sc stripebody\">\n";
+  os << "<div class=\"player-section analysis\">\n";
+  os.printf( "<h3 class=\"toggle\" id=\"player%d_stats_toggle\">Statistics & Data Analysis</h3>\n", p.index );
+  os << "<div class=\"toggle-content hide\">\n";
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_stats_toggle\">\n", p.index );
+  os << "<table class=\"sc stripebody\">\n";
 
   report_helper::print_html_sample_data( os, p, p.collected_data.fight_length, "Fight Length" );
   report_helper::print_html_sample_data( os, p, p.collected_data.dps, "DPS" );
@@ -2673,8 +2688,9 @@ void print_html_player_statistics( report::sc_html_stream& os, const player_t& p
     report_helper::print_html_sample_data( os, p, *sample_data, util::encode_html( sample_data->name_str ) );
   }
 
-  os << "</table>\n"
-        "</div>\n"
+  os << "</table>\n";
+  os << "\n</script>\n";
+  os << "</div>\n"
         "</div>\n";
 }
 
@@ -2945,6 +2961,7 @@ void print_html_player_resources( report::sc_html_stream& os, const player_t& p
   os << "<div class=\"player-section gains\">\n"
      << "<h3 class=\"toggle open\">Resources</h3>\n"
      << "<div class=\"toggle-content flexwrap\">\n";
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
 
   int count_gains   = 0;
   int count_usage   = 0;
@@ -2994,7 +3011,9 @@ void print_html_player_resources( report::sc_html_stream& os, const player_t& p
       print_html_resource_changes_table( os, p );
   }
 
-  os << "</div><div class=\"column-charts\">\n"; // Open DIV for charts
+  os << "</div>\n";
+  os << "\n</script>\n";
+  os << "<div class=\"column-charts\">\n"; // Open DIV for charts
 
   for ( resource_e r = RESOURCE_MAX; --r > RESOURCE_NONE; )
   {
@@ -3638,6 +3657,8 @@ void print_html_player_buffs( report::sc_html_stream& os, const player_t& p,
      << "<h3 class=\"toggle open\">Buffs</h3>\n"
      << "<div class=\"toggle-content\">\n";
 
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
+
   // Dynamic Buffs table
   os << "<table class=\"sc sort stripebody\">\n"
      << "<thead>\n";
@@ -3686,6 +3707,8 @@ void print_html_player_buffs( report::sc_html_stream& os, const player_t& p,
     os << "</table>\n";
   }
 
+  os << "\n</script>\n";
+
   os << "</div>\n"
      << "</div>\n";
 }
@@ -4429,9 +4452,11 @@ void print_html_player_abilities( report::sc_html_stream& os, const player_t& p
      << "<h3 class=\"toggle open\">Abilities</h3>\n"
      << "<div class=\"toggle-content\">\n";
 
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
   output_player_damage_summary( os, p );
   output_player_heal_summary( os, p );
   output_player_simple_ability_summary( os, p );
+  os << "\n</script>\n";
 
   // close section
   os << "</div>\n"
@@ -4743,6 +4768,8 @@ void print_html_player_procs( report::sc_html_stream& os, const player_t& p )
      << "<h3 class=\"toggle open\">Procs, Uptimes & Benefits</h3>\n"
      << "<div class=\"toggle-content flexwrap\">\n"; // Can't use columns as detail toggle will change widths
 
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
+
   bool new_div = false;
 
   os << "<div>\n"; // Open DIV#1
@@ -4783,6 +4810,8 @@ void print_html_player_procs( report::sc_html_stream& os, const player_t& p )
 
   os << "</div>\n"; // Close DIV for all
 
+  os << "\n</script>\n";
+
   os << "</div>\n"
      << "</div>\n";
 }

From 55262d31dec2ba7645cda2e3cfe2b576e4935cec Mon Sep 17 00:00:00 2001
From: Kate Martin <51387586+renanthera@users.noreply.github.com>
Date: Sat, 6 Jun 2026 21:40:05 -0600
Subject: [PATCH 05/12] [report] Remove special casing for HTML reports based
 on actor count.

---
 engine/report/report_html_player.cpp | 30 ++++++++++------------------
 engine/report/report_html_sim.cpp    | 10 +---------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index bc3b596a262..32d965537f5 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -2048,25 +2048,19 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
       *points_ptr += _rank;
   }
 
-  auto num_players = p.sim->players_by_name.size();
-
   os << "<div class=\"player-section talents\">\n";
   os.printf( "<h3 class=\"toggle\" id=\"player%d_talents_toggle\">Talents</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
-  if ( num_players > 1 )
-    os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talents_toggle\">\n", p.index );
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talents_toggle\">\n", p.index );
 
-  if ( num_players == 1 )
-  {
-    auto max_col = class_columns( p.specialization(), p.is_ptr() ) + spec_columns( p.specialization(), p.is_ptr() );
-    auto h_ = static_cast<int>( 1165 - max_col * 28 );
-    os.format( R"(<iframe src="{}" width="1165" height="{}"></iframe>)",
-               raidbots_talent_render_src( p.talents_str, p.true_level, 1165, false, p.dbc->ptr ), h_ );
+  auto max_col = class_columns( p.specialization(), p.is_ptr() ) + spec_columns( p.specialization(), p.is_ptr() );
+  auto h_ = static_cast<int>( 1165 - max_col * 28 );
+  os.format( R"(<iframe src="{}" width="1165" height="{}" style="background:#160f0b"></iframe>)",
+              raidbots_talent_render_src( p.talents_str, p.true_level, 1165, false, p.dbc->ptr ), h_ );
 
-    // Hide the talent table only if the Raidbots talent iframe is present.
-    os << "<h3 class=\"toggle\">Talent Tables</h3>\n"
-       << "<div class=\"toggle-content hide\">\n";
-  }
+  // Hide the talent table only if the Raidbots talent iframe is present.
+  os << "<h3 class=\"toggle\">Talent Tables</h3>\n"
+      << "<div class=\"toggle-content hide\">\n";
 
   if ( range::accumulate( class_traits, 0, &std::vector<talentrank_t>::size ) )
   {
@@ -2096,12 +2090,8 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
     os << "</div>\n";
   }
 
-  // Close the talent table div only if it exists.
-  if ( num_players == 1 )
-    os << "</div>\n";
-
-  if ( num_players > 1 )
-    os << "</script>\n";
+  os << "</div>\n";
+  os << "</script>\n";
 
   os << "</div>\n"
      << "</div>\n";
diff --git a/engine/report/report_html_sim.cpp b/engine/report/report_html_sim.cpp
index 9060433c013..ace050125fa 100644
--- a/engine/report/report_html_sim.cpp
+++ b/engine/report/report_html_sim.cpp
@@ -1278,15 +1278,7 @@ void print_html_( report::sc_html_stream& os, sim_t& sim )
 
   if ( sim.decorated_tooltips )
   {
-    //Apply the prettification stuff only if its a single report
-    if ( num_players > 1 )
-    {
-      os << R"(<script>var whTooltips = {colorLinks: false, iconizeLinks: false, renameLinks: false};</script>)";
-    }
-    else
-    {
-      os << R"(<script>var whTooltips = {colorLinks: true, iconizeLinks: true, renameLinks: true};</script>)";
-    }
+    os << R"(<script>var whTooltips = {colorLinks: true, iconizeLinks: true, renameLinks: true};</script>)";
 
     if ( !sim.offline )
       os << std::endl << R"(<script type="text/javascript" src="https://wow.zamimg.com/widgets/power.js"></script>)";

From cd567eb7ed258bd25cb4d2d6c9e9eff7bac5f00d Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Sun, 7 Jun 2026 00:05:47 -0400
Subject: [PATCH 06/12] fix talent tables toggle

---
 engine/report/report_html_player.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index 32d965537f5..81dbfcf5756 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -2057,10 +2057,12 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
   auto h_ = static_cast<int>( 1165 - max_col * 28 );
   os.format( R"(<iframe src="{}" width="1165" height="{}" style="background:#160f0b"></iframe>)",
               raidbots_talent_render_src( p.talents_str, p.true_level, 1165, false, p.dbc->ptr ), h_ );
+  os << "</script>\n";
 
   // Hide the talent table only if the Raidbots talent iframe is present.
-  os << "<h3 class=\"toggle\">Talent Tables</h3>\n"
-      << "<div class=\"toggle-content hide\">\n";
+  os.printf( "<h3 class=\"toggle\" id=\"player%d_talent_tables_toggle\">Talent Tables</h3>\n", p.index );
+  os << "<div class=\"toggle-content hide\">\n";
+  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talent_tables_toggle\">\n", p.index );
 
   if ( range::accumulate( class_traits, 0, &std::vector<talentrank_t>::size ) )
   {
@@ -2090,8 +2092,8 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
     os << "</div>\n";
   }
 
-  os << "</div>\n";
   os << "</script>\n";
+  os << "</div>\n";
 
   os << "</div>\n"
      << "</div>\n";

From bb81182c2c8940eccf805fc3e025bdab4c2028ff Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Sun, 7 Jun 2026 02:03:04 -0400
Subject: [PATCH 07/12] fix toggle onclick in deferred blocks

---
 engine/report/data/html_report_script.js |  2 +-
 engine/report/data/report_data.inc       | 98 ++++++++++++------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/engine/report/data/html_report_script.js b/engine/report/data/html_report_script.js
index 1b80f46186c..8496178d539 100644
--- a/engine/report/data/html_report_script.js
+++ b/engine/report/data/html_report_script.js
@@ -67,7 +67,7 @@ jQuery(document).ready(function ($) {
             scrollTop: $anchor.parent().offset().top - $anchor.height()
         }, 300);
     });
-    $('.toggle').click(function (e) {
+    $(document).on('click', '.toggle', function (e) {
         e.preventDefault();
         var $me = $(this);
         $me.toggleClass('open');
diff --git a/engine/report/data/report_data.inc b/engine/report/data/report_data.inc
index 7eaffb45f88..54a2cf89961 100644
--- a/engine/report/data/report_data.inc
+++ b/engine/report/data/report_data.inc
@@ -1135,55 +1135,55 @@ static const char* __html_report_script[] = {
 "$('a.ext').mouseover(function () { $(this).attr('target', '_blank'); }); $('ul.toc li a').click(function (e) { e.pre",
 "ventDefault(); var href = this.getAttribute('href'); var $anchor = $(href).children('h2').first(); if (!$anchor.hasC",
 "lass('open')) { $anchor.click(); } $('html, body').animate( { scrollTop: $anchor.parent().offset().top - $anchor.hei",
-"ght() }, 300); }); $('.toggle').click(function (e) { e.preventDefault(); var $me = $(this); $me.toggleClass('open');",
-" $me.next('.toggle-content').slideToggle(150); var section = $me.parent('.section'); if (section.length) { section.v",
-"alidate_section(); if ($me.hasClass('open')) { var wh = $(window).height() / 3; var pos = section[0].getBoundingClie",
-"ntRect().top; if (pos > wh * 2) { $('html, body').animate( { scrollTop: section.offset().top - wh }, 300); } } } });",
-" $(document).on('click', '.toggle-details', function (e) { e.preventDefault(); e.stopPropagation(); var $me = $(this",
-"); var $row = $me.closest('tr').nextAll('.details').first(); if ($me.hasClass('open')) { $me.removeClass('open'); $r",
-"ow.fadeToggle(75); } else { $me.addClass('open'); $row.fadeToggle(150); } }); function bindChartLoaders($scope) { $s",
-"cope.find('.toggle, .toggle-details').each(function() { if ( __chartData[this.id] === undefined ) return; $(this).on",
-"e('click', function() { var d = __chartData[this.id]; for (var idx in d) { $('#' + d[idx]['target']).highcharts(d[id",
-"x]['data']); } }); }); } bindChartLoaders($(document)); $('.toggle').each(function() { if ( !this.id ) return; var $",
-"deferred = $('script[type=\"text/x-deferred-html\"][data-toggle=\"' + this.id + '\"]'); if ( !$deferred.length ) ret",
-"urn; var inject = function() { $deferred.each(function() { var $injected = $($.parseHTML(this.textContent)); $(this)",
-".replaceWith($injected); bindChartLoaders($injected); }); $('.stripetoprow').oddstripe(); }; if ( $(this).hasClass('",
-"open') ) { inject(); } else { $(this).one('click', inject); } }); $(document).on('click', 'table.stripetoprow .topro",
-"w td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.preventDefault(); $(this).children('.",
-"toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(hoverTimeout); $('#activ",
-"e-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(function (e) { var $target = ",
-"$(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HELP FOUND</h3><p>PLEASE ",
-"REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box').html(content); $('#ac",
-"tive-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.top - $('#active-help').h",
-"eight() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#active-help').fadeIn(300)",
-"; }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $row; var ret; var idx = ",
-"i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret = $row.children('td').e",
-"q(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').length; $row = $row.nextAll",
-"('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td').eq(idx).text().trim(",
-"); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace(/[^\\d.-]/g,''); } fun",
-"ction numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +strip(getCell(b, i, both",
-")) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va = getCell(a, i, both); v",
-"ar vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? 1 : -1; } } function pu",
-"lsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table.find('.toprow:not(.chi",
-"ldrow)').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both && (!cell.length || ce",
-"ll.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.childrow').first(); if (row",
-".length && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length && !cell.is(':empty')) {",
-" $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find('tbody tr:first-of-type",
-" td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td:nth-of-type(' + (index",
-" + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeClass('pulse'); }, 150);",
-" } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefault(); var $me = $(this); var $col = ",
-"$me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); var $sib = $col.siblings",
-"('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index(); var doAlpha = this.",
-"dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dataset.sortrows == 'both'",
-"; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sorted', !doAsc); } else {",
-" $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('asc-sorted', !isDsc); var",
-" srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(a, b, i, dsc, both); };",
-" }; } else { srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i, dsc, both); }; }; } v",
-"ar $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children('tr').first().nextUnti",
-"l('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.sort(srt(idx, isDsc, doR",
-"ows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = $remain.first(); $bucke",
-"t = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length > 1); if ($tbl.hasClas",
-"s('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
+"ght() }, 300); }); $(document).on('click', '.toggle', function (e) { e.preventDefault(); var $me = $(this); $me.togg",
+"leClass('open'); $me.next('.toggle-content').slideToggle(150); var section = $me.parent('.section'); if (section.len",
+"gth) { section.validate_section(); if ($me.hasClass('open')) { var wh = $(window).height() / 3; var pos = section[0]",
+".getBoundingClientRect().top; if (pos > wh * 2) { $('html, body').animate( { scrollTop: section.offset().top - wh },",
+" 300); } } } }); $(document).on('click', '.toggle-details', function (e) { e.preventDefault(); e.stopPropagation(); ",
+"var $me = $(this); var $row = $me.closest('tr').nextAll('.details').first(); if ($me.hasClass('open')) { $me.removeC",
+"lass('open'); $row.fadeToggle(75); } else { $me.addClass('open'); $row.fadeToggle(150); } }); function bindChartLoad",
+"ers($scope) { $scope.find('.toggle, .toggle-details').each(function() { if ( __chartData[this.id] === undefined ) re",
+"turn; $(this).one('click', function() { var d = __chartData[this.id]; for (var idx in d) { $('#' + d[idx]['target'])",
+".highcharts(d[idx]['data']); } }); }); } bindChartLoaders($(document)); $('.toggle').each(function() { if ( !this.id",
+" ) return; var $deferred = $('script[type=\"text/x-deferred-html\"][data-toggle=\"' + this.id + '\"]'); if ( !$defer",
+"red.length ) return; var inject = function() { $deferred.each(function() { var $injected = $($.parseHTML(this.textCo",
+"ntent)); $(this).replaceWith($injected); bindChartLoaders($injected); }); $('.stripetoprow').oddstripe(); }; if ( $(",
+"this).hasClass('open') ) { inject(); } else { $(this).one('click', inject); } }); $(document).on('click', 'table.str",
+"ipetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.preventDefault(); $(t",
+"his).children('.toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(hoverTim",
+"eout); $('#active-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(function (e) ",
+"{ var $target = $(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HELP FOUN",
+"D</h3><p>PLEASE REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box').html(",
+"content); $('#active-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.top - $('",
+"#active-help').height() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#active-he",
+"lp').fadeIn(300); }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $row; var",
+" ret; var idx = i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret = $row.",
+"children('td').eq(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').length; $ro",
+"w = $row.nextAll('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td').eq(i",
+"dx).text().trim(); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace(/[^\\d",
+".-]/g,''); } function numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +strip(ge",
+"tCell(b, i, both)) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va = getCel",
+"l(a, i, both); var vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? 1 : -1;",
+" } } function pulsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table.find('",
+".toprow:not(.childrow)').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both && (!c",
+"ell.length || cell.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.childrow').",
+"first(); if (row.length && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length && !cell",
+".is(':empty')) { $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find('tbody ",
+"tr:first-of-type td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td:nth-of",
+"-type(' + (index + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeClass('p",
+"ulse'); }, 150); } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefault(); var $me = $(th",
+"is); var $col = $me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); var $sib",
+" = $col.siblings('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index(); var",
+" doAlpha = this.dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dataset.so",
+"rtrows == 'both'; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sorted', !",
+"doAsc); } else { $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('asc-sorte",
+"d', !isDsc); var srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(a, b, i",
+", dsc, both); }; }; } else { srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i, dsc, ",
+"both); }; }; } var $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children('tr').",
+"first().nextUntil('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.sort(srt",
+"(idx, isDsc, doRows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = $remain",
+".first(); $bucket = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length > 1); ",
+"if ($tbl.hasClass('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
 };
 
 // Automatically generated from file style.css

From 6f41342d825da49fd9c42716330d586f886614fb Mon Sep 17 00:00:00 2001
From: Kate Martin <51387586+renanthera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 00:38:24 -0600
Subject: [PATCH 08/12] [report] Remove deferral for talent tree iframe to
 mitigate flashbang.

---
 engine/report/report_html_player.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index 81dbfcf5756..a92d54cdc90 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -2049,17 +2049,14 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
   }
 
   os << "<div class=\"player-section talents\">\n";
-  os.printf( "<h3 class=\"toggle\" id=\"player%d_talents_toggle\">Talents</h3>\n", p.index );
+  os.printf( "<h3 class=\"toggle\">Talents</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talents_toggle\">\n", p.index );
 
   auto max_col = class_columns( p.specialization(), p.is_ptr() ) + spec_columns( p.specialization(), p.is_ptr() );
   auto h_ = static_cast<int>( 1165 - max_col * 28 );
   os.format( R"(<iframe src="{}" width="1165" height="{}" style="background:#160f0b"></iframe>)",
               raidbots_talent_render_src( p.talents_str, p.true_level, 1165, false, p.dbc->ptr ), h_ );
-  os << "</script>\n";
 
-  // Hide the talent table only if the Raidbots talent iframe is present.
   os.printf( "<h3 class=\"toggle\" id=\"player%d_talent_tables_toggle\">Talent Tables</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
   os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talent_tables_toggle\">\n", p.index );

From 23fabc492e2435c8a1c079f036c3132184cd3d11 Mon Sep 17 00:00:00 2001
From: Kate Martin <51387586+renanthera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 01:06:53 -0600
Subject: [PATCH 09/12] [report] Remove deferral on default-open sections.

---
 engine/report/report_html_player.cpp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index a92d54cdc90..e4be044f6dc 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -2089,10 +2089,9 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
     os << "</div>\n";
   }
 
-  os << "</script>\n";
-  os << "</div>\n";
-
-  os << "</div>\n"
+  os << "</script>\n"
+     << "</div>\n"
+     << "</div>\n"
      << "</div>\n";
 }
 
@@ -2950,7 +2949,6 @@ void print_html_player_resources( report::sc_html_stream& os, const player_t& p
   os << "<div class=\"player-section gains\">\n"
      << "<h3 class=\"toggle open\">Resources</h3>\n"
      << "<div class=\"toggle-content flexwrap\">\n";
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
 
   int count_gains   = 0;
   int count_usage   = 0;
@@ -3001,7 +2999,6 @@ void print_html_player_resources( report::sc_html_stream& os, const player_t& p
   }
 
   os << "</div>\n";
-  os << "\n</script>\n";
   os << "<div class=\"column-charts\">\n"; // Open DIV for charts
 
   for ( resource_e r = RESOURCE_MAX; --r > RESOURCE_NONE; )
@@ -3646,8 +3643,6 @@ void print_html_player_buffs( report::sc_html_stream& os, const player_t& p,
      << "<h3 class=\"toggle open\">Buffs</h3>\n"
      << "<div class=\"toggle-content\">\n";
 
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
-
   // Dynamic Buffs table
   os << "<table class=\"sc sort stripebody\">\n"
      << "<thead>\n";
@@ -3696,8 +3691,6 @@ void print_html_player_buffs( report::sc_html_stream& os, const player_t& p,
     os << "</table>\n";
   }
 
-  os << "\n</script>\n";
-
   os << "</div>\n"
      << "</div>\n";
 }
@@ -4441,11 +4434,9 @@ void print_html_player_abilities( report::sc_html_stream& os, const player_t& p
      << "<h3 class=\"toggle open\">Abilities</h3>\n"
      << "<div class=\"toggle-content\">\n";
 
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
   output_player_damage_summary( os, p );
   output_player_heal_summary( os, p );
   output_player_simple_ability_summary( os, p );
-  os << "\n</script>\n";
 
   // close section
   os << "</div>\n"
@@ -4757,8 +4748,6 @@ void print_html_player_procs( report::sc_html_stream& os, const player_t& p )
      << "<h3 class=\"toggle open\">Procs, Uptimes & Benefits</h3>\n"
      << "<div class=\"toggle-content flexwrap\">\n"; // Can't use columns as detail toggle will change widths
 
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%dtoggle\">\n", p.index );
-
   bool new_div = false;
 
   os << "<div>\n"; // Open DIV#1
@@ -4799,8 +4788,6 @@ void print_html_player_procs( report::sc_html_stream& os, const player_t& p )
 
   os << "</div>\n"; // Close DIV for all
 
-  os << "\n</script>\n";
-
   os << "</div>\n"
      << "</div>\n";
 }

From e655ae0e19750be3775632b46b7f477a230d2c48 Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Sun, 7 Jun 2026 03:56:14 -0400
Subject: [PATCH 10/12] make charts inside deferred blocks load properly

---
 engine/report/data/html_report_script.js | 19 ++++--
 engine/report/data/report_data.inc       | 87 ++++++++++++------------
 2 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/engine/report/data/html_report_script.js b/engine/report/data/html_report_script.js
index 8496178d539..a0f6f68421d 100644
--- a/engine/report/data/html_report_script.js
+++ b/engine/report/data/html_report_script.js
@@ -99,21 +99,25 @@ jQuery(document).ready(function ($) {
             $row.fadeToggle(150);
         }
     });
+    function renderCharts(id) {
+        var d = __chartData[id];
+        if ( d === undefined ) return;
+        for (var idx in d) {
+            $('#' + d[idx]['target']).highcharts(d[idx]['data']);
+        }
+    }
     function bindChartLoaders($scope) {
         $scope.find('.toggle, .toggle-details').each(function() {
             if ( __chartData[this.id] === undefined ) return;
-            $(this).one('click', function() {
-                var d = __chartData[this.id];
-                for (var idx in d) {
-                    $('#' + d[idx]['target']).highcharts(d[idx]['data']);
-                }
-            });
+            var id = this.id;
+            $(this).one('click', function() { renderCharts(id); });
         });
     }
     bindChartLoaders($(document));
     $('.toggle').each(function() {
         if ( !this.id ) return;
-        var $deferred = $('script[type="text/x-deferred-html"][data-toggle="' + this.id + '"]');
+        var id = this.id;
+        var $deferred = $('script[type="text/x-deferred-html"][data-toggle="' + id + '"]');
         if ( !$deferred.length ) return;
         var inject = function() {
             $deferred.each(function() {
@@ -122,6 +126,7 @@ jQuery(document).ready(function ($) {
                 bindChartLoaders($injected);
             });
             $('.stripetoprow').oddstripe();
+            renderCharts(id);
         };
         if ( $(this).hasClass('open') ) {
             inject();
diff --git a/engine/report/data/report_data.inc b/engine/report/data/report_data.inc
index 54a2cf89961..f8ef8c5366f 100644
--- a/engine/report/data/report_data.inc
+++ b/engine/report/data/report_data.inc
@@ -1141,49 +1141,50 @@ static const char* __html_report_script[] = {
 ".getBoundingClientRect().top; if (pos > wh * 2) { $('html, body').animate( { scrollTop: section.offset().top - wh },",
 " 300); } } } }); $(document).on('click', '.toggle-details', function (e) { e.preventDefault(); e.stopPropagation(); ",
 "var $me = $(this); var $row = $me.closest('tr').nextAll('.details').first(); if ($me.hasClass('open')) { $me.removeC",
-"lass('open'); $row.fadeToggle(75); } else { $me.addClass('open'); $row.fadeToggle(150); } }); function bindChartLoad",
-"ers($scope) { $scope.find('.toggle, .toggle-details').each(function() { if ( __chartData[this.id] === undefined ) re",
-"turn; $(this).one('click', function() { var d = __chartData[this.id]; for (var idx in d) { $('#' + d[idx]['target'])",
-".highcharts(d[idx]['data']); } }); }); } bindChartLoaders($(document)); $('.toggle').each(function() { if ( !this.id",
-" ) return; var $deferred = $('script[type=\"text/x-deferred-html\"][data-toggle=\"' + this.id + '\"]'); if ( !$defer",
-"red.length ) return; var inject = function() { $deferred.each(function() { var $injected = $($.parseHTML(this.textCo",
-"ntent)); $(this).replaceWith($injected); bindChartLoaders($injected); }); $('.stripetoprow').oddstripe(); }; if ( $(",
-"this).hasClass('open') ) { inject(); } else { $(this).one('click', inject); } }); $(document).on('click', 'table.str",
-"ipetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.preventDefault(); $(t",
-"his).children('.toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(hoverTim",
-"eout); $('#active-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(function (e) ",
-"{ var $target = $(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HELP FOUN",
-"D</h3><p>PLEASE REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box').html(",
-"content); $('#active-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.top - $('",
-"#active-help').height() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#active-he",
-"lp').fadeIn(300); }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $row; var",
-" ret; var idx = i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret = $row.",
-"children('td').eq(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').length; $ro",
-"w = $row.nextAll('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td').eq(i",
-"dx).text().trim(); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace(/[^\\d",
-".-]/g,''); } function numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +strip(ge",
-"tCell(b, i, both)) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va = getCel",
-"l(a, i, both); var vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? 1 : -1;",
-" } } function pulsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table.find('",
-".toprow:not(.childrow)').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both && (!c",
-"ell.length || cell.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.childrow').",
-"first(); if (row.length && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length && !cell",
-".is(':empty')) { $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find('tbody ",
-"tr:first-of-type td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td:nth-of",
-"-type(' + (index + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeClass('p",
-"ulse'); }, 150); } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefault(); var $me = $(th",
-"is); var $col = $me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); var $sib",
-" = $col.siblings('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index(); var",
-" doAlpha = this.dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dataset.so",
-"rtrows == 'both'; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sorted', !",
-"doAsc); } else { $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('asc-sorte",
-"d', !isDsc); var srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(a, b, i",
-", dsc, both); }; }; } else { srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i, dsc, ",
-"both); }; }; } var $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children('tr').",
-"first().nextUntil('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.sort(srt",
-"(idx, isDsc, doRows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = $remain",
-".first(); $bucket = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length > 1); ",
-"if ($tbl.hasClass('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
+"lass('open'); $row.fadeToggle(75); } else { $me.addClass('open'); $row.fadeToggle(150); } }); function renderCharts(",
+"id) { var d = __chartData[id]; if ( d === undefined ) return; for (var idx in d) { $('#' + d[idx]['target']).highcha",
+"rts(d[idx]['data']); } } function bindChartLoaders($scope) { $scope.find('.toggle, .toggle-details').each(function()",
+" { if ( __chartData[this.id] === undefined ) return; var id = this.id; $(this).one('click', function() { renderChart",
+"s(id); }); }); } bindChartLoaders($(document)); $('.toggle').each(function() { if ( !this.id ) return; var id = this",
+".id; var $deferred = $('script[type=\"text/x-deferred-html\"][data-toggle=\"' + id + '\"]'); if ( !$deferred.length ",
+") return; var inject = function() { $deferred.each(function() { var $injected = $($.parseHTML(this.textContent)); $(",
+"this).replaceWith($injected); bindChartLoaders($injected); }); $('.stripetoprow').oddstripe(); renderCharts(id); }; ",
+"if ( $(this).hasClass('open') ) { inject(); } else { $(this).one('click', inject); } }); $(document).on('click', 'ta",
+"ble.stripetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.preventDefault",
+"(); $(this).children('.toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(h",
+"overTimeout); $('#active-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(functi",
+"on (e) { var $target = $(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HE",
+"LP FOUND</h3><p>PLEASE REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box'",
+").html(content); $('#active-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.to",
+"p - $('#active-help').height() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#ac",
+"tive-help').fadeIn(300); }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $r",
+"ow; var ret; var idx = i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret ",
+"= $row.children('td').eq(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').leng",
+"th; $row = $row.nextAll('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td",
+"').eq(idx).text().trim(); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace",
+"(/[^\\d.-]/g,''); } function numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +s",
+"trip(getCell(b, i, both)) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va =",
+" getCell(a, i, both); var vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? ",
+"1 : -1; } } function pulsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table",
+".find('.toprow:not(.childrow)').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both",
+" && (!cell.length || cell.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.chil",
+"drow').first(); if (row.length && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length &",
+"& !cell.is(':empty')) { $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find(",
+"'tbody tr:first-of-type td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td",
+":nth-of-type(' + (index + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeC",
+"lass('pulse'); }, 150); } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefault(); var $me",
+" = $(this); var $col = $me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); v",
+"ar $sib = $col.siblings('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index",
+"(); var doAlpha = this.dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dat",
+"aset.sortrows == 'both'; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sor",
+"ted', !doAsc); } else { $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('as",
+"c-sorted', !isDsc); var srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(",
+"a, b, i, dsc, both); }; }; } else { srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i",
+", dsc, both); }; }; } var $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children",
+"('tr').first().nextUntil('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.s",
+"ort(srt(idx, isDsc, doRows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = ",
+"$remain.first(); $bucket = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length",
+" > 1); if ($tbl.hasClass('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
 };
 
 // Automatically generated from file style.css

From 3d183c8fc9afcf68db39080dfb44110c872fd109 Mon Sep 17 00:00:00 2001
From: Kate Martin <51387586+renanthera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 02:08:07 -0600
Subject: [PATCH 11/12] [report] Defer only actor, as nested script tags are
 not permitted.

---
 engine/player/player.cpp             |  4 +---
 engine/report/report_html_player.cpp | 29 ++++++++++------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/engine/player/player.cpp b/engine/player/player.cpp
index 33965b83e7d..8276499f5d4 100644
--- a/engine/player/player.cpp
+++ b/engine/player/player.cpp
@@ -16441,9 +16441,8 @@ void player_t::print_parsed_effects( report::sc_html_stream& os ) const
     return;
 
   os << R"(<div class="player-section parsed_effects">)";
-  os.format( R"(<h3 class="toggle" id="player{}_parsed_effects_toggle">Parsed Player Effects</h3>)", index );
+  os.format( R"(<h3 class="toggle">Parsed Player Effects</h3>)", index );
   os << R"(<div class="toggle-content hide">)";
-  os.format( R"(<script type="text/x-deferred-html" data-toggle="player{}_parsed_effects_toggle">)", index );
 
   os << R"(<table class="sc left even"><thead><tr><th colspan="2" class="left">Passive Effects</th>)"
      << R"(<th>Spell</th><th colspan="2">ID</th><th>Value</th><th>Source</th></tr></thead>)";
@@ -16572,7 +16571,6 @@ void player_t::print_parsed_effects( report::sc_html_stream& os ) const
 
   print_custom_parsed_effects( os );
 
-  os << "\n</script>\n";
   os << "</div></div>\n";
 }
 
diff --git a/engine/report/report_html_player.cpp b/engine/report/report_html_player.cpp
index e4be044f6dc..32bd75c2b10 100644
--- a/engine/report/report_html_player.cpp
+++ b/engine/report/report_html_player.cpp
@@ -1182,9 +1182,8 @@ void print_html_gear( report::sc_html_stream& os, const player_t& p )
     return;
 
   os << "<div class=\"player-section gear\">\n";
-  os.printf( "<h3 class=\"toggle\" id=\"player%d_gear_toggle\">Gear</h3>\n", p.index );
+  os.printf( "<h3 class=\"toggle\">Gear</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_gear_toggle\">\n", p.index );
   os.printf(
       "<table class=\"sc odd\">\n"
       "<thead>\n"
@@ -1423,7 +1422,6 @@ void print_html_gear( report::sc_html_stream& os, const player_t& p )
   }
   os << "</tbody>\n"
      << "</table>\n"
-     << "</script>\n"
      << "</div>\n"
      << "</div>\n";
 }
@@ -1440,13 +1438,11 @@ void print_html_profile( report::sc_html_stream& os, const player_t& p,
     util::replace_all( profile_str, "\n", "<br>" );
 
     os << "<div class=\"player-section profile\">\n";
-    os.printf( "<h3 class=\"toggle\" id=\"player%d_profile_toggle\">Profile</h3>\n", p.index );
+    os.printf( "<h3 class=\"toggle\">Profile</h3>\n", p.index );
     os << "<div class=\"toggle-content hide\">\n";
-    os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_profile_toggle\">\n", p.index );
     os << "<div class=\"subsection force-wrap\">\n"
        << "<p>" << profile_str << "</p>\n"
        << "</div>\n"
-       << "</script>\n"
        << "</div>\n"
        << "</div>\n";
   }
@@ -1480,9 +1476,8 @@ void print_html_stats( report::sc_html_stream& os, const player_t& p )
   if ( p.collected_data.fight_length.mean() > 0 )
   {
     os << "<div class=\"player-section stats\">\n";
-    os.printf( "<h3 class=\"toggle\" id=\"player%d_charstats_toggle\">Stats</h3>\n", p.index );
+    os.printf( "<h3 class=\"toggle\">Stats</h3>\n", p.index );
     os << "<div class=\"toggle-content hide\">\n";
-    os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_charstats_toggle\">\n", p.index );
     os << "<table class=\"sc even\">\n"
        << "<thead>\n"
        << "<tr>\n"
@@ -1843,7 +1838,6 @@ void print_html_stats( report::sc_html_stream& os, const player_t& p )
     }
     os << "</tbody>\n"
        << "</table>\n"
-       << "</script>\n"
        << "</div>\n"
        << "</div>\n";
   }
@@ -2057,9 +2051,8 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
   os.format( R"(<iframe src="{}" width="1165" height="{}" style="background:#160f0b"></iframe>)",
               raidbots_talent_render_src( p.talents_str, p.true_level, 1165, false, p.dbc->ptr ), h_ );
 
-  os.printf( "<h3 class=\"toggle\" id=\"player%d_talent_tables_toggle\">Talent Tables</h3>\n", p.index );
+  os.printf( "<h3 class=\"toggle\">Talent Tables</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_talent_tables_toggle\">\n", p.index );
 
   if ( range::accumulate( class_traits, 0, &std::vector<talentrank_t>::size ) )
   {
@@ -2089,8 +2082,7 @@ void print_html_talents( report::sc_html_stream& os, const player_t& p )
     os << "</div>\n";
   }
 
-  os << "</script>\n"
-     << "</div>\n"
+  os << "</div>\n"
      << "</div>\n"
      << "</div>\n";
 }
@@ -2476,9 +2468,8 @@ void print_html_player_action_priority_list( report::sc_html_stream& os, const p
 {
   const sim_t& sim = *( p.sim );
   os << "<div class=\"player-section action-priority-list\">\n";
-  os.printf( "<h3 class=\"toggle\" id=\"player%d_apl_toggle\">Action Priority List</h3>\n", p.index );
+  os.printf( "<h3 class=\"toggle\">Action Priority List</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_apl_toggle\">\n", p.index );
 
   action_priority_list_t* alist = nullptr;
 
@@ -2642,7 +2633,6 @@ void print_html_player_action_priority_list( report::sc_html_stream& os, const p
   }
 
   // End Action Priority List section
-  os << "\n</script>\n";
   os << "</div>\n"
      << "</div>\n";
 }
@@ -2655,9 +2645,8 @@ void print_html_player_statistics( report::sc_html_stream& os, const player_t& p
   // Statistics & Data Analysis
 
   os << "<div class=\"player-section analysis\">\n";
-  os.printf( "<h3 class=\"toggle\" id=\"player%d_stats_toggle\">Statistics & Data Analysis</h3>\n", p.index );
+  os.printf( "<h3 class=\"toggle\">Statistics & Data Analysis</h3>\n", p.index );
   os << "<div class=\"toggle-content hide\">\n";
-  os.printf( "<script type=\"text/x-deferred-html\" data-toggle=\"player%d_stats_toggle\">\n", p.index );
   os << "<table class=\"sc stripebody\">\n";
 
   report_helper::print_html_sample_data( os, p, p.collected_data.fight_length, "Fight Length" );
@@ -2677,7 +2666,6 @@ void print_html_player_statistics( report::sc_html_stream& os, const player_t& p
   }
 
   os << "</table>\n";
-  os << "\n</script>\n";
   os << "</div>\n"
         "</div>\n";
 }
@@ -3771,6 +3759,8 @@ void print_html_player_description( report::sc_html_stream& os, const player_t&
   }
   os << "\">\n";
 
+  os.printf( R"(<script type="text/x-deferred-html" data-toggle="player%dtoggle">)", p.index );
+
   os << "<ul class=\"params\">\n";
 #if SC_BETA
   os << "<li><b>BETA activated</b></li>\n";
@@ -4992,6 +4982,7 @@ void print_html_player_( report::sc_html_stream& os, const player_t& p )
 
   // print_html_player_gear_weights( os, p, p.report_information );
 
+  os << "</script>\n";
   os << "</div>\n"
      << "</div>\n\n";
 }

From e993ada7e12624fcca49ccb541d6e6944c8d7a7e Mon Sep 17 00:00:00 2001
From: bees <78449839+hotbees@users.noreply.github.com>
Date: Sun, 7 Jun 2026 05:10:19 -0400
Subject: [PATCH 12/12] fix charts again; cleanup

---
 engine/report/data/html_report_script.js | 48 +++++-------
 engine/report/data/report_data.inc       | 98 ++++++++++++------------
 engine/report/report_html_sim.cpp        |  8 --
 engine/sim/sim.cpp                       | 10 +--
 engine/sim/sim.hpp                       |  7 +-
 5 files changed, 71 insertions(+), 100 deletions(-)

diff --git a/engine/report/data/html_report_script.js b/engine/report/data/html_report_script.js
index a0f6f68421d..713b9fe7eff 100644
--- a/engine/report/data/html_report_script.js
+++ b/engine/report/data/html_report_script.js
@@ -70,6 +70,7 @@ jQuery(document).ready(function ($) {
     $(document).on('click', '.toggle', function (e) {
         e.preventDefault();
         var $me = $(this);
+        revealSection(this.id);
         $me.toggleClass('open');
         $me.next('.toggle-content').slideToggle(150);
         var section = $me.parent('.section');
@@ -90,6 +91,7 @@ jQuery(document).ready(function ($) {
         e.preventDefault();
         e.stopPropagation();
         var $me = $(this);
+        if ( this.id ) renderCharts(this.id);
         var $row = $me.closest('tr').nextAll('.details').first();
         if ($me.hasClass('open')) {
             $me.removeClass('open');
@@ -99,41 +101,29 @@ jQuery(document).ready(function ($) {
             $row.fadeToggle(150);
         }
     });
-    function renderCharts(id) {
-        var d = __chartData[id];
-        if ( d === undefined ) return;
-        for (var idx in d) {
-            $('#' + d[idx]['target']).highcharts(d[idx]['data']);
-        }
-    }
-    function bindChartLoaders($scope) {
-        $scope.find('.toggle, .toggle-details').each(function() {
-            if ( __chartData[this.id] === undefined ) return;
-            var id = this.id;
-            $(this).one('click', function() { renderCharts(id); });
+    function renderCharts(key) {
+        var items = __chartData[key];
+        if ( items === undefined ) return;
+        items.forEach(function(chart) {
+            var $el = $('#' + chart.target);
+            if ( $el.length && !$el.highcharts() ) {
+                $el.highcharts(chart.data);
+            }
         });
     }
-    bindChartLoaders($(document));
-    $('.toggle').each(function() {
-        if ( !this.id ) return;
-        var id = this.id;
-        var $deferred = $('script[type="text/x-deferred-html"][data-toggle="' + id + '"]');
-        if ( !$deferred.length ) return;
-        var inject = function() {
+    function revealSection(id) {
+        var $deferred = id ? $('script[type="text/x-deferred-html"][data-toggle="' + id + '"]') : $();
+        if ( $deferred.length ) {
             $deferred.each(function() {
-                var $injected = $($.parseHTML(this.textContent));
-                $(this).replaceWith($injected);
-                bindChartLoaders($injected);
+                $(this).replaceWith($($.parseHTML(this.textContent)));
             });
             $('.stripetoprow').oddstripe();
-            renderCharts(id);
-        };
-        if ( $(this).hasClass('open') ) {
-            inject();
-        } else {
-            $(this).one('click', inject);
+            renderCharts('');
         }
-    });
+        if ( id ) renderCharts(id);
+    }
+    $('.toggle.open').each(function() { revealSection(this.id); });
+    renderCharts('');
     $(document).on('click', 'table.stripetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) {
         e.preventDefault();
         $(this).children('.toggle-details').first().click();
diff --git a/engine/report/data/report_data.inc b/engine/report/data/report_data.inc
index f8ef8c5366f..c070c957ed7 100644
--- a/engine/report/data/report_data.inc
+++ b/engine/report/data/report_data.inc
@@ -1135,56 +1135,54 @@ static const char* __html_report_script[] = {
 "$('a.ext').mouseover(function () { $(this).attr('target', '_blank'); }); $('ul.toc li a').click(function (e) { e.pre",
 "ventDefault(); var href = this.getAttribute('href'); var $anchor = $(href).children('h2').first(); if (!$anchor.hasC",
 "lass('open')) { $anchor.click(); } $('html, body').animate( { scrollTop: $anchor.parent().offset().top - $anchor.hei",
-"ght() }, 300); }); $(document).on('click', '.toggle', function (e) { e.preventDefault(); var $me = $(this); $me.togg",
-"leClass('open'); $me.next('.toggle-content').slideToggle(150); var section = $me.parent('.section'); if (section.len",
-"gth) { section.validate_section(); if ($me.hasClass('open')) { var wh = $(window).height() / 3; var pos = section[0]",
-".getBoundingClientRect().top; if (pos > wh * 2) { $('html, body').animate( { scrollTop: section.offset().top - wh },",
-" 300); } } } }); $(document).on('click', '.toggle-details', function (e) { e.preventDefault(); e.stopPropagation(); ",
-"var $me = $(this); var $row = $me.closest('tr').nextAll('.details').first(); if ($me.hasClass('open')) { $me.removeC",
-"lass('open'); $row.fadeToggle(75); } else { $me.addClass('open'); $row.fadeToggle(150); } }); function renderCharts(",
-"id) { var d = __chartData[id]; if ( d === undefined ) return; for (var idx in d) { $('#' + d[idx]['target']).highcha",
-"rts(d[idx]['data']); } } function bindChartLoaders($scope) { $scope.find('.toggle, .toggle-details').each(function()",
-" { if ( __chartData[this.id] === undefined ) return; var id = this.id; $(this).one('click', function() { renderChart",
-"s(id); }); }); } bindChartLoaders($(document)); $('.toggle').each(function() { if ( !this.id ) return; var id = this",
-".id; var $deferred = $('script[type=\"text/x-deferred-html\"][data-toggle=\"' + id + '\"]'); if ( !$deferred.length ",
-") return; var inject = function() { $deferred.each(function() { var $injected = $($.parseHTML(this.textContent)); $(",
-"this).replaceWith($injected); bindChartLoaders($injected); }); $('.stripetoprow').oddstripe(); renderCharts(id); }; ",
-"if ( $(this).hasClass('open') ) { inject(); } else { $(this).one('click', inject); } }); $(document).on('click', 'ta",
-"ble.stripetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.preventDefault",
-"(); $(this).children('.toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { clearTimeout(h",
-"overTimeout); $('#active-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help').hover(functi",
-"on (e) { var $target = $(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content = '<h3>NO HE",
-"LP FOUND</h3><p>PLEASE REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynamic .help-box'",
-").html(content); $('#active-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css({ top: pos.to",
-"p - $('#active-help').height() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(function() { $('#ac",
-"tive-help').fadeIn(300); }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, both) { var $r",
-"ow; var ret; var idx = i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').first(); } ret ",
-"= $row.children('td').eq(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[rowspan]').leng",
-"th; $row = $row.nextAll('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row.children('td",
-"').eq(idx).text().trim(); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0') + 1).replace",
-"(/[^\\d.-]/g,''); } function numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0; var vb = +s",
-"trip(getCell(b, i, both)) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, both) { var va =",
-" getCell(a, i, both); var vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { return va > vb \? ",
-"1 : -1; } } function pulsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetoprow')) { table",
-".find('.toprow:not(.childrow)').each(function() { var me = $(this); var cell = me.children('td').eq(index); if (both",
-" && (!cell.length || cell.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.nextAll('.chil",
-"drow').first(); if (row.length && index >= span) { cell = row.children('td').eq(index - span); } } if (cell.length &",
-"& !cell.is(':empty')) { $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells = table.find(",
-"'tbody tr:first-of-type td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find('tbody tr td",
-":nth-of-type(' + (index + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $cells.removeC",
-"lass('pulse'); }, 150); } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefault(); var $me",
-" = $(this); var $col = $me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('table.sort'); v",
-"ar $sib = $col.siblings('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx = $col.index",
-"(); var doAlpha = this.dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRows = this.dat",
-"aset.sortrows == 'both'; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleClass('dsc-sor",
-"ted', !doAsc); } else { $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.toggleClass('as",
-"c-sorted', !isDsc); var srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { return alphaSort(",
-"a, b, i, dsc, both); }; }; } else { srt = function(i, dsc, both) { return function(a, b) { return numberSort(a, b, i",
-", dsc, both); }; }; } var $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bucket.children",
-"('tr').first().nextUntil('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; do { $bucket.s",
-"ort(srt(idx, isDsc, doRows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain); $petrow = ",
-"$remain.first(); $bucket = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($bucket.length",
-" > 1); if ($tbl.hasClass('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
+"ght() }, 300); }); $(document).on('click', '.toggle', function (e) { e.preventDefault(); var $me = $(this); revealSe",
+"ction(this.id); $me.toggleClass('open'); $me.next('.toggle-content').slideToggle(150); var section = $me.parent('.se",
+"ction'); if (section.length) { section.validate_section(); if ($me.hasClass('open')) { var wh = $(window).height() /",
+" 3; var pos = section[0].getBoundingClientRect().top; if (pos > wh * 2) { $('html, body').animate( { scrollTop: sect",
+"ion.offset().top - wh }, 300); } } } }); $(document).on('click', '.toggle-details', function (e) { e.preventDefault(",
+"); e.stopPropagation(); var $me = $(this); if ( this.id ) renderCharts(this.id); var $row = $me.closest('tr').nextAl",
+"l('.details').first(); if ($me.hasClass('open')) { $me.removeClass('open'); $row.fadeToggle(75); } else { $me.addCla",
+"ss('open'); $row.fadeToggle(150); } }); function renderCharts(key) { var items = __chartData[key]; if ( items === un",
+"defined ) return; items.forEach(function(chart) { var $el = $('#' + chart.target); if ( $el.length && !$el.highchart",
+"s() ) { $el.highcharts(chart.data); } }); } function revealSection(id) { var $deferred = id \? $('script[type=\"text",
+"/x-deferred-html\"][data-toggle=\"' + id + '\"]') : $(); if ( $deferred.length ) { $deferred.each(function() { $(thi",
+"s).replaceWith($($.parseHTML(this.textContent))); }); $('.stripetoprow').oddstripe(); renderCharts(''); } if ( id ) ",
+"renderCharts(id); } $('.toggle.open').each(function() { revealSection(this.id); }); renderCharts(''); $(document).on",
+"('click', 'table.stripetoprow .toprow td:first-of-type, table.stripebody tbody td:first-of-type', function (e) { e.p",
+"reventDefault(); $(this).children('.toggle-details').first().click(); }); var hoverTimeout; function hoverHide() { c",
+"learTimeout(hoverTimeout); $('#active-help','.help-box').hide(); $('#active-help').removeAttr('style'); } $('.help')",
+".hover(function (e) { var $target = $(this.dataset.help + ' .help-box'); var content; if (!$target.length) { content",
+" = '<h3>NO HELP FOUND</h3><p>PLEASE REPORT AS A BUG</p>'; } else { content = $target.html(); } $('#active-help-dynam",
+"ic .help-box').html(content); $('#active-help .help-box').show(); var pos = $(this).offset(); $('#active-help').css(",
+"{ top: pos.top - $('#active-help').height() - $(this).height(), left: pos.left, }); hoverTimeout = setTimeout(functi",
+"on() { $('#active-help').fadeIn(300); }, 750); }, hoverHide); window.onblur = hoverHide; function getCell(elem, i, b",
+"oth) { var $row; var ret; var idx = i; if ($(elem).is('tr')) { $row = $(elem); } else { $row = $(elem).find('tr').fi",
+"rst(); } ret = $row.children('td').eq(idx).text().trim(); if (!ret.length && both) { var span = $row.children('td[ro",
+"wspan]').length; $row = $row.nextAll('.childrow').first(); if ($row.length && idx >= span) { idx -= span; ret = $row",
+".children('td').eq(idx).text().trim(); } } return ret; } function strip(val) { return val.slice(val.indexOf('\\xa0')",
+" + 1).replace(/[^\\d.-]/g,''); } function numberSort(a, b, i, dsc, both) { var va = +strip(getCell(a, i, both)) || 0",
+"; var vb = +strip(getCell(b, i, both)) || 0; return dsc \? vb - va : va - vb; } function alphaSort(a, b, i, dsc, bot",
+"h) { var va = getCell(a, i, both); var vb = getCell(b, i, both); if (dsc) { return va < vb \? 1 : -1; } else { retur",
+"n va > vb \? 1 : -1; } } function pulsecolumn(table, index, both) { var $cells = $(); if (table.hasClass('stripetopr",
+"ow')) { table.find('.toprow:not(.childrow)').each(function() { var me = $(this); var cell = me.children('td').eq(ind",
+"ex); if (both && (!cell.length || cell.is(':empty'))) { var span = me.children('td[rowspan]').length; var row = me.n",
+"extAll('.childrow').first(); if (row.length && index >= span) { cell = row.children('td').eq(index - span); } } if (",
+"cell.length && !cell.is(':empty')) { $.merge($cells, cell); } }); } else if (table.hasClass('stripebody')) { $cells ",
+"= table.find('tbody tr:first-of-type td:nth-of-type(' + (index + 1) + '):not(:empty)'); } else { $cells = table.find",
+"('tbody tr td:nth-of-type(' + (index + 1) + '):not(:empty)'); } $cells.addClass('pulse'); setTimeout(function () { $",
+"cells.removeClass('pulse'); }, 150); } $(document).on('click', '.sort th.toggle-sort', function (e) { e.preventDefau",
+"lt(); var $me = $(this); var $col = $me.closest('th'); var $thd = $col.closest('thead'); var $tbl = $thd.closest('ta",
+"ble.sort'); var $sib = $col.siblings('.asc-sorted, .dsc-sorted'); $sib.removeClass('asc-sorted dsc-sorted'); var idx",
+" = $col.index(); var doAlpha = this.dataset.sorttype == 'alpha'; var doAsc = this.dataset.sortdir == 'asc'; var doRo",
+"ws = this.dataset.sortrows == 'both'; if (!($me.hasClass('dsc-sorted') || $me.hasClass('asc-sorted'))) { $me.toggleC",
+"lass('dsc-sorted', !doAsc); } else { $me.toggleClass('dsc-sorted'); } var isDsc = $me.hasClass('dsc-sorted'); $me.to",
+"ggleClass('asc-sorted', !isDsc); var srt; if (doAlpha) { srt = function(i, dsc, both) { return function(a, b) { retu",
+"rn alphaSort(a, b, i, dsc, both); }; }; } else { srt = function(i, dsc, both) { return function(a, b) { return numbe",
+"rSort(a, b, i, dsc, both); }; }; } var $bucket = $thd.nextUntil('.petrow'); if ($bucket.length == 1) { $bucket = $bu",
+"cket.children('tr').first().nextUntil('.petrow').addBack(); } var $remain = $bucket.last().nextAll(); var $petrow; d",
+"o { $bucket.sort(srt(idx, isDsc, doRows)); $tbl.append($bucket); if (!$remain.length) { break; } $tbl.append($remain",
+"); $petrow = $remain.first(); $bucket = $petrow.nextUntil('.petrow'); $remain = $bucket.last().nextAll(); } while ($",
+"bucket.length > 1); if ($tbl.hasClass('stripetoprow')) { $tbl.oddstripe(); } pulsecolumn($tbl, idx, doRows); });});",
 };
 
 // Automatically generated from file style.css
diff --git a/engine/report/report_html_sim.cpp b/engine/report/report_html_sim.cpp
index ace050125fa..fd0b58d94ab 100644
--- a/engine/report/report_html_sim.cpp
+++ b/engine/report/report_html_sim.cpp
@@ -1294,14 +1294,6 @@ void print_html_( report::sc_html_stream& os, sim_t& sim )
   print_html_report_scripts( os );
   os << "\n</script>\n";
 
-  os << "<script type=\"text/javascript\">\n";
-  os << "jQuery( document ).ready( function( $ ) {\n";
-  for ( const auto& data : sim.on_ready_chart_data )
-  {
-    os << data << std::endl;
-  }
-  os << "});\n";
-  os << "</script>\n";
   os << "<script type=\"text/javascript\">\n";
   os << "__chartData = {\n";
   for ( const auto& entry : sim.chart_data )
diff --git a/engine/sim/sim.cpp b/engine/sim/sim.cpp
index 1ad3e9eb4a2..31b8fbdd0bf 100644
--- a/engine/sim/sim.cpp
+++ b/engine/sim/sim.cpp
@@ -4492,14 +4492,8 @@ void sim_t::abort()
 /// add chart to sim for end of report processing
 void sim_t::add_chart_data( const highchart::chart_t& chart )
 {
-  if ( chart.toggle_id_str_.empty() )
-  {
-    on_ready_chart_data.push_back( chart.to_aggregate_string( false ) );
-  }
-  else
-  {
-    chart_data[ chart.toggle_id_str_ ].push_back( chart.to_data() );
-  }
+  // the report script renders charts with an empty toggle id once their target div is in the DOM.
+  chart_data[ chart.toggle_id_str_ ].push_back( chart.to_data() );
 }
 
 void sim_t::print_spell_query()
diff --git a/engine/sim/sim.hpp b/engine/sim/sim.hpp
index f9c88a483df..ef5e29e25e5 100644
--- a/engine/sim/sim.hpp
+++ b/engine/sim/sim.hpp
@@ -609,12 +609,9 @@ struct sim_t : private sc_thread_t
 
   // Highcharts stuff
 
-  // Vector of on-ready charts. These receive individual jQuery handlers in the HTML report (at the
-  // end of the report) to load the highcharts into the target div.
-  std::vector<std::string> on_ready_chart_data;
-
   // A map of highcharts data, added as a json object into the HTML report. JQuery installs handlers
-  // to correct elements (toggled elements in the HTML report) based on the data.
+  // to correct elements (toggled elements in the HTML report) based on the data. Charts with no toggle
+  // are grouped under the empty-string key and rendered as soon as their target div is in the DOM.
   std::map<std::string, std::vector<std::string> > chart_data;
 
   bool chart_show_relative_difference;