Skip to content

Commit

Permalink
Merge pull request #758 from feross/fix-284
Browse files Browse the repository at this point in the history
Allow dragging magnet links (Fix #284)
  • Loading branch information
feross authored Aug 4, 2016
2 parents b3d0edf + 6740921 commit 756ccd1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"create-torrent": "^3.24.5",
"deep-equal": "^1.0.1",
"dlnacasts": "^0.1.0",
"drag-drop": "^2.11.0",
"drag-drop": "^2.12.1",
"electron-prebuilt": "1.3.2",
"fs-extra": "^0.30.0",
"hat": "0.0.3",
Expand Down
7 changes: 5 additions & 2 deletions src/renderer/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,11 @@ function onState (err, _state) {
app = ReactDOM.render(<App state={state} />, document.querySelector('#body'))

// OS integrations:
// ...drag and drop a torrent or video file to play or seed
dragDrop('body', onOpen)
// ...drag and drop files/text to start torrenting or seeding
dragDrop('body', {
onDrop: onOpen,
onDropText: onOpen
})

// ...same thing if you paste a torrent
document.addEventListener('paste', onPaste)
Expand Down

0 comments on commit 756ccd1

Please sign in to comment.