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

Don't default to "Open", "Save", just let OS decide

Browse source
This commit is contained in:
Ben Gotow 2016-05-15 01:01:52 -05:00
parent 40c531737d
commit 84cce6c2c1
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/atom_download_manager_delegate.cc
View file

@ -78,7 +78,7 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
base::FilePath path; base::FilePath path;
if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(), if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(),
"Save", default_path, "", default_path,
file_dialog::Filters(), &path)) { file_dialog::Filters(), &path)) {
// Remember the last selected download directory. // Remember the last selected download directory.
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>( AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(

4
atom/browser/common_web_contents_delegate.cc
View file

@ -389,7 +389,7 @@ void CommonWebContentsDelegate::DevToolsSaveToFile(
} else { } else {
file_dialog::Filters filters; file_dialog::Filters filters;
base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url)); base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
if (!file_dialog::ShowSaveDialog(owner_window(), url, "Save", default_path, if (!file_dialog::ShowSaveDialog(owner_window(), url, "", default_path,
filters, &path)) { filters, &path)) {
base::StringValue url_value(url); base::StringValue url_value(url);
web_contents_->CallClientFunction( web_contents_->CallClientFunction(
@ -455,7 +455,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
base::FilePath default_path; base::FilePath default_path;
std::vector<base::FilePath> paths; std::vector<base::FilePath> paths;
int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY; int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
if (!file_dialog::ShowOpenDialog(owner_window(), "", "Open", default_path, if (!file_dialog::ShowOpenDialog(owner_window(), "", "", default_path,
filters, flag, &paths)) filters, flag, &paths))
return; return;

4
atom/browser/web_dialog_helper.cc
View file

@ -84,7 +84,7 @@ void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
base::FilePath path; base::FilePath path;
if (file_dialog::ShowSaveDialog(window_, if (file_dialog::ShowSaveDialog(window_,
base::UTF16ToUTF8(params.title), base::UTF16ToUTF8(params.title),
"Save", "",
params.default_file_name, params.default_file_name,
filters, filters,
&path)) { &path)) {
@ -115,7 +115,7 @@ void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
prefs::kSelectFileLastDirectory).Append(params.default_file_name); prefs::kSelectFileLastDirectory).Append(params.default_file_name);
if (file_dialog::ShowOpenDialog(window_, if (file_dialog::ShowOpenDialog(window_,
base::UTF16ToUTF8(params.title), base::UTF16ToUTF8(params.title),
"Open", "",
default_file_path, default_file_path,
filters, filters,
flags, flags,

12
lib/browser/api/dialog.js
View file

@ -76,11 +76,7 @@ module.exports = {
throw new TypeError('Title must be a string') throw new TypeError('Title must be a string')
} }
if (options.buttonLabel == null) { if (options.buttonLabel == null) {
if (options.properties.indexOf('openDirectory') !== -1) { options.buttonLabel = ''
options.buttonLabel = 'Choose'
} else {
options.buttonLabel = 'Open'
}
} else if (typeof options.buttonLabel !== 'string') { } else if (typeof options.buttonLabel !== 'string') {
throw new TypeError('buttonLabel must be a string') throw new TypeError('buttonLabel must be a string')
} }
@ -95,7 +91,7 @@ module.exports = {
wrappedCallback = typeof callback === 'function' ? function (success, result) { wrappedCallback = typeof callback === 'function' ? function (success, result) {
return callback(success ? result : void 0) return callback(success ? result : void 0)
} : null } : null
return binding.showOpenDialog(String(options.title), String(options.buttonLabel), String(options.defaultPath), options.filters, properties, window, wrappedCallback) return binding.showOpenDialog(options.title, options.buttonLabel, options.defaultPath, options.filters, properties, window, wrappedCallback)
}, },
showSaveDialog: function (...args) { showSaveDialog: function (...args) {
@ -113,7 +109,7 @@ module.exports = {
throw new TypeError('Title must be a string') throw new TypeError('Title must be a string')
} }
if (options.buttonLabel == null) { if (options.buttonLabel == null) {
options.buttonLabel = 'Save' options.buttonLabel = ''
} else if (typeof options.buttonLabel !== 'string') { } else if (typeof options.buttonLabel !== 'string') {
throw new TypeError('buttonLabel must be a string') throw new TypeError('buttonLabel must be a string')
} }
@ -128,7 +124,7 @@ module.exports = {
wrappedCallback = typeof callback === 'function' ? function (success, result) { wrappedCallback = typeof callback === 'function' ? function (success, result) {
return callback(success ? result : void 0) return callback(success ? result : void 0)
} : null } : null
return binding.showSaveDialog(String(options.title), String(options.buttonLabel), String(options.defaultPath), options.filters, window, wrappedCallback) return binding.showSaveDialog(options.title, options.buttonLabel, options.defaultPath, options.filters, window, wrappedCallback)
}, },
showMessageBox: function (...args) { showMessageBox: function (...args) {