haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-17 14:37:58 +00:00
Code Issues Releases Wiki Activity

Fixed upload/update progress bug in chrome

Browse Source
This commit is contained in:
zhengxie 2012-11-24 22:16:12 +08:00
parent 43ff32acb2
commit 0cd133657a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/file_upload_progress_page.html
View File

@ -4,14 +4,15 @@
<script type="text/javascript"> <script type="text/javascript">
// Update progress bar // Update progress bar
function update_progress_info() { function update_progress_info() {
var dialog_id = '{{ dialog_id }}';
$.ajax({ $.ajax({
url: '{{ httpserver_root }}/upload_progress/?X-Progress-ID=' + '{{ uuid }}' + '&callback=?', url: '{{ httpserver_root }}/upload_progress/?X-Progress-ID=' + '{{ uuid }}' + '&callback=?',
dataType: 'jsonp', dataType: 'jsonp',
cache: false, cache: false,
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#upload-progress-text', window.parent.document).html(filesizeformat(data.uploaded) + ' / ' + filesizeformat(data.length)); $(dialog_id + ' #upload-progress-text', window.parent.document).html(filesizeformat(data.uploaded) + ' / ' + filesizeformat(data.length));
$('#task-progress-bar', window.parent.document).removeClass('hide').progressbar({ $(dialog_id + ' #task-progress-bar', window.parent.document).removeClass('hide').progressbar({
value: data.uploaded / data.length * 100 value: data.uploaded / data.length * 100
}); });
} }

2
templates/snippets/file_upload_progress_js.html
View File

@ -40,7 +40,7 @@ function submit_and_real_time_show (dialog_id) {
// Update progress bar: for chrome // Update progress bar: for chrome
if ($.browser.safari) { if ($.browser.safari) {
$('#request-progress').attr('src', '{{ SITE_ROOT }}file_upload_progress_page/?uuid=' + uuid); $(dialog_id + ' iframe').attr('src', '{{ SITE_ROOT }}file_upload_progress_page/?uuid=' + uuid + '&dlg_id=' + dialog_id.substr(1));
} }
return false; return false;

7
views.py
View File

@ -2031,10 +2031,11 @@ def file_upload_progress_page(request):
''' '''
uuid = request.GET.get('uuid', '') uuid = request.GET.get('uuid', '')
httpserver_root = get_httpserver_root() httpserver_root = get_httpserver_root()
dialog_id = request.GET.get('dlg_id', '')
return render_to_response('file_upload_progress_page.html', { return render_to_response('file_upload_progress_page.html', {
'uuid': uuid, 'uuid': uuid,
'httpserver_root': httpserver_root, 'httpserver_root': httpserver_root,
'dialog_id': '#' + dialog_id,
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
@login_required @login_required