';
if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
html += ''+t('core', 'Shared with you and the group {group} by {owner}', {group: escapeHTML(data.reshare.share_with), owner: escapeHTML(data.reshare.displayname_owner)})+'';
@@ -381,11 +381,13 @@ OC.Share={
});
html += '';
+ html += '';
html += '
';
html += '
';
var linksAllowed = $('#allowShareWithLink').val() === 'yes';
if (link && linksAllowed) {
- html += '
';
+ html += '
';
+ html += '';
html += '';
html += ' ';
@@ -398,10 +400,12 @@ OC.Share={
html += '';
html += '
';
html += '';
+ html += '';
html += '
';
if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
html += '
';
+ html += '';
html += '';
html += '';
html += '
';
if (possiblePermissions & OC.PERMISSION_CREATE) {
- html += '';
+ html += '';
}
if (possiblePermissions & OC.PERMISSION_UPDATE) {
- html += '';
+ html += '';
}
if (possiblePermissions & OC.PERMISSION_DELETE) {
- html += '';
+ html += '';
}
html += '
';
html += '';
@@ -810,6 +827,18 @@ $(document).ready(function() {
var itemSource = $('#dropdown').data('item-source');
var shareType = $li.data('share-type');
var shareWith = $li.attr('data-share-with');
+ var $button = $(this);
+
+ if (!$button.is('a')) {
+ $button = $button.closest('a');
+ }
+
+ if ($button.hasClass('icon-loading-small')) {
+ // deletion in progress
+ return false;
+ }
+ $button.empty().addClass('icon-loading-small');
+
OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
$li.remove();
var index = OC.Share.itemShares[shareType].indexOf(shareWith);
@@ -822,6 +851,7 @@ $(document).ready(function() {
$('#expiration').hide('blind');
}
});
+
return false;
});
@@ -863,9 +893,17 @@ $(document).ready(function() {
});
$(document).on('change', '#dropdown #linkCheckbox', function() {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- var itemSourceName = $('#dropdown').data('item-source-name');
+ var $dropDown = $('#dropdown');
+ var itemType = $dropDown.data('item-type');
+ var itemSource = $dropDown.data('item-source');
+ var itemSourceName = $dropDown.data('item-source-name');
+ var $loading = $dropDown.find('#link .icon-loading-small');
+ var $button = $(this);
+
+ if (!$loading.hasClass('hidden')) {
+ // already in progress
+ return false;
+ }
if (this.checked) {
var expireDateString = '';
@@ -880,7 +918,14 @@ $(document).ready(function() {
}
// Create a link
if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
+ $loading.removeClass('hidden');
+ $button.addClass('hidden');
+ $button.prop('disabled', true);
+
OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expireDateString, function(data) {
+ $loading.addClass('hidden');
+ $button.removeClass('hidden');
+ $button.prop('disabled', false);
OC.Share.showLink(data.token, null, itemSource);
$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
OC.Share.updateIcon(itemType, itemSource);
@@ -897,7 +942,13 @@ $(document).ready(function() {
OC.Share.hideLink();
$('#expiration').hide('blind');
if ($('#linkText').val() !== '') {
+ $loading.removeClass('hidden');
+ $button.addClass('hidden');
+ $button.prop('disabled', true);
OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+ $loading.addClass('hidden');
+ $button.removeClass('hidden');
+ $button.prop('disabled', false);
OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
OC.Share.updateIcon(itemType, itemSource);
@@ -918,15 +969,23 @@ $(document).ready(function() {
$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
// Gather data
+ var $dropDown = $('#dropdown');
var allowPublicUpload = $(this).is(':checked');
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- var itemSourceName = $('#dropdown').data('item-source-name');
+ var itemType = $dropDown.data('item-type');
+ var itemSource = $dropDown.data('item-source');
+ var itemSourceName = $dropDown.data('item-source-name');
var expirationDate = '';
if ($('#expirationCheckbox').is(':checked') === true) {
expirationDate = $( "#expirationDate" ).val();
}
var permissions = 0;
+ var $button = $(this);
+ var $loading = $dropDown.find('#allowPublicUploadWrapper .icon-loading-small');
+
+ if (!$loading.hasClass('hidden')) {
+ // already in progress
+ return false;
+ }
// Calculate permissions
if (allowPublicUpload) {
@@ -936,7 +995,13 @@ $(document).ready(function() {
}
// Update the share information
+ $button.addClass('hidden');
+ $button.prop('disabled', true);
+ $loading.removeClass('hidden');
OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
+ $loading.addClass('hidden');
+ $button.removeClass('hidden');
+ $button.prop('disabled', false);
});
});
@@ -948,6 +1013,7 @@ $(document).ready(function() {
var itemSourceName = $('#dropdown').data('item-source-name');
var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
var permissions = 0;
+ var $loading = $('#showPassword .icon-loading-small');
// Calculate permissions
if (allowPublicUpload) {
@@ -956,8 +1022,10 @@ $(document).ready(function() {
permissions = OC.PERMISSION_READ;
}
-
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName);
+ $loading.removeClass('hidden');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName).then(function() {
+ $loading.addClass('hidden');
+ });
} else {
$('#linkPassText').focus();
}
@@ -973,6 +1041,7 @@ $(document).ready(function() {
var itemSource = dropDown.data('item-source');
var itemSourceName = $('#dropdown').data('item-source-name');
var permissions = 0;
+ var $loading = dropDown.find('#linkPass .icon-loading-small');
// Calculate permissions
if (allowPublicUpload) {
@@ -981,7 +1050,9 @@ $(document).ready(function() {
permissions = OC.PERMISSION_READ;
}
+ $loading.removeClass('hidden');
OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function(data) {
+ $loading.addClass('hidden');
linkPassText.val('');
linkPassText.attr('placeholder', t('core', 'Password protected'));