Upgrade share plugin

sachinchoolur · Jan 14, 2018 · 37b103e · 37b103e
1 parent 1d8f126
commit 37b103e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "lightgallery.js",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Full featured lightbox gallery. Zero dependencies",
   "main": [
       "dist/js/lightgallery.min.js",

diff --git a/demo/js/lg-share.js b/demo/js/lg-share.js
@@ -1,5 +1,5 @@
 /**!
- * lg-share.js | 1.0.0 | October 5th 2016
+ * lg-share.js | 1.2.0 | January 14th 2018
  * http://sachinchoolur.github.io/lg-share.js
  * Copyright (c) 2016 Sachin N; 
  * @license GPLv3 
@@ -45,6 +45,12 @@
         pinterestDropdownText: 'Pinterest'
     };
 
+    function toCamelCase(input) {
+        return input.toLowerCase().replace(/-(.)/g, function (match, group1) {
+            return group1.toUpperCase();
+        });
+    }
+
     var Share = function Share(element) {
 
         this.el = element;
@@ -85,17 +91,40 @@
         utils.on(_this.core.el, 'onAfterSlide.lgtm', function (event) {
 
             setTimeout(function () {
-                document.getElementById('lg-share-facebook').setAttribute('href', 'https://www.facebook.com/sharer/sharer.php?u=' + encodeURIComponent(_this.core.items[event.detail.index].getAttribute('data-facebook-share-url') || window.location.href));
-
-                document.getElementById('lg-share-twitter').setAttribute('href', 'https://twitter.com/intent/tweet?text=' + _this.core.items[event.detail.index].getAttribute('data-tweet-text') + '&url=' + encodeURIComponent(_this.core.items[event.detail.index].getAttribute('data-twitter-share-url') || window.location.href));
-
-                document.getElementById('lg-share-googleplus').setAttribute('href', 'https://plus.google.com/share?url=' + encodeURIComponent(_this.core.items[event.detail.index].getAttribute('data-googleplus-share-url') || window.location.href));
-
-                document.getElementById('lg-share-pinterest').setAttribute('href', 'http://www.pinterest.com/pin/create/button/?url=' + encodeURIComponent(_this.core.items[event.detail.index].getAttribute('data-pinterest-share-url') || window.location.href) + '&media=' + encodeURIComponent(_this.core.items[event.detail.index].getAttribute('href') || _this.core.items[event.detail.index].getAttribute('data-src')) + '&description=' + _this.core.items[event.detail.index].getAttribute('data-pinterest-text'));
+                if (_this.core.s.facebook) {
+                    document.getElementById('lg-share-facebook').setAttribute('href', 'https://www.facebook.com/sharer/sharer.php?u=' + _this.getSharePropsUrl(event.detail.index, 'data-facebook-share-url'));
+                }
+                if (_this.core.s.twitter) {
+                    document.getElementById('lg-share-twitter').setAttribute('href', 'https://twitter.com/intent/tweet?text=' + _this.getShareProps(event.detail.index, 'data-tweet-text') + '&url=' + _this.getSharePropsUrl(event.detail.index, 'data-twitter-share-url'));
+                }
+                if (_this.core.s.googlePlus) {
+                    document.getElementById('lg-share-googleplus').setAttribute('href', 'https://plus.google.com/share?url=' + _this.getSharePropsUrl(event.detail.index, 'data-googleplus-share-url'));
+                }
+                if (_this.core.s.pinterest) {
+                    document.getElementById('lg-share-pinterest').setAttribute('href', 'http://www.pinterest.com/pin/create/button/?url=' + _this.getSharePropsUrl(event.detail.index, 'data-pinterest-share-url') + '&media=' + encodeURIComponent(_this.getShareProps(event.detail.index, 'href') || _this.getShareProps(event.detail.index, 'data-src')) + '&description=' + _this.getShareProps(event.detail.index, 'data-pinterest-text'));
+                }
             }, 100);
         });
     };
 
+    Share.prototype.getSharePropsUrl = function (index, prop) {
+        var shareProp = this.getShareProps(index, prop);
+        if (!shareProp) {
+            shareProp = window.location.href;
+        }
+        return encodeURIComponent(shareProp);
+    };
+
+    Share.prototype.getShareProps = function (index, prop) {
+        var shareProp = '';
+        if (this.core.s.dynamic) {
+            shareProp = this.core.items[index][toCamelCase(prop.replace('data-', ''))];
+        } else if (this.core.items[index].getAttribute(prop)) {
+            shareProp = this.core.items[index].getAttribute(prop);
+        }
+        return shareProp;
+    };
+
     Share.prototype.destroy = function () {};
 
     window.lgModules.share = Share;

diff --git a/demo/js/lg-share.min.js b/demo/js/lg-share.min.js
diff --git a/dist/js/lightgallery.js b/dist/js/lightgallery.js
@@ -1,5 +1,5 @@
 /**!
- * lightgallery.js | 1.0.1 | December 22nd 2016
+ * lightgallery.js | 1.0.2 | January 14th 2018
  * http://sachinchoolur.github.io/lightgallery.js/
  * Copyright (c) 2016 Sachin N; 
  * @license GPLv3 

diff --git a/dist/js/lightgallery.min.js b/dist/js/lightgallery.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lightgallery.js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Full featured lightbox gallery. Zero dependencies",
   "keywords": [
     "gallery",