summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-12-02 15:53:38 +0100
committerGitHub <noreply@github.com>2016-12-02 15:53:38 +0100
commitdb56df18939fcdadd2b19ebab7db92a77e938c8d (patch)
treeb66be8c6f88ff0bd58deb3646179c51f3868f166 /core
parent865181d32aac9c469c2918fd27a53a018b6972c9 (diff)
parent0853f0e7a8ec49c9a58a727fd443e0e1e502fc92 (diff)
downloadnextcloud-server-db56df18939fcdadd2b19ebab7db92a77e938c8d.tar.gz
nextcloud-server-db56df18939fcdadd2b19ebab7db92a77e938c8d.zip
Merge pull request #2469 from nextcloud/fix-loading-icon-background
Remove white background from loading icon
Diffstat (limited to 'core')
-rw-r--r--core/js/sharedialogview.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index f83a2675958..60cd97fb572 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -134,6 +134,8 @@
var $loading = this.$el.find('.shareWithLoading');
$loading.removeClass('hidden');
$loading.addClass('inlineblock');
+ var $remoteShareInfo = this.$el.find('.shareWithRemoteInfo');
+ $remoteShareInfo.addClass('hidden');
$.get(
OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees',
{
@@ -145,6 +147,7 @@
function (result) {
$loading.addClass('hidden');
$loading.removeClass('inlineblock');
+ $remoteShareInfo.removeClass('hidden');
if (result.ocs.meta.statuscode === 100) {
var users = result.ocs.data.exact.users.concat(result.ocs.data.users);
var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
@@ -256,6 +259,7 @@
).fail(function() {
$loading.addClass('hidden');
$loading.removeClass('inlineblock');
+ $remoteShareInfo.removeClass('hidden');
OC.Notification.show(t('core', 'An error occurred. Please try again'));
window.setTimeout(OC.Notification.hide, 5000);
});
@@ -298,18 +302,22 @@
var $loading = this.$el.find('.shareWithLoading');
$loading.removeClass('hidden')
.addClass('inlineblock');
+ var $remoteShareInfo = this.$el.find('.shareWithRemoteInfo');
+ $remoteShareInfo.addClass('hidden');
this.model.addShare(s.item.value, {success: function() {
$(e.target).val('')
.attr('disabled', false);
$loading.addClass('hidden')
.removeClass('inlineblock');
+ $remoteShareInfo.removeClass('hidden');
}, error: function(obj, msg) {
OC.Notification.showTemporary(msg);
$(e.target).attr('disabled', false)
.autocomplete('search', $(e.target).val());
$loading.addClass('hidden')
.removeClass('inlineblock');
+ $remoteShareInfo.removeClass('hidden');
}});
},