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

fix: folder open not working in devtools (#15387)

Browse source
This commit is contained in:
Shelley Vohr 2018-10-25 08:36:48 -07:00 committed by GitHub
parent 1f3a89197c
commit d21d83cfc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/inspectable_web_contents_impl.cc
View file

@ -512,8 +512,9 @@ void InspectableWebContentsImpl::ShowItemInFolder(
const std::string& file_system_path) { const std::string& file_system_path) {
if (file_system_path.empty()) if (file_system_path.empty())
return; return;
base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path); base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
platform_util::ShowItemInFolder(path); platform_util::OpenItem(path);
} }
void InspectableWebContentsImpl::SaveToFile(const std::string& url, void InspectableWebContentsImpl::SaveToFile(const std::string& url,

9
lib/renderer/inspector.js
View file

@ -4,10 +4,19 @@ window.onload = function () {
// Use menu API to show context menu. // Use menu API to show context menu.
window.InspectorFrontendHost.showContextMenuAtPoint = createMenu window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
// correct for Chromium returning undefined for filesystem
window.Persistence.FileSystemWorkspaceBinding.completeURL = completeURL
// Use dialog API to override file chooser dialog. // Use dialog API to override file chooser dialog.
window.UI.createFileSelectorElement = createFileSelectorElement window.UI.createFileSelectorElement = createFileSelectorElement
} }
// Extra / is needed as a result of MacOS requiring absolute paths
function completeURL (project, path) {
project = 'file:///'
return `${project}${path}`
}
window.confirm = function (message, title) { window.confirm = function (message, title) {
const { dialog } = require('electron').remote const { dialog } = require('electron').remote
if (title == null) { if (title == null) {