Fix context menu in devtools.
This commit is contained in:
parent
2312f84ec9
commit
7b93a19e9b
3 changed files with 10 additions and 13 deletions
|
@ -531,8 +531,11 @@ void NativeWindow::DevToolsSaveToFile(const std::string& url,
|
|||
path = it->second;
|
||||
} else {
|
||||
base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
|
||||
if (!file_dialog::ShowSaveDialog(this, url, default_path, &path))
|
||||
if (!file_dialog::ShowSaveDialog(this, url, default_path, &path)) {
|
||||
base::StringValue url_value(url);
|
||||
CallDevToolsFunction("InspectorFrontendAPI.canceledSaveURL", &url_value);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
saved_files_[url] = path;
|
||||
|
@ -541,9 +544,6 @@ void NativeWindow::DevToolsSaveToFile(const std::string& url,
|
|||
// Notify devtools.
|
||||
base::StringValue url_value(url);
|
||||
CallDevToolsFunction("InspectorFrontendAPI.savedURL", &url_value);
|
||||
|
||||
// TODO(zcbenz): In later Chrome we need to call canceledSaveURL when the save
|
||||
// failed.
|
||||
}
|
||||
|
||||
void NativeWindow::DevToolsAppendToFile(const std::string& url,
|
||||
|
@ -607,8 +607,9 @@ void NativeWindow::CallDevToolsFunction(const std::string& function_name,
|
|||
}
|
||||
}
|
||||
}
|
||||
GetDevToolsWebContents()->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
|
||||
base::string16(), base::UTF8ToUTF16(function_name + "(" + params + ");"));
|
||||
base::string16 javascript =
|
||||
base::UTF8ToUTF16(function_name + "(" + params + ");");
|
||||
GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(javascript);
|
||||
}
|
||||
|
||||
} // namespace atom
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
window.onload = ->
|
||||
# Use menu API to show context menu.
|
||||
WebInspector.ContextMenu.prototype.show = ->
|
||||
menuObject = @_buildDescriptor()
|
||||
if menuObject.length
|
||||
WebInspector._contextMenu = this
|
||||
createMenu(menuObject, @_event)
|
||||
@_event.consume()
|
||||
InspectorFrontendHost.showContextMenu = (event, items) ->
|
||||
createMenu items, event
|
||||
|
||||
# Use dialog API to override file chooser dialog.
|
||||
WebInspector.createFileSelectorElement = (callback) ->
|
||||
|
|
2
vendor/brightray
vendored
2
vendor/brightray
vendored
|
@ -1 +1 @@
|
|||
Subproject commit 389fb3bd7d6cabf84b0208810de1e7a0e5bedd7b
|
||||
Subproject commit 842b674b6afa26ffc9d3d97f2ff96f0bb8498d74
|
Loading…
Add table
Add a link
Reference in a new issue