Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: dist/vue-social-sharing.min.js
nicolasbeauvais · Feb 18, 2017 · 491499d · 491499d
2 parents 78b4b1d + 3af3423
commit 491499d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/dist/vue-social-sharing.common.js b/dist/vue-social-sharing.common.js
@@ -49,7 +49,7 @@ var networks = {
   },
 
   pinterest: {
-    sharer: 'https://pinterest.com/pin/create/button/?url=@url&description=@title'
+    sharer: 'https://pinterest.com/pin/create/button/?url=@url&media=@media&description=@title'
   },
 
   reddit: {
@@ -138,6 +138,14 @@ var SocialSharing = {
     googleKey: {
       type: String,
       default: undefined
+    },
+
+    /** Pinterest Media URL.
+     * Specifies the image/media to be used.
+     */
+    media: {
+      type: String,
+      default: ''
     }
   },
 
@@ -183,6 +191,7 @@ var SocialSharing = {
         .replace(/@description/g, this.description)
         .replace(/@quote/g, this.quote)
         .replace(/@hashtags/g, this.hashtags)
+        .replace(/@media/g, this.media)
         .replace(/@twitteruser/g, this.twitterUser ? '&via=' + this.twitterUser : '');
     },
 

diff --git a/dist/vue-social-sharing.js b/dist/vue-social-sharing.js
@@ -53,7 +53,7 @@ var networks = {
   },
 
   pinterest: {
-    sharer: 'https://pinterest.com/pin/create/button/?url=@url&description=@title'
+    sharer: 'https://pinterest.com/pin/create/button/?url=@url&media=@media&description=@title'
   },
 
   reddit: {
@@ -142,6 +142,14 @@ var SocialSharing = {
     googleKey: {
       type: String,
       default: undefined
+    },
+
+    /** Pinterest Media URL.
+     * Specifies the image/media to be used.
+     */
+    media: {
+      type: String,
+      default: ''
     }
   },
 
@@ -187,6 +195,7 @@ var SocialSharing = {
         .replace(/@description/g, this.description)
         .replace(/@quote/g, this.quote)
         .replace(/@hashtags/g, this.hashtags)
+        .replace(/@media/g, this.media)
         .replace(/@twitteruser/g, this.twitterUser ? '&via=' + this.twitterUser : '');
     },
 

diff --git a/dist/vue-social-sharing.min.js b/dist/vue-social-sharing.min.js
diff --git a/src/social-sharing.js b/src/social-sharing.js
@@ -20,7 +20,7 @@ export const networks = {
   },
 
   pinterest: {
-    sharer: 'https://pinterest.com/pin/create/button/?url=@url&description=@title'
+    sharer: 'https://pinterest.com/pin/create/button/?url=@url&media=@media&description=@title'
   },
 
   reddit: {
@@ -109,6 +109,14 @@ export default {
     googleKey: {
       type: String,
       default: undefined
+    },
+
+    /** Pinterest Media URL.
+     * Specifies the image/media to be used.
+     */
+    media: {
+      type: String,
+      default: ''
     }
   },
 
@@ -154,6 +162,7 @@ export default {
         .replace(/@description/g, this.description)
         .replace(/@quote/g, this.quote)
         .replace(/@hashtags/g, this.hashtags)
+        .replace(/@media/g, this.media)
         .replace(/@twitteruser/g, this.twitterUser ? '&via=' + this.twitterUser : '');
     },