Skip to content

Commit

Permalink
Migrate to namespaced data attributes
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Marr <[email protected]>
  • Loading branch information
smarr committed Oct 1, 2024
1 parent 5655ab6 commit 9af048e
Show file tree
Hide file tree
Showing 14 changed files with 879 additions and 879 deletions.
6 changes: 3 additions & 3 deletions src/backend/compare/html/refresh-menu.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="refresh">
<div class="flex-nowrap navbar-light">
<button type="button" class="btn btn-outline-secondary btn-sm"
data-toggle="collapse" data-target="#filters" aria-controls="#filters"
data-bs-toggle="collapse" data-bs-target="#filters" aria-controls="#filters"
aria-expanded="false" aria-label="Toggle Filters">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
<path d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
Expand All @@ -13,8 +13,8 @@
<path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5.002 5.002 0 0 0 8 3zM3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9H3.1z"/>
</svg>
</button>
<button class="navbar-toggler" type="button" data-toggle="collapse"
data-target="nav.compare" aria-controls="nav.compare"
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="nav.compare" aria-controls="nav.compare"
aria-expanded="false" aria-label="Toggle Outline"
id="report-nav-toggler">
<span class="navbar-toggler-icon"></span>
Expand Down
12 changes: 6 additions & 6 deletions src/backend/compare/html/stats-row-buttons-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
const b = it.benchId;
const f = it.dataFormatters;
%}<button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>{%= d.cmdline %}</code>"></button>
data-bs-content="<code>{%= d.cmdline %}</code>"></button>
{%
if (it.environments) {
%}<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="{%= f.formatEnvironment(d.envId, it.environments) %}"></button>
data-bs-content="{%= f.formatEnvironment(d.envId, it.environments) %}"></button>
{% }

if (d.hasWarmup) {
%}<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="{%= d.runId %}"></button>
%}<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="{%= d.runId %}"></button>
{%
}
}

if (d.profiles) {
%}<button type="button" class="btn btn-sm btn-profile" data-content="{%= d.runId %}"></button>
%}<button type="button" class="btn btn-sm btn-profile" data-bs-content="{%= d.runId %}"></button>
{%
}
%}<button type="button" class="btn btn-sm btn-timeline" data-content='{%- JSON.stringify(
%}<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{%- JSON.stringify(
f.benchmarkId(b.b, b.e, b.s, b.v, d.numV, b.c, d.numC, b.i, d.numI, b.ea, d.numEa)) %}'></button>
6 changes: 3 additions & 3 deletions src/backend/timeline/timeline.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ <h2 class="display-5">{%= it.project.description %}</h2>
<div class="refresh">
<div class="flex-nowrap navbar-light">
<button type="button" class="btn btn-outline-secondary btn-sm"
data-toggle="collapse" data-target="#filters" aria-controls="#filters"
data-bs-toggle="collapse" data-bs-target="#filters" aria-controls="#filters"
aria-expanded="false" aria-label="Toggle Filters">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
<path d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
</svg>
</button>
<button class="navbar-toggler" type="button" data-toggle="collapse"
data-target="nav.compare" aria-controls="nav.compare"
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="nav.compare" aria-controls="nav.compare"
aria-expanded="false" aria-label="Toggle Outline"
id="report-nav-toggler">
<span class="navbar-toggler-icon"></span>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/compare.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function createEntry(e: string | ProfileElement, profId, counter) {

if (hasTrace) {
// eslint-disable-next-line max-len
entryHtml += `<a href="#${profId}-item-${counter.cnt}" data-toggle="collapse">`;
entryHtml += `<a href="#${profId}-item-${counter.cnt}" data-bs-toggle="collapse">`;
} else {
entryHtml += `<span>`;
}
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function addChangesToList(

const option = `<a class="list-group-item list-group-item-action
list-min-padding"
data-toggle="list" data-hash="${change.commitid}" href="">
data-bs-toggle="list" data-hash="${change.commitid}" href="">
<div class="exp-date" title="Experiment Start Date">${date}</div>
${change.commitid.substring(0, 6)} ${change.branchortag}<br>
<div class="change-msg">${msg}</div>
Expand Down Expand Up @@ -266,7 +266,7 @@ function renderBranchList(
for (const b of branches) {
const $link = $(`<a
class="list-group-item list-group-item-action list-min-padding"
data-toggle="list" data-branch="${b}" href>${b}</a>`);
data-bs-toggle="list" data-branch="${b}" href>${b}</a>`);
$branchList.append($link);
}

Expand Down
10 changes: 5 additions & 5 deletions tests/data/expected-results/compare-view/compare-versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ <h3 id="suite1-exe1">suite1</h3>
<td><span class="stats-median" title="median">222b</span></td>
<td><span class="stats-change" title="diff %">64600</span></td>
<td><button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>som/some-command with args</code>"></button>
data-bs-content="<code>som/some-command with args</code>"></button>
<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
data-bs-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
</tr>
</tbody>
</table>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>som/some-command with args</code>"></button>
data-bs-content="<code>som/some-command with args</code>"></button>
<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button>
data-bs-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button>
10 changes: 5 additions & 5 deletions tests/data/expected-results/compare-view/stats-row-exe.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
<br><span class="stats-change" title="diff %">604600</span>
</td>
<td><button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>som/some-command with args</code>"></button>
data-bs-content="<code>som/some-command with args</code>"></button>
<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
data-bs-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
</tr>
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<td><span class="stats-median" title="median">0.33</span></td>
<td><span class="stats-change stats-total" title="diff %">54600</span></td>
<td><button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>som/some-command with args</code>"></button>
data-bs-content="<code>som/some-command with args</code>"></button>
<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
data-bs-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
</tr>
10 changes: 5 additions & 5 deletions tests/data/expected-results/compare-view/stats-row-version.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<td><span class="stats-median" title="median">222b</span></td>
<td><span class="stats-change" title="diff %">64600</span></td>
<td><button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>som/some-command with args</code>"></button>
data-bs-content="<code>som/some-command with args</code>"></button>
<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
data-bs-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
</tr>
10 changes: 5 additions & 5 deletions tests/data/expected-results/compare-view/stats-tbl.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<td><span class="stats-median" title="median">222b</span></td>
<td><span class="stats-change" title="diff %">64600</span></td>
<td><button type="button" class="btn btn-sm btn-cmdline btn-popover"
data-content="<code>som/some-command with args</code>"></button>
data-bs-content="<code>som/some-command with args</code>"></button>
<button type="button" class="btn btn-sm btn-environment btn-popover"
data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
data-bs-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
<button type="button" class="btn btn-sm btn-light btn-warmup" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-profile" data-bs-content="1"></button>
<button type="button" class="btn btn-sm btn-timeline" data-bs-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
</tr>
</tbody>
</table>
Loading

0 comments on commit 9af048e

Please sign in to comment.