diff options
author | blizzz <blizzz@owncloud.com> | 2013-03-28 01:54:16 +0400 |
---|---|---|
committer | blizzz <blizzz@owncloud.com> | 2013-03-28 01:54:16 +0400 |
commit | 4742d0eb9458bdcb20a948a23a38f82d0f4d07ee (patch) | |
tree | 9df90f763150e499518f7dc59521e10986e478b4 | |
parent | 4d50a21eb49c834c54a46c2dd845d836573de472 (diff) | |
parent | c901709d53edaec235a0bd8dfb1e9ae8e6e35fff (diff) |
Merge pull request #2602 from owncloud/fix_share_with_displayname
Fix share with displayname
-rw-r--r-- | core/js/share.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/js/share.js b/core/js/share.js index 8e767663f12..8ef76e2d082 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -271,7 +271,7 @@ OC.Share={ } var collectionList = $('#shareWithList li').filterAttr('data-collection', item); if (collectionList.length > 0) { - $(collectionList).append(', '+shareWith); + $(collectionList).append(', '+shareWithDisplayName); } else { var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+'</li>'; $('#shareWithList').prepend(html); @@ -383,7 +383,7 @@ OC.Share={ } $(document).ready(function() { - + if(typeof monthNames != 'undefined'){ $.datepicker.setDefaults({ monthNames: monthNames, @@ -421,7 +421,7 @@ $(document).ready(function() { $(this).click(function(event) { var target = $(event.target); - var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon') + var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon') && !target.closest('#ui-datepicker-div').length; if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) { OC.Share.hideDropDown(); @@ -569,7 +569,7 @@ $(document).ready(function() { }); } }); - + $(document).on('change', '#dropdown #expirationDate', function() { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); |