Fix multiple dialog windows bug #1673

Merged
btzr-io merged 2 commits from fix-dialog into master 2018-06-22 20:36:44 +02:00
3 changed files with 17 additions and 11 deletions

View file

@ -58,6 +58,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Fix Linux upgrade path and add manual installation note ([#1606](https://github.com/lbryio/lbry-app/issues/1606)) * Fix Linux upgrade path and add manual installation note ([#1606](https://github.com/lbryio/lbry-app/issues/1606))
* Fix can type in unfocused fields while publishing without selecting file ([#1456](https://github.com/lbryio/lbry-app/issues/1456)) * Fix can type in unfocused fields while publishing without selecting file ([#1456](https://github.com/lbryio/lbry-app/issues/1456))
* Fix navigation button resulting incorrect page designation ([#1502](https://github.com/lbryio/lbry-app/issues/1502)) * Fix navigation button resulting incorrect page designation ([#1502](https://github.com/lbryio/lbry-app/issues/1502))
* Fix shouldn't allow to open multiple export and choose file dialogs ([#1175](https://github.com/lbryio/lbry-app/issues/1175))
## [0.21.6] - 2018-06-05 ## [0.21.6] - 2018-06-05

View file

@ -2,7 +2,6 @@
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types';
import Button from 'component/button'; import Button from 'component/button';
import parseData from 'util/parseData'; import parseData from 'util/parseData';
import * as icons from 'constants/icons'; import * as icons from 'constants/icons';
@ -56,16 +55,20 @@ class FileExporter extends React.PureComponent<Props> {
], ],
}; };
remote.dialog.showSaveDialog(options, filename => { remote.dialog.showSaveDialog(
// User hit cancel so do nothing: remote.getCurrentWindow(),
if (!filename) return; options,
// Get extension and remove initial dot filename => {
const format = path.extname(filename).replace(/\./g, ''); // User hit cancel so do nothing:
// Parse data to string with the chosen format if (!filename) return;
const parsed = parseData(data, format, filters); // Get extension and remove initial dot
// Write file const format = path.extname(filename).replace(/\./g, '');
parsed && this.handleFileCreation(filename, parsed); // Parse data to string with the chosen format
}); const parsed = parseData(data, format, filters);
// Write file
parsed && this.handleFileCreation(filename, parsed);
}
);
} }
render() { render() {

View file

@ -25,6 +25,7 @@ class FileSelector extends React.PureComponent<Props> {
handleButtonClick() { handleButtonClick() {
remote.dialog.showOpenDialog( remote.dialog.showOpenDialog(
remote.getCurrentWindow(),
{ {
properties: properties:
this.props.type === 'file' ? ['openFile'] : ['openDirectory', 'createDirectory'], this.props.type === 'file' ? ['openFile'] : ['openDirectory', 'createDirectory'],