From 984761a386c12a7d602c685db2049590874305f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 13 Oct 2015 16:12:05 +0200 Subject: [PATCH] Remove stopPropagation for event in FileDragAndDrop --- .../file_drag_and_drop.js | 3 +-- js/utils/requests.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js index 4c9211c5..57d87b76 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js @@ -121,13 +121,12 @@ let FileDragAndDrop = React.createClass({ // Firefox only recognizes the simulated mouse click if bubbles is set to true, // but since Google Chrome propagates the event much further than needed, we // need to stop propagation as soon as the event is created - var evt = new MouseEvent('click', { + let evt = new MouseEvent('click', { view: window, bubbles: true, cancelable: true }); - evt.stopPropagation(); this.refs.fileinput.getDOMNode().dispatchEvent(evt); }, diff --git a/js/utils/requests.js b/js/utils/requests.js index fd676896..7e9c9a58 100644 --- a/js/utils/requests.js +++ b/js/utils/requests.js @@ -57,12 +57,14 @@ class Requests { }); } - handleError(err) { - if (err instanceof TypeError) { - throw new Error('Server did not respond to the request. (Not even displayed a 500)'); - } else { - throw err; - } + handleError(url) { + return (err) => { + if (err instanceof TypeError) { + throw new Error('For: ' + url + ' - Server did not respond to the request. (Not even displayed a 500)'); + } else { + throw err; + } + }; } getUrl(url) { @@ -118,7 +120,7 @@ class Requests { merged.method = verb; return fetch(url, merged) .then(this.unpackResponse) - .catch(this.handleError); + .catch(this.handleError(url)); } get(url, params) {