Skip to content

Commit

Permalink
Merge branch 'main' into user/bhuvanap/removemv2
Browse files Browse the repository at this point in the history
  • Loading branch information
mikehoffms committed Oct 16, 2024
2 parents f63f101 + 1c76e8d commit 8588c8b
Show file tree
Hide file tree
Showing 18 changed files with 507 additions and 374 deletions.
4 changes: 2 additions & 2 deletions microsoft-edge/dev-videos/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ August 17, 2023
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.

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


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


Expand Down
35 changes: 29 additions & 6 deletions microsoft-edge/developer/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,45 @@ landingContent:
- text: WebView2 API Reference
url: ../webview2/webview2-api-reference.md
# =============================================================================
# Card r2c3
- title: Development tips for Microsoft Edge
# Card r2c3 # 10 items max
- title: Development tips for Microsoft Edge # = /web-platform/
linkLists:
- linkListType: how-to-guide
# - linkListType: overview
# links:
# - text: Development tips for Microsoft Edge
# url: ../web-platform/web-platform.md
- linkListType: whats-new
links:
- text: Development tips for Microsoft Edge
url: ../web-platform/web-platform.md

- text: Site compatibility-impacting changes
url: ../web-platform/site-impacting-changes.md
- linkListType: how-to-guide
links:
- text: Move users to Microsoft Edge from Internet Explorer
url: ../web-platform/ie-to-microsoft-edge-redirection.md

- text: Tracking prevention in Microsoft Edge
url: ../web-platform/tracking-prevention.md

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

- text: Develop experiences for the sidebar in Microsoft Edge
url: ../web-platform/sidebar.md

- text: Detect Windows 11 using User-Agent Client Hints
url: ../web-platform/how-to-detect-win11.md

- text: Customize the password reveal button
url: ../web-platform/password-reveal.md

- text: Display regional versions of your site, based on OS settings
url: ../web-platform/os-regional-settings.md

- text: View formatted JSON responses or files
url: ../devtools-guide-chromium/json-viewer/json-viewer.md

- text: Sign up for the Ad Selection API
url: ../web-platform/ad-selection-api.md
# =============================================================================
# Row 3 with 3 cards
# =============================================================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: View formatted JSON
title: View formatted JSON responses or files
description: How to use the JSON viewer to view formatted and highlighted JSON responses in a browser tab.
author: MSEdgeTeam
ms.author: msedgedevrel
Expand All @@ -8,7 +8,7 @@ ms.service: microsoft-edge
ms.subservice: devtools
ms.date: 04/08/2024
---
# View formatted JSON
# View formatted JSON responses or files

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ See also:
<!-- ====================================================================== -->
## See also

* [View formatted JSON](../json-viewer/json-viewer.md)
* [View formatted JSON responses or files](../json-viewer/json-viewer.md)
<!-- * [edge-devtools-network-console repo](https://github.com/microsoft/edge-devtools-network-console) -->
2 changes: 1 addition & 1 deletion microsoft-edge/devtools-guide-chromium/network/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Select a resource to learn more information about it.

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.

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).
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).

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

Expand Down
2 changes: 1 addition & 1 deletion microsoft-edge/devtools-guide-chromium/resources/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ For example, to go from the **Page** tab's resource list in the **Sources** tool

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.

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).
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).

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ last sync'd April 16, 2024
| 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/) |
| 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/) |
| 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 |
| 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/) |
| 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/) |
| 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/) |
| 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/) |
| 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) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ With code folding turned on, you can now expand and collapse objects and arrays
Please send us your [feedback](../../../contact.md)!

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


<!-- ====================================================================== -->
Expand Down
34 changes: 31 additions & 3 deletions microsoft-edge/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,21 +331,49 @@ conceptualContent:
# Card
- title: Development tips for Microsoft Edge
links:
- text: Development tips for Microsoft Edge
url: ./web-platform/web-platform.md
itemType: overview
# - text: Development tips for Microsoft Edge
# url: ./web-platform/web-platform.md
# itemType: overview

- text: Site compatibility-impacting changes
url: ./web-platform/site-impacting-changes.md
itemType: whats-new

- text: Move users to Microsoft Edge from Internet Explorer
url: ./web-platform/ie-to-microsoft-edge-redirection.md
itemType: how-to-guide

- text: Tracking prevention in Microsoft Edge
url: ./web-platform/tracking-prevention.md
itemType: how-to-guide

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

- text: Develop experiences for the sidebar in Microsoft Edge
url: ./web-platform/sidebar.md
itemType: how-to-guide

- text: Detect Windows 11 using User-Agent Client Hints
url: ./web-platform/how-to-detect-win11.md
itemType: how-to-guide

- text: Customize the password reveal button
url: ./web-platform/password-reveal.md
itemType: how-to-guide

- text: Display regional versions of your site, based on OS settings
url: ./web-platform/os-regional-settings.md
itemType: how-to-guide

- text: View formatted JSON responses or files
url: ./devtools-guide-chromium/json-viewer/json-viewer.md
itemType: how-to-guide

- text: Sign up for the Ad Selection API
url: ./web-platform/ad-selection-api.md
itemType: how-to-guide
# Card
- title: Accessibility in Microsoft Edge
links:
Expand Down
11 changes: 7 additions & 4 deletions microsoft-edge/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@
href: webview2/concepts/basic-authentication.md
displayName: auth, Basic authentication for WebView2 apps # top-of-page title

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

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

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

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

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

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

- name: Sign up for the Ad Selection API
href: ./web-platform/ad-selection-api.md

# =============================================================================
# if top-of-page title is longer, add it to displayName comma-delimited list of lookup keywords
- name: Microsoft Edge IDE integration
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8588c8b

Please sign in to comment.