mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5208 from deepak1556/devtools_dock_state_patch

Browse source 
devtools: allow opening in specified dock state
This commit is contained in:
Cheng Zhao 2016-04-20 13:34:52 +09:00
commit d3bff7fffc
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_web_contents.cc
View file

@ -849,14 +849,20 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
if (type_ == REMOTE)
return;
bool detach = false;
std::string state;
if (type_ == WEB_VIEW) {
detach = true;
state = "detach";
} else if (args && args->Length() == 1) {
bool detach = false;
mate::Dictionary options;
args->GetNext(&options) && options.Get("detach", &detach);
if (args->GetNext(&options)) {
options.Get("mode", &state);
options.Get("detach", &detach);
if (state.empty() && detach)
state = "detach";
}
managed_web_contents()->SetCanDock(!detach);
}
managed_web_contents()->SetDockState(state);
managed_web_contents()->ShowDevTools();
}

3
docs/api/web-contents.md
View file

@ -647,7 +647,8 @@ Removes the specified path from DevTools workspace.
### `webContents.openDevTools([options])`
* `options` Object (optional)
* `detach` Boolean - opens DevTools in a new window
* `mode` String - Opens the devtools with specified dock state, can be one of
"right", "bottom", "undocked", "detach". Defaults to last used dock state.
Opens the devtools.