summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/js
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2014-05-23 06:41:34 -0400
committerBjörn Schießle <schiessle@owncloud.com>2014-05-23 06:41:34 -0400
commit71e1d919de274e30aa043dc6cae67d4e993b2f26 (patch)
tree5c96aa32ef576133894fcb3c9e03a6e19fdf7fe5 /apps/files_sharing/js
parent0b0e038b8bedd850d3c87796a1e6b46f554afa97 (diff)
parent3b279c9056087cada0d9bcc4eb75a15a807b426f (diff)
downloadnextcloud-server-71e1d919de274e30aa043dc6cae67d4e993b2f26.tar.gz
nextcloud-server-71e1d919de274e30aa043dc6cae67d4e993b2f26.zip
Merge pull request #8675 from owncloud/sharing-improvements
Sharing improvements
Diffstat (limited to 'apps/files_sharing/js')
-rw-r--r--apps/files_sharing/js/share.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 1b04097ccb1..e9889babaaa 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -31,8 +31,8 @@ $(document).ready(function() {
// we create a share notification action to inform the user about files
// shared with him otherwise we just update the existing share action.
var allShared;
+ var $fileList = $(this);
if (oc_appconfig.core.sharingDisabledForUser) {
- var $fileList = $(this);
allShared = $fileList.find('[data-share-owner]');
var shareNotification = '<a class="action action-share-notification permanent"' +
' data-action="Share-Notification" href="#" original-title="">' +
@@ -40,8 +40,13 @@ $(document).ready(function() {
$(allShared).find('.fileactions').append(function() {
var owner = $(this).closest('tr').attr('data-share-owner');
var shareBy = t('files_sharing', 'Shared by {owner}', {owner: owner});
- return shareNotification + '<span> ' + shareBy + '</span></span>';
+ var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>');
+ $result.on('click', function() {
+ return false;
+ });
+ return $result;
});
+
} else {
allShared = $fileList.find('[data-share-owner] [data-Action="Share"]');
allShared.addClass('permanent');