Skip to content

Commit 81ddb68

Browse files
committed
change and moved op text
1 parent 6aabd83 commit 81ddb68

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

locales/en-US/app.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ TrackNameButton--hide-process =
811811

812812
TrackMemoryGraph--relative-memory-at-this-time = relative memory at this time
813813
TrackMemoryGraph--memory-range-in-graph = memory range in graph
814-
TrackMemoryGraph--operations-since-the-previous-sample = operations since the previous sample
814+
TrackMemoryGraph--allocations-and-deallocations-since-the-previous-sample = allocations and deallocations since the previous sample
815815
816816
## TrackPower
817817
## This is used to show the power used by the CPU and other chips in a computer,

src/components/timeline/TrackMemoryGraph.js

+10-11
Original file line numberDiff line numberDiff line change
@@ -384,17 +384,6 @@ class TrackMemoryGraphImpl extends React.PureComponent<Props, State> {
384384
return (
385385
<Tooltip mouseX={mouseX} mouseY={mouseY}>
386386
<div className="timelineTrackMemoryTooltip">
387-
{operations !== null ? (
388-
<div className="timelineTrackMemoryTooltipLine">
389-
<span className="timelineTrackMemoryTooltipNumber">
390-
{formatNumber(operations, 2, 0)}
391-
</span>
392-
<Localized id="TrackMemoryGraph--operations-since-the-previous-sample">
393-
operations since the previous sample
394-
</Localized>
395-
</div>
396-
) : null}
397-
398387
<div className="timelineTrackMemoryTooltipLine">
399388
<span className="timelineTrackMemoryTooltipNumber">
400389
{formatBytes(bytes)}
@@ -412,6 +401,16 @@ class TrackMemoryGraphImpl extends React.PureComponent<Props, State> {
412401
memory range in graph
413402
</Localized>
414403
</div>
404+
{operations !== null ? (
405+
<div className="timelineTrackMemoryTooltipLine">
406+
<span className="timelineTrackMemoryTooltipNumber">
407+
{formatNumber(operations, 2, 0)}
408+
</span>
409+
<Localized id="TrackMemoryGraph--allocations-and-deallocations-since-the-previous-sample">
410+
allocations and deallocations since the previous sample
411+
</Localized>
412+
</div>
413+
) : null}
415414
</div>
416415
</Tooltip>
417416
);

src/test/components/__snapshots__/TrackMemory.test.js.snap

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ exports[`TrackMemory has a tooltip that matches the snapshot 1`] = `
1717
<span
1818
class="timelineTrackMemoryTooltipNumber"
1919
>
20-
36
20+
0.000B
2121
</span>
22-
operations since the previous sample
22+
relative memory at this time
2323
</div>
2424
<div
2525
class="timelineTrackMemoryTooltipLine"
2626
>
2727
<span
2828
class="timelineTrackMemoryTooltipNumber"
2929
>
30-
0.000B
30+
2B
3131
</span>
32-
relative memory at this time
32+
memory range in graph
3333
</div>
3434
<div
3535
class="timelineTrackMemoryTooltipLine"
3636
>
3737
<span
3838
class="timelineTrackMemoryTooltipNumber"
3939
>
40-
2B
40+
36
4141
</span>
42-
memory range in graph
42+
allocations and deallocations since the previous sample
4343
</div>
4444
</div>
4545
`;

0 commit comments

Comments
 (0)