Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions locales/en-US/app.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,8 @@ ServiceWorkerManager--hide-notice-button =

StackSettings--implementation-all-frames = All frames
.title = Do not filter the stack frames
StackSettings--implementation-javascript2 = JavaScript
.title = Show only the stack frames related to JavaScript execution
StackSettings--implementation-script = Script
.title = Show only the stack frames related to script execution
StackSettings--implementation-native2 = Native
.title = Show only the stack frames for native code

Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/StackImplementationSetting.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class StackImplementationSettingImpl extends PureComponent<Props> {
'combined'
)}
{this._renderImplementationRadioButton(
'StackSettings--implementation-javascript2',
'StackSettings--implementation-script',
'js'
)}
{this._renderImplementationRadioButton(
Expand Down
4 changes: 2 additions & 2 deletions src/test/components/StackSettings.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ describe('StackSettings', function () {
return (element: any).checked;
}

it('can change the implementation filter to JavaScript', async function () {
it('can change the implementation filter to script', async function () {
const { getByLabelText, getState } = setup();
expect(getImplementationFilter(getState())).toEqual('combined');
const radioButton = getByLabelText(/JavaScript/);
const radioButton = getByLabelText(/Script/);

fireFullClick(radioButton);

Expand Down
6 changes: 3 additions & 3 deletions src/test/components/__snapshots__/FlameGraph.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -433,16 +433,16 @@ exports[`FlameGraph matches the snapshot 1`] = `
<input
class="photon-radio photon-radio-micro"
id="implementation-radio-js"
title="Show only the stack frames related to JavaScript execution"
title="Show only the stack frames related to script execution"
type="radio"
value="js"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the value from "js" to "script" would make sense here, but I didn't do it because I think it would break existing shared urls.

/>
<label
class="photon-label photon-label-micro photon-label-horiz-padding"
for="implementation-radio-js"
title="Show only the stack frames related to JavaScript execution"
title="Show only the stack frames related to script execution"
>
JavaScript
Script
</label>
<input
class="photon-radio photon-radio-micro"
Expand Down
6 changes: 3 additions & 3 deletions src/test/components/__snapshots__/MarkerChart.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -447,16 +447,16 @@ exports[`MarkerChart renders the normal marker chart and matches the snapshot 1`
<input
class="photon-radio photon-radio-micro"
id="implementation-radio-js"
title="Show only the stack frames related to JavaScript execution"
title="Show only the stack frames related to script execution"
type="radio"
value="js"
/>
<label
class="photon-label photon-label-micro photon-label-horiz-padding"
for="implementation-radio-js"
title="Show only the stack frames related to JavaScript execution"
title="Show only the stack frames related to script execution"
>
JavaScript
Script
</label>
<input
class="photon-radio photon-radio-micro"
Expand Down
8 changes: 4 additions & 4 deletions src/test/components/__snapshots__/MarkerTable.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`MarkerTable EmptyReasons shows reasons when a profile has no non-network markers 1`] = `
<div
Expand Down Expand Up @@ -73,16 +73,16 @@ exports[`MarkerTable renders some basic markers and updates when needed 1`] = `
<input
class="photon-radio photon-radio-micro"
id="implementation-radio-js"
title="Show only the stack frames related to JavaScript execution"
title="Show only the stack frames related to script execution"
type="radio"
value="js"
/>
<label
class="photon-label photon-label-micro photon-label-horiz-padding"
for="implementation-radio-js"
title="Show only the stack frames related to JavaScript execution"
title="Show only the stack frames related to script execution"
>
JavaScript
Script
</label>
<input
class="photon-radio photon-radio-micro"
Expand Down
Loading