Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: left is a valid mode in contents.openDevTools() options #32372

Merged
merged 1 commit into from Jan 10, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/api/web-contents.md
Expand Up @@ -1596,8 +1596,8 @@
const { app, BrowserWindow } = require('electron')

let win = null
let devtools = null

Check failure on line 1600 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 14-x-y

docs/api/web-contents.md#L1599-L1600

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

Check failure on line 1600 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 14-x-y

docs/api/web-contents.md#L1599-L1600

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options
app.whenReady().then(() => {
win = new BrowserWindow()
devtools = new BrowserWindow()
Expand All @@ -1611,8 +1611,8 @@

* `options` Object (optional)
* `mode` string - Opens the devtools with specified dock state, can be
`right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
`left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
In `undocked` mode it's possible to dock back. In `detach` mode it's not.

Check failure on line 1615 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 15-x-y

docs/api/web-contents.md#L1614-L1615

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

Check failure on line 1615 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 15-x-y

docs/api/web-contents.md#L1614-L1615

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

Check failure on line 1615 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 16-x-y

docs/api/web-contents.md#L1614-L1615

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

Check failure on line 1615 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 16-x-y

docs/api/web-contents.md#L1614-L1615

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options
* `activate` boolean (optional) - Whether to bring the opened devtools window
to the foreground. The default is `true`.

Expand Down Expand Up @@ -1645,8 +1645,8 @@
Starts inspecting element at position (`x`, `y`).

#### `contents.inspectSharedWorker()`

Opens the developer tools for the shared worker context.

Check failure on line 1649 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 13-x-y

docs/api/web-contents.md#L1648-L1649

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

Check failure on line 1649 in docs/api/web-contents.md

View check run for this annotation

trop / Backportable? - 13-x-y

docs/api/web-contents.md#L1648-L1649

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

#### `contents.inspectSharedWorkerById(workerId)`

Expand Down