Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorVincent Chan <plus.vincchan@gmail.com>2016-05-25 02:11:07 +0300
committerJoas Schilling <nickvergessen@owncloud.com>2016-05-30 12:23:54 +0300
commit3538e90ba1e6e9aad0e665e18e4967b264c97e9a (patch)
treec40f2ff7cf8d3804f17fda08a4f9e2491d77e41e /apps
parent12b482b976656bb73b1dd265b3e069ff4eb71c65 (diff)
fixes size of the download spinner
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/fileactions.js4
-rw-r--r--apps/files/tests/js/fileactionsSpec.js4
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);
});
});