Introduce sharing option for dynamic mode

sachinchoolur · Oct 3, 2017 · 08e91d3 · 08e91d3
1 parent d4e342c
commit 08e91d3
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 28 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "lightgallery",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "description": "A lightweight, customizable, modular, responsive, lightbox gallery plugin for jQuery.",
     "main": [
         "dist/js/lightgallery.min.js",

diff --git a/dist/css/lg-fb-comment-box.css b/dist/css/lg-fb-comment-box.css
@@ -1,4 +1,4 @@
-/*! lightgallery - v1.6.1 - 2017-09-18
+/*! lightgallery - v1.6.2 - 2017-10-03
 * http://sachinchoolur.github.io/lightGallery/
 * Copyright (c) 2017 Sachin N; Licensed GPLv3 */
 .lg-outer.fb-comments .lg-img-wrap, .lg-outer.fb-comments .lg-video-cont {

diff --git a/dist/css/lg-transitions.css b/dist/css/lg-transitions.css
diff --git a/dist/css/lightgallery.css b/dist/css/lightgallery.css
diff --git a/dist/js/lightgallery-all.js b/dist/js/lightgallery-all.js
@@ -1,7 +1,7 @@
-/*! lightgallery - v1.6.1 - 2017-09-18
+/*! lightgallery - v1.6.2 - 2017-10-03
 * http://sachinchoolur.github.io/lightGallery/
 * Copyright (c) 2017 Sachin N; Licensed GPLv3 */
-/*! lightgallery - v1.6.1 - 2017-09-18
+/*! lightgallery - v1.6.2 - 2017-10-03
 * http://sachinchoolur.github.io/lightGallery/
 * Copyright (c) 2017 Sachin N; Licensed GPLv3 */
 (function (root, factory) {
@@ -3222,9 +3222,9 @@
 
 }));
 
-/*! lg-share - v1.0.2 - 2016-11-26
+/*! lg-share - v1.1.0 - 2017-10-03
 * http://sachinchoolur.github.io/lightGallery
-* Copyright (c) 2016 Sachin N; Licensed GPLv3 */
+* Copyright (c) 2017 Sachin N; Licensed GPLv3 */
 
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -3292,19 +3292,32 @@
 
         _this.core.$el.on('onAfterSlide.lg.tm', function(event, prevIndex, index) {
 
-            setTimeout(function() { 
-                $('#lg-share-facebook').attr('href', 'https://www.facebook.com/sharer/sharer.php?u=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-facebook-share-url') || window.location.href)));
+            setTimeout(function() {
+
+                $('#lg-share-facebook').attr('href', 'https://www.facebook.com/sharer/sharer.php?u=' + (encodeURIComponent(_this.getSahreProps(index, 'facebookShareUrl') || window.location.href)));
 
-                $('#lg-share-twitter').attr('href', 'https://twitter.com/intent/tweet?text=' + _this.core.$items.eq(index).attr('data-tweet-text') + '&url=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-twitter-share-url') || window.location.href)));
+                $('#lg-share-twitter').attr('href', 'https://twitter.com/intent/tweet?text=' + _this.getSahreProps(index, 'tweetText') + '&url=' + (encodeURIComponent(_this.getSahreProps(index, 'twitterShareUrl') || window.location.href)));
 
-                $('#lg-share-googleplus').attr('href', 'https://plus.google.com/share?url=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-googleplus-share-url') || window.location.href)));
+                $('#lg-share-googleplus').attr('href', 'https://plus.google.com/share?url=' + (encodeURIComponent(_this.getSahreProps(index, 'googleplusShareUrl') || window.location.href)));
 
-                $('#lg-share-pinterest').attr('href', 'http://www.pinterest.com/pin/create/button/?url=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-pinterest-share-url') || window.location.href)) + '&media=' + encodeURIComponent(_this.core.$items.eq(index).attr('href') || _this.core.$items.eq(index).attr('data-src')) + '&description=' + _this.core.$items.eq(index).attr('data-pinterest-text'));
+                $('#lg-share-pinterest').attr('href', 'http://www.pinterest.com/pin/create/button/?url=' + (encodeURIComponent(_this.getSahreProps(index, 'pinterestShareUrl') || window.location.href)) + '&media=' + encodeURIComponent(_this.getSahreProps(index, 'src')) + '&description=' + _this.getSahreProps(index, 'pinterestText'));
 
             }, 100);
         });
     };
 
