From acfcae5dec0d664c198e32d8999e154548264dab Mon Sep 17 00:00:00 2001 From: Daniela Arcese Date: Tue, 18 Jul 2017 17:16:07 -0400 Subject: [PATCH] allow send another file link to open in new tab --- frontend/src/download.js | 6 +++--- frontend/src/upload.js | 13 ++----------- views/download.handlebars | 8 ++++---- views/index.handlebars | 8 ++++---- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/frontend/src/download.js b/frontend/src/download.js index 4f1d40b5..f0a5aea7 100644 --- a/frontend/src/download.js +++ b/frontend/src/download.js @@ -6,9 +6,9 @@ require('jquery-circle-progress'); const Raven = window.Raven; $(document).ready(function() { $('#download-progress').hide(); - $('.send-new').click(() => { - window.location.replace(`${window.location.origin}`); - }); + //link back to homepage + $('.send-new').attr('href', window.location.origin); + const filename = $('#dl-filename').html(); //initiate progress bar diff --git a/frontend/src/upload.js b/frontend/src/upload.js index 555b7961..9527489a 100644 --- a/frontend/src/upload.js +++ b/frontend/src/upload.js @@ -68,17 +68,8 @@ $(document).ready(function() { fill: '#3B9DFF', size: 158 }); - // link back to home page - $('.send-new').click(() => { - $('#upload-progress').hide(); - $('#share-link').hide(); - $('#upload-error').hide(); - $copyBtn.attr('disabled', false); - $('#link').attr('disabled', false); - $copyBtn.html('Copy to Clipboard'); - $('.upload-window').removeClass('ondrag'); - $('#page-one').show(); - }); + //link back to homepage + $('.send-new').attr('href', window.location); // on file upload by browse or drag & drop function onUpload(event) { diff --git a/views/download.handlebars b/views/download.handlebars index 4eca5e3c..bf47cf68 100644 --- a/views/download.handlebars +++ b/views/download.handlebars @@ -38,9 +38,9 @@ -
+ Try Firefox Send -
+ {{else}}
This link has expired or never existed in the first place. @@ -52,9 +52,9 @@
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
- + {{/if}}
diff --git a/views/index.handlebars b/views/index.handlebars index 8dde3b8e..121e9d85 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -74,9 +74,9 @@ -
+ Send another file -
+ @@ -88,9 +88,9 @@ There has been an error uploading the file. Upload error -
+ Send another file -
+