diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-08 13:39:01 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-08 13:39:01 +0200 |
| commit | 2de94f9c8574d8662bf0993999ca2f7bbff1f115 (patch) | |
| tree | 58b8f98c301a55f0fcce1288884d06744886ed89 /apps/files/js | |
| parent | c4c8dd4e3a5fcd9a86835566db954662dcb41a0c (diff) | |
| parent | 3affeb5bd77715c84c70230d744de8d0f577a378 (diff) | |
| download | nextcloud-server-2de94f9c8574d8662bf0993999ca2f7bbff1f115.tar.gz nextcloud-server-2de94f9c8574d8662bf0993999ca2f7bbff1f115.zip | |
merge master into phpunit
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/files.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index e4037454520..b36e46813dc 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -199,9 +199,8 @@ $(document).ready(function() { $(document).bind('drop dragover', function (e) { e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone }); - - if ( document.getElementById("file_upload_start") ) { - + + if ( document.getElementById("data-upload-form") ) { $(function() { $('.file_upload_start').fileupload({ dropZone: $('#content'), // restrict dropZone to content div @@ -416,7 +415,6 @@ $(document).ready(function() { }) }); } - $.assocArraySize = function(obj) { // http://stackoverflow.com/a/6700/11236 var size = 0, key; |