Skip to content

Commit 8588c8b

Browse files
committed
Merge branch 'main' into user/bhuvanap/removemv2
2 parents f63f101 + 1c76e8d commit 8588c8b

File tree

18 files changed

+507
-374
lines changed

18 files changed

+507
-374
lines changed

microsoft-edge/dev-videos/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ August 17, 2023
7979
The JSON viewer automatically formats and highlights JSON responses and files in browser tabs. When your web server responds to HTTP requests with data encoded as JSON, this data isn't always easy to read and is sometimes returned as one line of text. The JSON viewer changes the returned data to make it easier to read. The JSON syntax is highlighted with different colors, object properties are displayed on their own lines and indented, and objects can be collapsed or expanded.
8080

8181
See also:
82-
* [View formatted JSON](../devtools-guide-chromium/json-viewer/json-viewer.md)<!-- has Video section -->
82+
* [View formatted JSON responses or files](../devtools-guide-chromium/json-viewer/json-viewer.md)<!-- has Video section -->
8383

8484

8585
<!-- ====================================================================== -->
@@ -121,7 +121,7 @@ Covers:
121121
See also:
122122
* [What's New in DevTools (Microsoft Edge 112)](../devtools-guide-chromium/whats-new/2023/04/devtools-112.md)<!-- has Video section -->
123123
* [Analyze CSS selector performance during Recalculate Style events](../devtools-guide-chromium/evaluate-performance/selector-stats.md) - CSS selector stats.
124-
* [View formatted JSON](../devtools-guide-chromium/json-viewer/json-viewer.md)
124+
* [View formatted JSON responses or files](../devtools-guide-chromium/json-viewer/json-viewer.md)
125125
* [Apply a color theme to DevTools](../devtools-guide-chromium/customize/theme.md)
126126

127127

microsoft-edge/developer/index.yml

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,22 +174,45 @@ landingContent:
174174
- text: WebView2 API Reference
175175
url: ../webview2/webview2-api-reference.md
176176
# =============================================================================
177-
# Card r2c3
178-
- title: Development tips for Microsoft Edge
177+
# Card r2c3 # 10 items max
178+
- title: Development tips for Microsoft Edge # = /web-platform/
179179
linkLists:
180-
- linkListType: how-to-guide
180+
# - linkListType: overview
181+
# links:
182+
# - text: Development tips for Microsoft Edge
183+
# url: ../web-platform/web-platform.md
184+
- linkListType: whats-new
181185
links:
182-
- text: Development tips for Microsoft Edge
183-
url: ../web-platform/web-platform.md
184-
185186
- text: Site compatibility-impacting changes
186187
url: ../web-platform/site-impacting-changes.md
188+
- linkListType: how-to-guide
189+
links:
190+
- text: Move users to Microsoft Edge from Internet Explorer
191+
url: ../web-platform/ie-to-microsoft-edge-redirection.md
192+
193+
- text: Tracking prevention in Microsoft Edge
194+
url: ../web-platform/tracking-prevention.md
187195

188196
- text: Detect Microsoft Edge from your website
189197
url: ../web-platform/user-agent-guidance.md
190198

199+
- text: Develop experiences for the sidebar in Microsoft Edge
200+
url: ../web-platform/sidebar.md
201+
191202
- text: Detect Windows 11 using User-Agent Client Hints
192203
url: ../web-platform/how-to-detect-win11.md
204+
205+
- text: Customize the password reveal button
206+
url: ../web-platform/password-reveal.md
207+
208+
- text: Display regional versions of your site, based on OS settings
209+
url: ../web-platform/os-regional-settings.md
210+
211+
- text: View formatted JSON responses or files
212+
url: ../devtools-guide-chromium/json-viewer/json-viewer.md
213+
214+
- text: Sign up for the Ad Selection API
215+
url: ../web-platform/ad-selection-api.md
193216
# =============================================================================
194217
# Row 3 with 3 cards
195218
# =============================================================================

microsoft-edge/devtools-guide-chromium/json-viewer/json-viewer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: View formatted JSON
2+
title: View formatted JSON responses or files
33
description: How to use the JSON viewer to view formatted and highlighted JSON responses in a browser tab.
44
author: MSEdgeTeam
55
ms.author: msedgedevrel
@@ -8,7 +8,7 @@ ms.service: microsoft-edge
88
ms.subservice: devtools
99
ms.date: 04/08/2024
1010
---
11-
# View formatted JSON
11+
# View formatted JSON responses or files
1212

1313
Use the **JSON viewer** to automatically format and syntax highlight JSON responses and files in browser tabs.
1414

microsoft-edge/devtools-guide-chromium/network-console/network-console-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,5 @@ See also:
111111
<!-- ====================================================================== -->
112112
## See also
113113

114-
* [View formatted JSON](../json-viewer/json-viewer.md)
114+
* [View formatted JSON responses or files](../json-viewer/json-viewer.md)
115115
<!-- * [edge-devtools-network-console repo](https://github.com/microsoft/edge-devtools-network-console) -->

microsoft-edge/devtools-guide-chromium/network/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Select a resource to learn more information about it.
205205

206206
Tip: When a file is minified, select the **Format** (![Format](./index-images/format-icon.png)) button at the bottom of the **Response** panel to re-format the contents of the file for readability.
207207

208-
For example, if the response contains minified JSON data, click the **Format** button to re-format the JSON syntax so that each object property is on its own line. You can also use the **JSON viewer** to view formatted and highlighted JSON responses in a browser tab. See [View formatted JSON](../json-viewer/json-viewer.md).
208+
For example, if the response contains minified JSON data, click the **Format** button to re-format the JSON syntax so that each object property is on its own line. You can also use the **JSON viewer** to view formatted and highlighted JSON responses in a browser tab. See [View formatted JSON responses or files](../json-viewer/json-viewer.md).
209209

210210
1. Select the **Timing** panel. A breakdown of the network activity for the resource is displayed:
211211

microsoft-edge/devtools-guide-chromium/resources/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ For example, to go from the **Page** tab's resource list in the **Sources** tool
118118

119119
1. In DevTools, on the **Activity Bar**, select the **Network** tab. If that tab isn't visible, click the **More Tools** (![More Tools icon](./index-images/more-tools-icon-light-theme.png)) button.
120120

121-
1. Press **Ctrl+R** to refresh the page. The received resource files that make up the webpage are now added as rows in the **Network** tab. The **network-tutorial/** folder row represents the HTML page - in this case, [index.html](https://github.com/MicrosoftEdge/Demos/tree/main/network-tutoriql).
121+
1. Press **Ctrl+R** to refresh the page. The received resource files that make up the webpage are now added as rows in the **Network** tab. The **network-tutorial/** folder row represents the HTML page - in this case, [index.html](https://github.com/MicrosoftEdge/Demos/blob/main/network-tutorial/index.html).
122122

123123
1. In DevTools, on the **Activity Bar**, click the **Sources** tab.
124124

microsoft-edge/devtools-guide-chromium/sample-code/sample-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ last sync'd April 16, 2024
5656
| postMessage Trace Events | Tests `postMessage` trace events in the **Performance** tool. Used for [View messages between windows, iframes, and dedicated workers](../evaluate-performance/reference.md#view-messages-between-windows-iframes-and-dedicated-workers) in _Performance features reference_. | [/devtools-postmessage-perf-timeline/](https://github.com/MicrosoftEdge/Demos/tree/main/devtools-postmessage-perf-timeline) | [postMessage Trace Events demo](https://microsoftedge.github.io/Demos/devtools-postmessage-perf-timeline/) |
5757
| CSS :target pseudo-class | Used for [Support forcing the :target CSS state](../whats-new/2021/01/devtools.md#support-forcing-the-target-css-state). | [/devtools-target-pseudo/](https://github.com/MicrosoftEdge/Demos/tree/main/devtools-target-pseudo) | [CSS :target pseudo-class demo](https://microsoftedge.github.io/Demos/devtools-target-pseudo/) |
5858
| Heap Snapshot Visualizer | Source code for the [Heap Snapshot Visualizer](https://microsoftedge.microsoft.com/addons/detail/heap-snapshot-visualizer/fceldlhognbemkgfacnffkdanocidgce) extension for DevTools. | [/heap-snapshot-visualizer/](https://github.com/MicrosoftEdge/Demos/tree/main/heap-snapshot-visualizer) | n/a |
59-
| JSON dummy data | Simple JSON files. Used for [View formatted JSON](../json-viewer/json-viewer.md). | [/json-dummy-data/](https://github.com/MicrosoftEdge/Demos/tree/main/json-dummy-data) | [JSON dummy data](https://microsoftedge.github.io/Demos/json-dummy-data/) |
59+
| JSON dummy data | Simple JSON files. Used for [View formatted JSON responses or files](../json-viewer/json-viewer.md). | [/json-dummy-data/](https://github.com/MicrosoftEdge/Demos/tree/main/json-dummy-data) | [JSON dummy data](https://microsoftedge.github.io/Demos/json-dummy-data/) |
6060
| Inspect Network Activity | Used for [Inspect network activity](../network/index.md). | [/network-tutorial/](https://github.com/MicrosoftEdge/Demos/tree/main/network-tutorial) | [Inspect Network Activity Demo](https://microsoftedge.github.io/Demos/network-tutorial/) |
6161
| Photo gallery | Used for [The truth about CSS selector performance](https://blogs.windows.com/msedgedev/2023/01/17/the-truth-about-css-selector-performance/). | [/photo-gallery/](https://github.com/MicrosoftEdge/Demos/tree/main/photo-gallery) | [Photo Gallery](https://microsoftedge.github.io/Demos/photo-gallery/) |
6262
| Slow Calendar | Simple calendar demo app to test various DevTools features such as the **Performance** tool and source map support. | [/slow-calendar/](https://github.com/MicrosoftEdge/Demos/tree/main/slow-calendar) | [Slow Calendar](https://microsoftedge.github.io/Demos/slow-calendar/public) |

microsoft-edge/devtools-guide-chromium/whats-new/2023/04/devtools-112.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ With code folding turned on, you can now expand and collapse objects and arrays
102102
Please send us your [feedback](../../../contact.md)!
103103

104104
See also:
105-
* [View formatted JSON](../../../json-viewer/json-viewer.md)
105+
* [View formatted JSON responses or files](../../../json-viewer/json-viewer.md)
106106

107107

108108
<!-- ====================================================================== -->

microsoft-edge/index.yml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,21 +331,49 @@ conceptualContent:
331331
# Card
332332
- title: Development tips for Microsoft Edge
333333
links:
334-
- text: Development tips for Microsoft Edge
335-
url: ./web-platform/web-platform.md
336-
itemType: overview
334+
# - text: Development tips for Microsoft Edge
335+
# url: ./web-platform/web-platform.md
336+
# itemType: overview
337337

338338
- text: Site compatibility-impacting changes
339339
url: ./web-platform/site-impacting-changes.md
340+
itemType: whats-new
341+
342+
- text: Move users to Microsoft Edge from Internet Explorer
343+
url: ./web-platform/ie-to-microsoft-edge-redirection.md
344+
itemType: how-to-guide
345+
346+
- text: Tracking prevention in Microsoft Edge
347+
url: ./web-platform/tracking-prevention.md
340348
itemType: how-to-guide
341349

342350
- text: Detect Microsoft Edge from your website
343351
url: ./web-platform/user-agent-guidance.md
344352
itemType: how-to-guide
345353

354+
- text: Develop experiences for the sidebar in Microsoft Edge
355+
url: ./web-platform/sidebar.md
356+
itemType: how-to-guide
357+
346358
- text: Detect Windows 11 using User-Agent Client Hints
347359
url: ./web-platform/how-to-detect-win11.md
348360
itemType: how-to-guide
361+
362+
- text: Customize the password reveal button
363+
url: ./web-platform/password-reveal.md
364+
itemType: how-to-guide
365+
366+
- text: Display regional versions of your site, based on OS settings
367+
url: ./web-platform/os-regional-settings.md
368+
itemType: how-to-guide
369+
370+
- text: View formatted JSON responses or files
371+
url: ./devtools-guide-chromium/json-viewer/json-viewer.md
372+
itemType: how-to-guide
373+
374+
- text: Sign up for the Ad Selection API
375+
url: ./web-platform/ad-selection-api.md
376+
itemType: how-to-guide
349377
# Card
350378
- title: Accessibility in Microsoft Edge
351379
links:

microsoft-edge/toc.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@
13721372
href: webview2/concepts/basic-authentication.md
13731373
displayName: auth, Basic authentication for WebView2 apps # top-of-page title
13741374

1375-
- name: Windowed vs. visual hosting of WebView2
1375+
- name: Windowed vs. Visual hosting of WebView2
13761376
href: webview2/concepts/windowed-vs-visual-hosting.md
13771377

13781378
- name: Custom management of network requests
@@ -1704,7 +1704,7 @@
17041704
- name: Detect Microsoft Edge from your website
17051705
href: web-platform/user-agent-guidance.md
17061706

1707-
- name: Develop for the sidebar
1707+
- name: Develop experiences for the sidebar in Microsoft Edge
17081708
href: web-platform/sidebar.md
17091709
displayName: sidebar apps, sidebar extensions, pwa, side panel, sidepanel
17101710

@@ -1714,14 +1714,17 @@
17141714
- name: Customize the password reveal button
17151715
href: web-platform/password-reveal.md
17161716

1717-
- name: Operating System Regional Data Display
1717+
- name: Display regional versions of your site, based on OS settings
17181718
href: web-platform/os-regional-settings.md
17191719
displayName: globalization, language, region, limited, intl, date, time, format
17201720

1721-
- name: View formatted JSON
1721+
- name: View formatted JSON responses or files
17221722
href: devtools-guide-chromium/json-viewer/json-viewer.md
17231723
displayName: JSON viewer, view JSON
17241724

1725+
- name: Sign up for the Ad Selection API
1726+
href: ./web-platform/ad-selection-api.md
1727+
17251728
# =============================================================================
17261729
# if top-of-page title is longer, add it to displayName comma-delimited list of lookup keywords
17271730
- name: Microsoft Edge IDE integration

0 commit comments

Comments
 (0)