From d36f2af1613223f2ef325cec606591cbc290cfba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 22 Jan 2019 15:29:45 +0100 Subject: [PATCH] Fix integration of social sharing into the link popover menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/js/sharedialoglinkshareview.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 716df70c376..91101e47b2e 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -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 } }