mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2469 from nextcloud/fix-loading-icon-background 

Remove white background from loading icon
This commit is contained in:
Morris Jobke 2016-12-02 15:53:38 +01:00 committed by GitHub
parent 865181d32a 0853f0e7a8
commit db56df1893
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/css/sharetabview.css
View File

@ -104,7 +104,6 @@
.shareTabView .icon-loading-small { .shareTabView .icon-loading-small {
display: inline-block; display: inline-block;
z-index: 1; z-index: 1;
background-color: white;
padding: 2px 0; padding: 2px 0;
} }
@ -122,6 +121,5 @@
} }
.shareTabView .icon { .shareTabView .icon {
display: inline-block;
background-size: 16px 16px; background-size: 16px 16px;
} }

8
core/js/sharedialogview.js
View File

@ -134,6 +134,8 @@
var $loading = this.$el.find('.shareWithLoading'); var $loading = this.$el.find('.shareWithLoading');
$loading.removeClass('hidden'); $loading.removeClass('hidden');
$loading.addClass('inlineblock'); $loading.addClass('inlineblock');
var $remoteShareInfo = this.$el.find('.shareWithRemoteInfo');
$remoteShareInfo.addClass('hidden');
$.get( $.get(
OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees', OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees',
{ {
@ -145,6 +147,7 @@
function (result) { function (result) {
$loading.addClass('hidden'); $loading.addClass('hidden');
$loading.removeClass('inlineblock'); $loading.removeClass('inlineblock');
$remoteShareInfo.removeClass('hidden');
if (result.ocs.meta.statuscode === 100) { if (result.ocs.meta.statuscode === 100) {
var users = result.ocs.data.exact.users.concat(result.ocs.data.users); var users = result.ocs.data.exact.users.concat(result.ocs.data.users);
var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups); var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
@ -256,6 +259,7 @@
).fail(function() { ).fail(function() {
$loading.addClass('hidden'); $loading.addClass('hidden');
$loading.removeClass('inlineblock'); $loading.removeClass('inlineblock');
$remoteShareInfo.removeClass('hidden');
OC.Notification.show(t('core', 'An error occurred. Please try again')); OC.Notification.show(t('core', 'An error occurred. Please try again'));
window.setTimeout(OC.Notification.hide, 5000); window.setTimeout(OC.Notification.hide, 5000);
}); });
@ -298,18 +302,22 @@
var $loading = this.$el.find('.shareWithLoading'); var $loading = this.$el.find('.shareWithLoading');
$loading.removeClass('hidden') $loading.removeClass('hidden')
.addClass('inlineblock'); .addClass('inlineblock');
var $remoteShareInfo = this.$el.find('.shareWithRemoteInfo');
$remoteShareInfo.addClass('hidden');
this.model.addShare(s.item.value, {success: function() { this.model.addShare(s.item.value, {success: function() {
$(e.target).val('') $(e.target).val('')
.attr('disabled', false); .attr('disabled', false);
$loading.addClass('hidden') $loading.addClass('hidden')
.removeClass('inlineblock'); .removeClass('inlineblock');
$remoteShareInfo.removeClass('hidden');
}, error: function(obj, msg) { }, error: function(obj, msg) {
OC.Notification.showTemporary(msg); OC.Notification.showTemporary(msg);
$(e.target).attr('disabled', false) $(e.target).attr('disabled', false)
.autocomplete('search', $(e.target).val()); .autocomplete('search', $(e.target).val());
$loading.addClass('hidden') $loading.addClass('hidden')
.removeClass('inlineblock'); .removeClass('inlineblock');
$remoteShareInfo.removeClass('hidden');
}}); }});
}, },