diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-31 10:42:13 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-31 10:42:13 +0200 |
| commit | 9a9c1b9439055fc6ad9f8372b354e4fc7ce3bc02 (patch) | |
| tree | 43140d5fa8758c9eee06c5efeb7dce7608bbf8e6 | |
| parent | 59ed464ee63a0719eeed3bbc2864749a2ce04ff0 (diff) | |
| parent | 3538e90ba1e6e9aad0e665e18e4967b264c97e9a (diff) | |
| download | nextcloud-server-9a9c1b9439055fc6ad9f8372b354e4fc7ce3bc02.tar.gz nextcloud-server-9a9c1b9439055fc6ad9f8372b354e4fc7ce3bc02.zip | |
Merge pull request #24822 from owncloud/fix-download-spinner
fixes size of the download spinner
| -rw-r--r-- | apps/files/js/fileactions.js | 4 | ||||
| -rw-r--r-- | apps/files/tests/js/fileactionsSpec.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index c3d4fba9ef5..015635c2e1d 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -665,11 +665,11 @@ OCA.Files.FileActions.updateFileActionSpinner = function($downloadButtonElement, showIt) { var $icon = $downloadButtonElement.find('.icon'); if (showIt) { - var $loadingIcon = $('<span class="icon loading"></span>'); + var $loadingIcon = $('<span class="icon icon-loading-small"></span>'); $icon.after($loadingIcon); $icon.addClass('hidden'); } else { - $downloadButtonElement.find('.loading').remove(); + $downloadButtonElement.find('.icon-loading-small').remove(); $downloadButtonElement.find('.icon').removeClass('hidden'); } }; diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js index 3f46a27d1f9..75a18713696 100644 --- a/apps/files/tests/js/fileactionsSpec.js +++ b/apps/files/tests/js/fileactionsSpec.js @@ -666,13 +666,13 @@ describe('OCA.Files.FileActions tests', function() { it('replaces download icon with spinner', function() { FileActions.updateFileActionSpinner($el, true); - expect($el.find('.icon.loading').length).toEqual(1); + expect($el.find('.icon.icon-loading-small').length).toEqual(1); expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(true); }); it('replaces spinner back with download icon with spinner', function() { FileActions.updateFileActionSpinner($el, true); FileActions.updateFileActionSpinner($el, false); - expect($el.find('.icon.loading').length).toEqual(0); + expect($el.find('.icon.icon-loading-small').length).toEqual(0); expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(false); }); }); |