diff options
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/appinfo/update.php | 8 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 15 | ||||
| -rw-r--r-- | apps/files/tests/ajax_rename.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/helper.php | 3 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 2 |
5 files changed, 19 insertions, 11 deletions
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php deleted file mode 100644 index de635e5ce6b..00000000000 --- a/apps/files/appinfo/update.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -// this drops the keys below, because they aren't needed anymore -// core related -if (version_compare(\OCP\Config::getSystemValue('version', '0.0.0'), '7.0.0', '<')) { - \OCP\Config::deleteSystemValue('allowZipDownload'); - \OCP\Config::deleteSystemValue('maxZipInputSize'); -} diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index c8b3a150caa..8b0753fc647 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -501,6 +501,21 @@ OC.Upload = { } }); + } else { + // for all browsers that don't support the progress bar + // IE 8 & 9 + + // show a spinner + fileupload.on('fileuploadstart', function() { + $('#upload').addClass('icon-loading'); + $('#upload .icon-upload').hide(); + }); + + // hide a spinner + fileupload.on('fileuploadstop fileuploadfail', function() { + $('#upload').removeClass('icon-loading'); + $('#upload .icon-upload').show(); + }); } } diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 48aed05823b..1cfecf9e58c 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -107,7 +107,7 @@ class Test_OC_Files_App_Rename extends \Test\TestCase { 'etag' => 'abcdef', 'directory' => '/', 'name' => 'new_name', - )))); + ), null))); $result = $this->files->rename($dir, $oldname, $newname); diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php index 1b7c8eef43a..ea96e41d1d1 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/helper.php @@ -24,7 +24,8 @@ class Test_Files_Helper extends \Test\TestCase { 'mtime' => $mtime, 'type' => $isDir ? 'dir' : 'file', 'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream' - ) + ), + null ); } diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 6c83f214c39..6dafa262715 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -275,7 +275,7 @@ describe('OCA.Files.FileList tests', function() { mtime: -1 }; var $tr = fileList.add(fileData); - expect($tr.find('.date').text()).toEqual('?'); + expect($tr.find('.date .modified').text()).toEqual('?'); }); it('adds new file to the end of the list', function() { var $tr; |