Layout changes
This commit is contained in:
@@ -386,7 +386,6 @@ ipcMain.on(Constants.IPC_Detect_Mounts, (event, data) => {
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error);
|
|
||||||
if (os.platform() === 'win32') {
|
if (os.platform() === 'win32') {
|
||||||
grabDriveLetters({});
|
grabDriveLetters({});
|
||||||
}
|
}
|
||||||
@@ -502,7 +501,6 @@ ipcMain.on(Constants.IPC_Grab_UI_Releases, (event) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.on(Constants.IPC_Install_Dependency, (event, data) => {
|
ipcMain.on(Constants.IPC_Install_Dependency, (event, data) => {
|
||||||
console.log(data);
|
|
||||||
if (data.Source.toLowerCase().endsWith('.dmg')) {
|
if (data.Source.toLowerCase().endsWith('.dmg')) {
|
||||||
helpers
|
helpers
|
||||||
.executeAsync('hdiutil', ['attach', data.Source])
|
.executeAsync('hdiutil', ['attach', data.Source])
|
||||||
@@ -513,7 +511,6 @@ ipcMain.on(Constants.IPC_Install_Dependency, (event, data) => {
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(error=> {
|
.catch(error=> {
|
||||||
console.log(error);
|
|
||||||
standardIPCReply(event, Constants.IPC_Install_Dependency_Reply, {
|
standardIPCReply(event, Constants.IPC_Install_Dependency_Reply, {
|
||||||
Source: data.Source,
|
Source: data.Source,
|
||||||
URL: data.URL,
|
URL: data.URL,
|
||||||
@@ -593,7 +590,6 @@ ipcMain.on(Constants.IPC_Mount_Drive, (event, data) => {
|
|||||||
StorageType: data.StorageType,
|
StorageType: data.StorageType,
|
||||||
};
|
};
|
||||||
const errorHandler = (pid, error) => {
|
const errorHandler = (pid, error) => {
|
||||||
console.log(pid, error);
|
|
||||||
if (mountedLocations.indexOf(data.Location) !== -1) {
|
if (mountedLocations.indexOf(data.Location) !== -1) {
|
||||||
mountedLocations.splice(mountedLocations.indexOf(data.Location), 1);
|
mountedLocations.splice(mountedLocations.indexOf(data.Location), 1);
|
||||||
delete mountedData[data.Location];
|
delete mountedData[data.Location];
|
||||||
|
|||||||
@@ -248,14 +248,19 @@ class MountItems extends Component {
|
|||||||
let retryDisplay;
|
let retryDisplay;
|
||||||
if (this.state.DisplayRetry) {
|
if (this.state.DisplayRetry) {
|
||||||
let retryList = [];
|
let retryList = [];
|
||||||
|
let retryListCount = 0;
|
||||||
for (const storageType in this.state.RetryItems) {
|
for (const storageType in this.state.RetryItems) {
|
||||||
if (this.state.RetryItems.hasOwnProperty(storageType)) {
|
if (this.state.RetryItems.hasOwnProperty(storageType)) {
|
||||||
|
retryListCount++;
|
||||||
retryList.push((
|
retryList.push((
|
||||||
<RootElem key={retryList.length}>
|
<RootElem key={retryList.length}>
|
||||||
<p>Retrying {storageType} in {this.state.RetryItems[storageType].RetrySeconds}(s)</p>
|
<p>Retrying {storageType} in {this.state.RetryItems[storageType].RetrySeconds}(s)</p>
|
||||||
<Button clicked={()=>this.cancelRetryMount(storageType, ()=> this.detectMounts())}>Cancel {storageType}</Button>
|
<Button clicked={()=>this.cancelRetryMount(storageType, ()=> this.detectMounts())}>Cancel {storageType}</Button>
|
||||||
</RootElem>
|
</RootElem>
|
||||||
));
|
));
|
||||||
|
if (retryListCount < Object.keys(this.state.RetryItems).length) {
|
||||||
|
retryList.push(<div style={{paddingTop: '8px'}} key={'b'+retryList.length}/>);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user