Skip to content
This repository has been archived by the owner on Jul 7, 2024. It is now read-only.
/ Orion Public archive

Skip download if the user didn't select a dir, fix StorageList's checkboxes #102

Merged
merged 3 commits into from
May 10, 2018
Merged

Skip download if the user didn't select a dir, fix StorageList's checkboxes #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2715b24
Skip download if the user did not select a directory, fix StorageList…
kernelwhisperer May 9, 2018
2c5d997
Merge branch 'master' into bugfix/108-cannot-read-property-0-of-undef…
kernelwhisperer May 9, 2018
c30d2c6
Merge branch 'master' into bugfix/108-cannot-read-property-0-of-undef…
kernelwhisperer May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/windows/Storage/Components/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,20 @@ class Header extends React.Component {
if (selected.length > 1) {
opts.properties = ['openDirectory', 'createDirectory']
opts.buttonLabel = 'Save everything here'
const destDir = remote.dialog.showOpenDialog(remote.app.mainWindow, opts)[0]
const filePaths = remote.dialog.showOpenDialog(remote.app.mainWindow, opts)
if (!filePaths) return

promises = selected.map(element => saveFileToPath(element.hash, destDir))
const destination = filePaths[0]
promises = selected.map(element => saveFileToPath(element.hash, destination))
} else {
// selected.length === 1
opts.properties = ['openDirectory']
opts.buttonLabel = 'Save here'
const dest = remote.dialog.showOpenDialog(remote.app.mainWindow, opts)
promises = [saveFileToPath(selected[0].hash, dest[0])]
const filePaths = remote.dialog.showOpenDialog(remote.app.mainWindow, opts)
if (!filePaths) return

const destination = filePaths[0]
promises = [saveFileToPath(selected[0].hash, destination)]
}

this.setState({ isSavingOnDisk: true })
Expand Down
3 changes: 1 addition & 2 deletions app/windows/Storage/Components/StorageElement.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { remote } from 'electron'

import React from 'react'
import { isEqual } from 'underscore'
import { Icon } from 'react-photonkit'

import { saveFileToPath } from '../../../api'
Expand Down Expand Up @@ -75,7 +74,7 @@ class StorageElement extends React.Component {
_handleCheckboxOnClick (element, proxy, event) {
if (!this.props.storageStore) return

if (this.props.storageStore.selected.find((el) => isEqual(el, element))) {
if (this.props.storageStore.selected.find(el => el.hash === element.hash)) {
this.props.storageStore.selected.pop(element)
} else {
this.props.storageStore.selected.push(element)
Expand Down