diff options
| author | Mario <mario@mariovavti.com> | 2020-12-30 14:30:39 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-12-30 14:30:39 +0000 |
| commit | 8db367c74353f2b86d0effeebfe84c7cc4f512ab (patch) | |
| tree | 16d8c20f8cae84b440b1260894729769b8ae1f63 /view | |
| parent | 2c4fabba35267a590a86e5a173243dbf82be3606 (diff) | |
| download | volse-hubzilla-8db367c74353f2b86d0effeebfe84c7cc4f512ab.tar.gz volse-hubzilla-8db367c74353f2b86d0effeebfe84c7cc4f512ab.tar.bz2 volse-hubzilla-8db367c74353f2b86d0effeebfe84c7cc4f512ab.zip | |
remove fallback code - it will not be required if compression is dismissed
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_cloud.js | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index aeaac8c69..8fb66c5aa 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -70,11 +70,8 @@ $(document).ready(function () { $('body').css('cursor', 'wait'); $.jGrowl('Please stand by while your download is being prepared...', { sticky: false, theme: 'info', life: 10000 }); - var download_token = makeid(32); - let data = [ {name: 'attach_path', value: window.location.pathname}, - {name: 'download_token', value: download_token}, {name: 'channel_id', value: channelId}, {name: 'attach_ids[]', value: id} ] @@ -82,21 +79,9 @@ $(document).ready(function () { $.post('attach', data, function (data) { if (data.success) { $('body').css('cursor', 'auto'); - window.location.href = '/attach/download?token=' + data.token + '&download_token=' + download_token; - clearInterval(fallback); - } - }); - - // fallback if server timed out - - var fallback = setInterval(function(){ $.get('/attach/check?download_token=' + download_token, function(data){ - if (data.success) { - $('body').css('cursor', 'auto'); window.location.href = '/attach/download?token=' + data.token; - clearInterval(fallback); } - - }); }, 30000); + }); }); @@ -313,33 +298,17 @@ $(document).ready(function () { $('body').css('cursor', 'wait'); $.jGrowl('Please stand by while your download is being prepared...', { sticky: false, theme: 'info', life: 10000 }); - var download_token = makeid(32); - post_data.push( {name: 'attach_path', value: window.location.pathname}, - {name: 'download_token', value: download_token}, - {name: 'channel_id', value: channelId}, + {name: 'channel_id', value: channelId} ); $.post('attach', post_data, function (data) { if (data.success) { $('body').css('cursor', 'auto'); - window.location.href = '/attach/download?token=' + data.token + '&download_token=' + download_token; - clearInterval(fallback); - } - }); - - // fallback if server timed out - - var fallback = setInterval(function(){ $.get('/attach/check?download_token=' + download_token, function(data){ - if (data.success) { - $('body').css('cursor', 'auto'); window.location.href = '/attach/download?token=' + data.token; - clearInterval(fallback); } - - }); }, 30000); - + }); }); |