Handled jetpack gallery markup

Fixes #17
cipherdevgroup · Aug 20, 2015 · aef4e1d · aef4e1d
1 parent ea07280
commit aef4e1d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/js/src/wpFeatherlight.js b/js/src/wpFeatherlight.js
@@ -79,13 +79,17 @@
 	 */
 	function addCaptions() {
 		$.featherlight.prototype.afterContent = function() {
-			var object  = this.$instance,
-				target  = this.$currentTarget,
-				parent  = target.parent(),
-				caption = parent.find( '.wp-caption-text' );
+			var object    = this.$instance,
+				target    = this.$currentTarget,
+				parent    = target.parent(),
+				caption   = parent.find( '.wp-caption-text' ),
+				galParent = target.parents( '.gallery-item' ),
+				jetParent = target.parents( '.tiled-gallery-item' );
 
-			if ( parent.hasClass( 'gallery-icon' ) ) {
-				caption = target.parents( '.gallery-item' ).find( '.wp-caption-text' );
+			if ( 0 !== galParent.length ) {
+				caption = galParent.find( '.wp-caption-text' );
+			} else if ( 0 !== jetParent.length ) {
+				caption = jetParent.find( '.tiled-gallery-caption' );
 			}
 
 			object.find( '.caption' ).remove();

diff --git a/js/src/wpFeatherlight.min.js b/js/src/wpFeatherlight.min.js
diff --git a/js/wpFeatherlight.pkgd.js b/js/wpFeatherlight.pkgd.js
@@ -852,13 +852,17 @@
 	 */
 	function addCaptions() {
 		$.featherlight.prototype.afterContent = function() {
-			var object  = this.$instance,
-				target  = this.$currentTarget,
-				parent  = target.parent(),
-				caption = parent.find( '.wp-caption-text' );
-
-			if ( parent.hasClass( 'gallery-icon' ) ) {
-				caption = target.parents( '.gallery-item' ).find( '.wp-caption-text' );
+			var object    = this.$instance,
+				target    = this.$currentTarget,
+				parent    = target.parent(),
+				caption   = parent.find( '.wp-caption-text' ),
+				galParent = target.parents( '.gallery-item' ),
+				jetParent = target.parents( '.tiled-gallery-item' );
+
+			if ( 0 !== galParent.length ) {
+				caption = galParent.find( '.wp-caption-text' );
+			} else if ( 0 !== jetParent.length ) {
+				caption = jetParent.find( '.tiled-gallery-caption' );
 			}
 
 			object.find( '.caption' ).remove();