diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-10-07 17:17:37 -0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-10-07 17:17:37 -0400 |
commit | 4b446f3eddd31829b844b09b8169a85350b26d2b (patch) | |
tree | ebaa82d624a30b6a8c3038682ac505115f9a7e5a /apps | |
parent | e36317c21a024c758b514109cb042515cc8e94bb (diff) | |
download | nextcloud-server-4b446f3eddd31829b844b09b8169a85350b26d2b.tar.gz nextcloud-server-4b446f3eddd31829b844b09b8169a85350b26d2b.zip |
Revert part of 5beca59b, fixes file upload bug oc-1926
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/js/files.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index e4037454520..c7f4c4ce080 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -200,8 +200,6 @@ $(document).ready(function() { e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone }); - if ( document.getElementById("file_upload_start") ) { - $(function() { $('.file_upload_start').fileupload({ dropZone: $('#content'), // restrict dropZone to content div @@ -415,8 +413,7 @@ $(document).ready(function() { } }) }); - } - + $.assocArraySize = function(obj) { // http://stackoverflow.com/a/6700/11236 var size = 0, key; |