diff --git a/socialsharing_diaspora/appinfo/info.xml b/socialsharing_diaspora/appinfo/info.xml index 6d30c0b..8849221 100644 --- a/socialsharing_diaspora/appinfo/info.xml +++ b/socialsharing_diaspora/appinfo/info.xml @@ -10,7 +10,7 @@ https://raw.githubusercontent.com/nextcloud/socialsharing/master/socialsharing_diaspora/screenshots/preview.png SocialSharingDiaspora - + https://github.com/nextcloud/socialsharing https://github.com/nextcloud/socialsharing diff --git a/socialsharing_diaspora/img/diaspora.svg b/socialsharing_diaspora/img/diaspora.svg index af7d184..65036f0 100644 --- a/socialsharing_diaspora/img/diaspora.svg +++ b/socialsharing_diaspora/img/diaspora.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/socialsharing_diaspora/js/socialsharingdiaspora.js b/socialsharing_diaspora/js/socialsharingdiaspora.js index 79088b9..c6af996 100644 --- a/socialsharing_diaspora/js/socialsharingdiaspora.js +++ b/socialsharing_diaspora/js/socialsharingdiaspora.js @@ -2,6 +2,7 @@ * @copyright 2017, Roeland Jago Douma * * @author Roeland Jago Douma + * @author John Molakvoæ * * @license GNU AGPL version 3 or any later version * @@ -20,12 +21,12 @@ * */ -(function() { - var diaspora = new OC.Share.Social.Model({ - key: 'diaspora', - url: 'https://share.diasporafoundation.org/?url={{reference}}', - name: 'Diaspora', - iconClass: 'icon-social-diaspora' - }); - OC.Share.Social.Collection.add(diaspora); -})(); +window.addEventListener('DOMContentLoaded', () => { + if (OCA.Sharing && OCA.Sharing.ExternalLinkActions) { + OCA.Sharing.ExternalLinkActions.registerAction({ + url: link =>`https://share.diasporafoundation.org/?url=${link}`, + name: t('socialsharing_facebook', 'Share to Diaspora'), + icon: 'icon-social-diaspora' + }); + } +}); diff --git a/socialsharing_email/appinfo/app.php b/socialsharing_email/appinfo/app.php index 382685f..532fef6 100644 --- a/socialsharing_email/appinfo/app.php +++ b/socialsharing_email/appinfo/app.php @@ -30,7 +30,6 @@ $loadScripts = function() use ($appName) { Util::addScript($appName, 'socialsharingemail'); - Util::addStyle($appName, 'socialsharingemail'); }; \OC::$server->getEventDispatcher()->addListener('OCP\Share::loadSocial', $loadScripts); diff --git a/socialsharing_email/appinfo/info.xml b/socialsharing_email/appinfo/info.xml index 06d637e..ad4138d 100644 --- a/socialsharing_email/appinfo/info.xml +++ b/socialsharing_email/appinfo/info.xml @@ -10,7 +10,7 @@ https://raw.githubusercontent.com/nextcloud/socialsharing/master/socialsharing_email/screenshots/preview.png SocialSharingEmail - + https://github.com/nextcloud/socialsharing https://github.com/nextcloud/socialsharing diff --git a/socialsharing_email/css/socialsharingemail.css b/socialsharing_email/css/socialsharingemail.css deleted file mode 100644 index 4fc0e15..0000000 --- a/socialsharing_email/css/socialsharingemail.css +++ /dev/null @@ -1,3 +0,0 @@ -.icon-social-email { - background-image: url('../img/email.svg'); -} diff --git a/socialsharing_email/img/email.svg b/socialsharing_email/img/email.svg deleted file mode 100644 index a6626a5..0000000 --- a/socialsharing_email/img/email.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/socialsharing_email/js/socialsharingemail.js b/socialsharing_email/js/socialsharingemail.js index 0e3bf32..8887b5e 100644 --- a/socialsharing_email/js/socialsharingemail.js +++ b/socialsharing_email/js/socialsharingemail.js @@ -2,6 +2,7 @@ * @copyright 2017, Roeland Jago Douma * * @author Roeland Jago Douma + * @author John Molakvoæ * * @license GNU AGPL version 3 or any later version * @@ -20,15 +21,12 @@ * */ -(function() { - var email = new OC.Share.Social.Model({ - key: 'email', - url: 'mailto:?subject=' + - t('socialsharing_email' , 'I shared a file with you') + - '&body={{reference}}', - name: 'Email', - iconClass: 'icon-social-email', - newWindow: false - }); - OC.Share.Social.Collection.add(email); -})(); +window.addEventListener('DOMContentLoaded', () => { + if (OCA.Sharing && OCA.Sharing.ExternalLinkActions) { + OCA.Sharing.ExternalLinkActions.registerAction({ + url: link => `mailto:?subject=${t('socialsharing_email', 'I shared a file with you')}&body=${link}`, + name: t('socialsharing_email', 'Share to email'), + icon: 'icon-mail' + }); + } +}); diff --git a/socialsharing_facebook/appinfo/info.xml b/socialsharing_facebook/appinfo/info.xml index 2e3e102..dc4a690 100644 --- a/socialsharing_facebook/appinfo/info.xml +++ b/socialsharing_facebook/appinfo/info.xml @@ -10,7 +10,7 @@ https://raw.githubusercontent.com/nextcloud/socialsharing/master/socialsharing_facebook/screenshots/preview.png SocialSharingFacebook - + https://github.com/nextcloud/socialsharing https://github.com/nextcloud/socialsharing diff --git a/socialsharing_facebook/img/facebook.svg b/socialsharing_facebook/img/facebook.svg index 6f43a34..b9c60f8 100644 --- a/socialsharing_facebook/img/facebook.svg +++ b/socialsharing_facebook/img/facebook.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/socialsharing_facebook/js/socialsharingfacebook.js b/socialsharing_facebook/js/socialsharingfacebook.js index 3f75536..3066bb1 100644 --- a/socialsharing_facebook/js/socialsharingfacebook.js +++ b/socialsharing_facebook/js/socialsharingfacebook.js @@ -2,6 +2,7 @@ * @copyright 2017, Roeland Jago Douma * * @author Roeland Jago Douma + * @author John Molakvoæ * * @license GNU AGPL version 3 or any later version * @@ -20,12 +21,12 @@ * */ -(function() { - var facebook = new OC.Share.Social.Model({ - key: 'facebook', - url: 'https://www.facebook.com/sharer/sharer.php?u={{reference}}', - name: 'Facebook', - iconClass: 'icon-social-facebook' - }); - OC.Share.Social.Collection.add(facebook); -})(); +window.addEventListener('DOMContentLoaded', () => { + if (OCA.Sharing && OCA.Sharing.ExternalLinkActions) { + OCA.Sharing.ExternalLinkActions.registerAction({ + url: link => `https://www.facebook.com/sharer/sharer.php?u=${link}`, + name: t('socialsharing_facebook', 'Share to Facebook'), + icon: 'icon-social-facebook' + }); + } +}); diff --git a/socialsharing_twitter/appinfo/info.xml b/socialsharing_twitter/appinfo/info.xml index 1dc4f01..45bce5e 100644 --- a/socialsharing_twitter/appinfo/info.xml +++ b/socialsharing_twitter/appinfo/info.xml @@ -10,7 +10,7 @@ https://raw.githubusercontent.com/nextcloud/socialsharing/master/socialsharing_twitter/screenshots/preview.png SocialSharingTwitter - + https://github.com/nextcloud/socialsharing https://github.com/nextcloud/socialsharing diff --git a/socialsharing_twitter/img/twitter.svg b/socialsharing_twitter/img/twitter.svg index 3c0b554..9fb3ec1 100644 --- a/socialsharing_twitter/img/twitter.svg +++ b/socialsharing_twitter/img/twitter.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/socialsharing_twitter/js/socialsharingtwitter.js b/socialsharing_twitter/js/socialsharingtwitter.js index 1244e14..1faa2af 100644 --- a/socialsharing_twitter/js/socialsharingtwitter.js +++ b/socialsharing_twitter/js/socialsharingtwitter.js @@ -2,6 +2,7 @@ * @copyright 2017, Roeland Jago Douma * * @author Roeland Jago Douma + * @author John Molakvoæ * * @license GNU AGPL version 3 or any later version * @@ -20,12 +21,12 @@ * */ -(function() { - var twitter = new OC.Share.Social.Model({ - key: 'twitter', - url: 'https://twitter.com/intent/tweet?url={{reference}}', - name: 'Twitter', - iconClass: 'icon-social-twitter' - }); - OC.Share.Social.Collection.add(twitter); -})(); +window.addEventListener('DOMContentLoaded', () => { + if (OCA.Sharing && OCA.Sharing.ExternalLinkActions) { + OCA.Sharing.ExternalLinkActions.registerAction({ + url: link => `https://twitter.com/intent/tweet?url=${link}`, + name: t('socialsharing_facebook', 'Share to Twitter'), + icon: 'icon-social-twitter' + }); + } +});