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

Merge pull request #13738 from nextcloud/bugfix/noid/socialsharing 

Fix social sharing apps integration
This commit is contained in:
Roeland Jago Douma 2019-01-23 09:54:35 +01:00 committed by GitHub
parent 2ba75ac9b0 6fdc5092e5
commit 308d5d54de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/dist/share_backend.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/share_backend.js.map vendored
View File

File diff suppressed because one or more lines are too long

28
core/js/sharedialoglinkshareview.js
View File

@ -579,19 +579,6 @@
!this.model.isFolder()
&& this.model.updatePermissionPossible();
var social = [];
OC.Share.Social.Collection.each(function(model) {
var url = model.get('url');
url = url.replace('{{reference}}', link);
social.push({
url: url,
label: t('core', 'Share to {name}', {name: model.get('name')}),
name: model.get('name'),
iconClass: model.get('iconClass'),
newWindow: model.get('newWindow')
});
});
var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
// what if there is another date picker on that page?
@ -612,7 +599,6 @@
}
var popoverBase = {
social: social,
urlLabel: t('core', 'Link'),
hideDownloadLabel: t('core', 'Hide download'),
enablePasswordLabel: isPasswordEnforced ? t('core', 'Password protection enforced') : t('core', 'Password protect'),
@ -653,8 +639,20 @@
var linkShares = this.getShareeList();
if(_.isArray(linkShares)) {
for (var i = 0; i < linkShares.length; i++) {
var social = [];
OC.Share.Social.Collection.each(function (model) {
var url = model.get('url');
url = url.replace('{{reference}}', linkShares[i].shareLinkURL);
social.push({
url: url,
label: t('core', 'Share to {name}', {name: model.get('name')}),
name: model.get('name'),
iconClass: model.get('iconClass'),
newWindow: model.get('newWindow')
});
});
var popover = this.getPopoverObject(linkShares[i])
linkShares[i].popoverMenu = this.popoverMenuTemplate(_.extend({}, popoverBase, popover));
linkShares[i].popoverMenu = this.popoverMenuTemplate(_.extend({}, popoverBase, popover, {social: social}));
linkShares[i].pendingPopoverMenu = pendingPopoverMenu
}
}