From cee8d7cae7a6531f9e3dfe088eeba7338ac2d1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Fri, 9 Oct 2015 14:22:48 +0200
Subject: [PATCH] fix bug in FileDragAndDropDialog

---
 .../ascribe_routes/proxy_routes/redirect_proxy_handler.js   | 6 +++---
 .../ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js b/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js
index 2f30c6f6..474d07fd 100644
--- a/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js
+++ b/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js
@@ -47,13 +47,13 @@ export default function RedirectProxyHandler({to, when}) {
                                      this.state.currentUser && this.state.currentUser.email :
                                      this.state.currentUser && !this.state.currentUser.email;
 
-                    if(!exprToValidate && when === 'loggedIn' && redirect) {
+                    if(exprToValidate) {
+                        window.setTimeout(() => this.history.pushState(null, to, query));
+                    } else if(!exprToValidate && when === 'loggedIn' && redirect) {
 
                         delete query.redirect;
                         window.setTimeout(() => this.history.pushState(null, '/' + redirect, query));
 
-                    } else if(exprToValidate) {
-                        window.setTimeout(() => this.history.pushState(null, to, query));
                     } else if(!exprToValidate && when === 'loggedOut' && redirectAuthenticated) {
                         /*
                         * redirectAuthenticated contains an arbirary path
diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
index b0656bcf..f6eb94fb 100644
--- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
+++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
@@ -43,7 +43,7 @@ let FileDragAndDropDialog = React.createClass({
                     <div className="file-drag-and-drop-dialog present-options">
                         <p>{getLangText('Would you rather')}</p>
                         <Link
-                            to={location.pathname + location.query}
+                            to={location.pathname}
                             query={queryParamsHash}>
                             <span className="btn btn-default btn-sm">
                                 {getLangText('Hash your work')}
@@ -53,7 +53,7 @@ let FileDragAndDropDialog = React.createClass({
                         <span> or </span>
                        
                        <Link
-                            to={location.pathname + location.query}
+                            to={location.pathname}
                             query={queryParamsUpload}>
                             <span className="btn btn-default btn-sm">
                                 {getLangText('Upload and hash your work')}