From 985d1f097b4ce8aa953565b0c03c35aec62f8262 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 10 Mar 2014 22:36:26 +0300 Subject: [PATCH] Upload progress ion. Closes #120 --- js/documents.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/js/documents.js b/js/documents.js index a2c4b616..2576f0ae 100644 --- a/js/documents.js +++ b/js/documents.js @@ -556,6 +556,11 @@ var Files = Files || { }, updateStorageStatistics: function(){} +}, +FileList = FileList || {}; + +FileList.getCurrentDirectory = function(){ + return $('#dir').val() || '/'; }; $(document).ready(function() { @@ -592,7 +597,17 @@ $(document).ready(function() { var file_upload_start = $('#file_upload_start'); - file_upload_start.on('fileuploaddone', documentsMain.show); + if (supportAjaxUploadWithProgress()) { + file_upload_start.on('fileuploadstart', function(e, data) { + $('#upload').addClass('icon icon-loading'); + $('.add-document .upload').css({opacity:0}) + }); + } + file_upload_start.on('fileuploaddone', function(){ + $('#upload').removeClass('icon icon-loading'); + $('.add-document .upload').css({opacity:0.7}) + documentsMain.show(); + }); //TODO when ending a session as the last user close session? OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', documentsMain.onStartup);