+    Share.prototype.getSahreProps = function(index, prop){
+        var shareProp = '';
+        if(this.core.s.dynamic) {
+            shareProp = this.core.s.dynamicEl[index][prop];
+        } else {
+            var _href = this.core.$items.eq(index).attr('href');
+            var _prop = this.core.$items.eq(index).data(prop);
+            shareProp = prop === 'src' ? _href || _prop : _prop;
+        }
+        return shareProp;
+    };
+
     Share.prototype.destroy = function() {
 
     };

diff --git a/dist/js/lightgallery-all.min.js b/dist/js/lightgallery-all.min.js
diff --git a/dist/js/lightgallery.js b/dist/js/lightgallery.js
@@ -1,4 +1,4 @@
-/*! lightgallery - v1.6.1 - 2017-09-18
+/*! lightgallery - v1.6.2 - 2017-10-03
 * http://sachinchoolur.github.io/lightGallery/
 * Copyright (c) 2017 Sachin N; Licensed GPLv3 */
 (function (root, factory) {

diff --git a/dist/js/lightgallery.min.js b/dist/js/lightgallery.min.js
diff --git a/modules/lg-share.js b/modules/lg-share.js
@@ -1,6 +1,6 @@
-/*! lg-share - v1.0.2 - 2016-11-26
+/*! lg-share - v1.1.0 - 2017-10-03
 * http://sachinchoolur.github.io/lightGallery
-* Copyright (c) 2016 Sachin N; Licensed GPLv3 */
+* Copyright (c) 2017 Sachin N; Licensed GPLv3 */
 
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -68,19 +68,32 @@
 
         _this.core.$el.on('onAfterSlide.lg.tm', function(event, prevIndex, index) {
 
-            setTimeout(function() { 
-                $('#lg-share-facebook').attr('href', 'https://www.facebook.com/sharer/sharer.php?u=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-facebook-share-url') || window.location.href)));
+            setTimeout(function() {
 
-                $('#lg-share-twitter').attr('href', 'https://twitter.com/intent/tweet?text=' + _this.core.$items.eq(index).attr('data-tweet-text') + '&url=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-twitter-share-url') || window.location.href)));
+                $('#lg-share-facebook').attr('href', 'https://www.facebook.com/sharer/sharer.php?u=' + (encodeURIComponent(_this.getSahreProps(index, 'facebookShareUrl') || window.location.href)));
 
-                $('#lg-share-googleplus').attr('href', 'https://plus.google.com/share?url=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-googleplus-share-url') || window.location.href)));
+                $('#lg-share-twitter').attr('href', 'https://twitter.com/intent/tweet?text=' + _this.getSahreProps(index, 'tweetText') + '&url=' + (encodeURIComponent(_this.getSahreProps(index, 'twitterShareUrl') || window.location.href)));
 
-                $('#lg-share-pinterest').attr('href', 'http://www.pinterest.com/pin/create/button/?url=' + (encodeURIComponent(_this.core.$items.eq(index).attr('data-pinterest-share-url') || window.location.href)) + '&media=' + encodeURIComponent(_this.core.$items.eq(index).attr('href') || _this.core.$items.eq(index).attr('data-src')) + '&description=' + _this.core.$items.eq(index).attr('data-pinterest-text'));
+                $('#lg-share-googleplus').attr('href', 'https://plus.google.com/share?url=' + (encodeURIComponent(_this.getSahreProps(index, 'googleplusShareUrl') || window.location.href)));
+
+                $('#lg-share-pinterest').attr('href', 'http://www.pinterest.com/pin/create/button/?url=' + (encodeURIComponent(_this.getSahreProps(index, 'pinterestShareUrl') || window.location.href)) + '&media=' + encodeURIComponent(_this.getSahreProps(index, 'src')) + '&description=' + _this.getSahreProps(index, 'pinterestText'));
 
             }, 100);
         });
     };
 
+    Share.prototype.getSahreProps = function(index, prop){
+        var shareProp = '';
+        if(this.core.s.dynamic) {
+            shareProp = this.core.s.dynamicEl[index][prop];
+        } else {
+            var _href = this.core.$items.eq(index).attr('href');
+            var _prop = this.core.$items.eq(index).data(prop);
+            shareProp = prop === 'src' ? _href || _prop : _prop;
+        }
+        return shareProp;
+    };
+
     Share.prototype.destroy = function() {
 
     };

diff --git a/modules/lg-share.min.js b/modules/lg-share.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lightgallery",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "description": "A lightweight, customizable, modular, responsive, lightbox gallery plugin for jQuery.",
     "keywords": [
         "jquery-plugin",