Merge pull request #286 from smeeckaert/master

Debug distant url
Julienh · Mar 3, 2016 · 00a9bab · 00a9bab
2 parents b7886dc + 4af65bf
commit 00a9bab
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/dist/jquery.sharrre.min.js b/dist/jquery.sharrre.min.js
diff --git a/index.html b/index.html
@@ -110,7 +110,7 @@ <h1>All standard buttons (without counter)</h1>
 <link type="text/css" rel="stylesheet"
       href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 <script>
-    var list = ['facebook', 'twitter', 'tumblr', 'reddit', 'twitterFollow'];
+    var list = ['facebook', 'twitter', 'tumblr', 'reddit', 'twitterFollow', 'googlePlus'];
     $(function () {
         $('#demo-custom').sharrre({
             share: {

diff --git a/jquery.sharrre.min.js b/jquery.sharrre.min.js
diff --git a/src/js/jquery.sharrre.js b/src/js/jquery.sharrre.js
@@ -1,6 +1,6 @@
 /*!
  *  Sharrre.com - Make your sharing widget!
- *  Version: 2.0.0
+ *  Version: 2.0.1
  *  Author: Julien Hany
  *  License: MIT http://en.wikipedia.org/wiki/MIT_License or GPLv2 http://en.wikipedia.org/wiki/GNU_General_Public_License
  */

diff --git a/src/js/platform/googlePlus.js b/src/js/platform/googlePlus.js
@@ -47,8 +47,8 @@ SharrrePlatform.register("googlePlus", function (options) {
         tracking: function () {
         },
         popup: function (opt) {
-            window.open("https://plus.google.com/share?hl=" + opt.buttons.googlePlus.lang +
-                "&url=" + encodeURIComponent((opt.buttons.googlePlus.url !== '' ? opt.buttons.googlePlus.url : opt.url)),
+            window.open("https://plus.google.com/share?hl=" + this.settings.lang +
+                "&url=" + encodeURIComponent((this.settings.url !== '' ? this.settings.url : opt.url)),
                 "", "toolbar=0, status=0, width=" + this.settings.popup.width + ", height=" + this.settings.popup.height);
         }
     }

diff --git a/src/js/platform/linkedin.js b/src/js/platform/linkedin.js
@@ -43,7 +43,7 @@ SharrrePlatform.register("linkedin", function (options) {
         },
         popup: function (opt) {
             window.open('https://www.linkedin.com/cws/share?url=' +
-            encodeURIComponent((opt.buttons.linkedin.url !== '' ? opt.buttons.linkedin.url : opt.url)) +
+            encodeURIComponent((this.settings.url !== '' ? this.settings.url : opt.url)) +
             '&token=&isFramed=true', 'linkedin', 'toolbar=no, width=' + this.settings.popup.width + ", height=" + this.settings.popup.height);
         }
     }

diff --git a/src/js/platform/pinterest.js b/src/js/platform/pinterest.js
@@ -42,9 +42,9 @@ SharrrePlatform.register("pinterest", function (options) {
         },
         popup: function (opt) {
             window.open('https://pinterest.com/pin/create/button/?url=' +
-                encodeURIComponent((opt.buttons.pinterest.url !== '' ? opt.buttons.pinterest.url : opt.url)) +
-                '&media=' + encodeURIComponent(opt.buttons.pinterest.media) +
-                '&description=' + opt.buttons.pinterest.description, 'pinterest',
+                encodeURIComponent((this.settings.url !== '' ? this.settings.url : opt.url)) +
+                '&media=' + encodeURIComponent(this.settings.media) +
+                '&description=' + this.settings.description, 'pinterest',
                 'toolbar=no,width=' + this.settings.popup.width + ", height=" + this.settings.popup.height);
         }
     }

diff --git a/src/js/platform/stumbleupon.js b/src/js/platform/stumbleupon.js
@@ -48,7 +48,7 @@ SharrrePlatform.register("stumbleupon", function (options) {
             },
             popup: function (opt) {
                 window.open('https://www.stumbleupon.com/badge/?url=' +
-                    encodeURIComponent((opt.buttons.stumbleupon.url !== '' ? opt.buttons.stumbleupon.url : opt.url)),
+                    encodeURIComponent((this.settings.url !== '' ? this.settings.url : opt.url)),
                     'stumbleupon', 'toolbar=no, width=' + this.settings.popup.width + ", height=" + this.settings.popup.height);
             }
         };