Merge pull request #63 from MachoThemes/master

update to 3.2.2

Author: giucu91

assets/css/fancybox-admin.css

@@ -511,15 +511,18 @@ a.modula-link:hover {
 
 .epsilon-toggle {
     position: relative;
+    float: left;
     user-select: none;
-    display:inline-block;
-    vertical-align: middle;
 }
 
 .epsilon-toggle__items {
     box-sizing: border-box;
 }
 
+.epsilon-toggle__items > * {
+    box-sizing: inherit;
+}
+
 .epsilon-toggle__input[type=checkbox] {
     border-radius: 2px;
     border: 2px solid #6c7781;
@@ -549,47 +552,45 @@ a.modula-link:hover {
 
 .epsilon-toggle__thumb {
     background-color: #6c7781;
+    border: 5px solid #6c7781;
     border-radius: 50%;
     display: block;
     height: 10px;
     width: 10px;
     position: absolute;
-    left: 7px;
-    top: 5px;
+    left: 4px;
+    top: 4px;
     transition: transform .2s ease;
 }
 
 .epsilon-toggle__off {
     position: absolute;
-    right: 7px;
-    top: 7px;
-    width:7px;
-    height:7px;
+    right: 6px;
+    top: 6px;
     color: #6c7781;
     fill: currentColor;
 }
 
 .epsilon-toggle__on {
     position: absolute;
-    top: 7px;
+    top: 6px;
     left: 8px;
+    border: 1px solid #fff;
     outline: 1px solid transparent;
     outline-offset: -1px;
     display: none;
-    fill:#fff;
 }
 
+
 .epsilon-toggle__input[type=checkbox]:checked + .epsilon-toggle__items .epsilon-toggle__track {
     background-color: #11a0d2;
-    border: 2px solid transparent;
+    border: 9px solid transparent;
 }
 
 .epsilon-toggle__input[type=checkbox]:checked + .epsilon-toggle__items .epsilon-toggle__thumb {
     background-color: #fff;
     border-width: 0;
     transform: translateX(18px);
-    width: 10px;
-    height: 10px;
 }
 
 .epsilon-toggle__input[type=checkbox]:checked + .epsilon-toggle__items .epsilon-toggle__off {

assets/css/fancybox.css

@@ -239,15 +239,15 @@ body.compensate-for-scrollbar {
     background: transparent;
     border: 0;
     height: 100%;
-    left: 0;
+    /*left: 0;*/
     /* Fix images beeing distorted */
     object-fit: contain;
     margin: 0;
     max-height: none;
     max-width: none;
     padding: 0;
-    position: absolute;
-    top: 0;
+    /*position: absolute;
+    top: 0;*/
     -webkit-user-select: none;
     -moz-user-select: none;
     -ms-user-select: none;

assets/js/admin.js

@@ -100,10 +100,11 @@ jQuery(function () {
         case "all":
         case "none":
         case "post":
+        case "single_gutenberg_block" :
             jQuery("#customExpressionBlock").css("display", "none");
     }
 
-    jQuery("#galleryTypeAll, #galleryTypeNone, #galleryTypePost").click(function () {
+    jQuery("#galleryTypeAll, #galleryTypeNone, #galleryTypePost, #galleryTypeGutenbergBlock").click(function () {
         jQuery("#customExpressionBlock").hide("slow");
     });
 

assets/js/jquery.fancybox.js

@@ -3178,8 +3178,31 @@
         css.width = props.width;
       }
 
+      var custom_caption_outerHeight = 0;
+
+      if($('.fancybox-custom-caption.inside-caption').length ){
+          custom_caption_outerHeight = $el.find('.fancybox-custom-caption').outerHeight();
+          if(custom_caption_outerHeight == 0){
+            custom_caption_outerHeight = 10;
+          }
+      } else {
+          custom_caption_outerHeight = ($el.find('.fancybox-image').outerHeight() - $el.find('.fancybox-image').height())/2;
+          // Seems like different border width for image requires a little trimming
+          if(custom_caption_outerHeight > 20 && custom_caption_outerHeight < 25 ){
+            custom_caption_outerHeight -= 2;
+          }
+
+          if(custom_caption_outerHeight >= 25 && custom_caption_outerHeight <= 30){
+              custom_caption_outerHeight -= 4;
+          }
+
+          if(custom_caption_outerHeight > 30){
+              custom_caption_outerHeight -= 6;
+          }
+      }
+
       if (props.height !== undefined) {
-        css.height = props.height;
+        css.height = props.height + custom_caption_outerHeight;
       }
 
       return $el.css(css);

fancybox.php

@@ -3,7 +3,7 @@
 * Plugin Name: FancyBox for WordPress
 * Plugin URI: https://wordpress.org/plugins/fancybox-for-wordpress/
 * Description: Integrates <a href="http://fancyapps.com/fancybox/3/">FancyBox 3</a> into WordPress.
-* Version: 3.2.0
+* Version: 3.2.2
 * Author: Colorlib
 * Author URI: https://colorlib.com/wp/
 * Tested up to: 5.1
@@ -36,7 +36,7 @@
  * Plugin Init
  */
 // Constants
-define( 'FBFW_VERSION', '3.2.0' );
+define( 'FBFW_VERSION', '3.2.2' );
 define( 'FBFW_PATH', plugin_dir_path( __FILE__ ) );
 define( 'FBFW_URL', plugin_dir_url( __FILE__ ) );
 define( 'FBFW_PLUGIN_BASE', plugin_basename( __FILE__ ) );
@@ -221,10 +221,10 @@ function mfbfw_init() {
                                         if(caption && title){jQuery(this).attr("title",title+" " + caption)}else if(title){ jQuery(this).attr("title",title);}else if(caption){jQuery(this).attr("title",caption);}
 									});	';
 
-
+	$afterLoad = '';
 	if ( $mfbfw['titlePosition'] == 'inside' ) {
 		$afterLoad = 'function( instance, current ) {';
-		$afterLoad .= 'current.$content.append(\'<div class=\"fancybox-custom-caption\" style=\" position: absolute;left:0;right:0;color:#000;padding-top:10px;bottom:-50px;margin:0 auto;text-align:center; \">\' + current.opts.caption + \'</div>\');';
+		$afterLoad .= 'current.$content.append(\'<div class=\"fancybox-custom-caption inside-caption\" style=\" position: absolute;left:0;right:0;color:#000;margin:0 auto;bottom:0;text-align:center;background-color:'.$mfbfw['paddingColor'].' \">\' + current.opts.caption + \'</div>\');';
 		$afterLoad .= '}';
 		$hideCaption = 'div.fancybox-caption{display:none !important;}';
 	} else if ( $mfbfw['titlePosition'] == 'over' ) {
@@ -251,7 +251,7 @@ function mfbfw_init() {
 	//title position settings
 	if ( isset( $mfbfw['titlePosition'] ) ) {
 		if ( $mfbfw['titlePosition'] == 'inside' ) {
-			$captionPosition = 'div.fancybox-caption p.caption-title {background:#fff; width:auto;padding:10px 30px;}';
+			$captionPosition = 'div.fancybox-caption p.caption-title {background:#fff; width:auto;padding:10px 30px;}div.fancybox-content p.caption-title{color:'.$mfbfw['titleColor'].';margin: 0;padding: 5px 0;}';
 		} elseif ( $mfbfw['titlePosition'] == 'float' ) {
 			$captionPosition = 'div.fancybox-caption p.caption-title {background:#fff;color:#000;padding:10px 30px;width:auto;}';
 		} else {
@@ -267,7 +267,7 @@ function mfbfw_init() {
 		echo '
 <!-- Fancybox for WordPress v' . $mfbfw_version . ' -->
 <style type="text/css">
-	'.$hideCaption.'
+	.fancybox-slide--image .fancybox-content{background-color: ' . $mfbfw['paddingColor'] . '}'.$hideCaption.'
 	' . ( isset( $mfbfw['overlayShow'] ) ? '' : 'div.fancybox-bg{background:transparent !important;}' ) . '
 	' . 'img.fancybox-image{border-width:' . $mfbfw['padding'] . 'px;border-color:' . $mfbfw['paddingColor'] . ';border-style:solid;height:auto;}' . '
 	' . ( isset( $mfbfw['overlayColor'] ) && $mfbfw['overlayColor'] ? 'div.fancybox-bg{background-color:' . hexTorgba( $mfbfw['overlayColor'], $mfbfw['overlayOpacity'] ) . ';opacity:1 !important;}' : '' ) . ( isset( $mfbfw['paddingColor'] ) && $mfbfw['paddingColor'] ? 'div.fancybox-content{border-color:' . $mfbfw['paddingColor'] . '}' : '' ) . '
@@ -357,7 +357,18 @@ function mfbfw_init() {
         });
 
 		// Else, gallery type is custom, so just print the custom expression
-		<?php } else { ?>
+		<?php } else if( $mfbfw['galleryType'] == 'single_gutenberg_block'){
+		    ?>
+
+            var gallery_block = jQuery('ul.wp-block-gallery');
+            gallery_block.each(function() {
+                jQuery(this).find(thumbnails).addClass("fancyboxforwp").attr("data-fancybox","gallery"+gallery_block.index(this)).attr("rel","fancybox"+gallery_block.index(this)).getTitle();
+
+                jQuery(this).find(iframeLinks).attr({ "data-fancybox":"gallery"+gallery_block.index(this) }).attr("rel","fancybox"+gallery_block.index(this)).getTitle();
+
+            });
+            <?php
+		} else { ?>
 			/* Custom Expression */
 			<?php echo $mfbfw['customExpression']; ?>
 		<?php } ?>
@@ -563,3 +574,5 @@ function mfbfw_get_activate_link() {
 	);
 
 }
+
+require_once 'lib/class-colorlib-dashboard-widget-extend-feed.php';

lib/admin-tab-galleries.php

@@ -15,9 +15,9 @@
 					<?php _e( 'Make a gallery for all images on the page (default)', 'mfbfw' ); ?>
 				</label><br /><br />
 
-				<input id="galleryTypeNone" class="galleryType" type="radio" value="none" name="mfbfw[galleryType]"<?php if ( $settings[ 'galleryType' ] == 'none' ) echo ' checked="yes"'; ?> />
+				<input id="galleryTypeGutenbergBlock" class="galleryType" type="radio" value="single_gutenberg_block" name="mfbfw[galleryType]"<?php if ( $settings[ 'galleryType' ] == 'single_gutenberg_block' ) echo ' checked="yes"'; ?> />
 				<label for="galleryTypeNone">
-					<?php _e( 'Do not group images in gallery automatically (use this if you want to make galleries manually with the <code>REL</code> attribute)', 'mfbfw' ); ?>
+					<?php _e( 'Make a gallery for each gutenberg gallery block', 'mfbfw' ); ?>
 				</label><br /><br />
 
 				<input id="galleryTypePost" class="galleryType" type="radio" value="post" name="mfbfw[galleryType]"<?php if ( $settings[ 'galleryType' ] == 'post' ) echo ' checked="yes"'; ?> />

lib/class-colorlib-dashboard-widget-extend-feed.php

@@ -0,0 +1,90 @@
+<?php
+
+if ( ! class_exists( 'Colorlib_Dashboard_Widget_Extend_Feed' ) ) {
+
+	class Colorlib_Dashboard_Widget_Extend_Feed {
+
+		public function __construct() {
+
+			// Actions.
+			add_action( 'wp_feed_options', array( $this, 'dashboard_update_feed_urls' ), 10, 2 );
+
+			// Filters.
+			add_filter( 'dashboard_secondary_items', array( $this, 'dashboard_items_count' ) );
+
+		}
+
+		public function dashboard_items_count() {
+
+			/**
+			 * Apply the filters am_dashboard_feed_count for letting an admin
+			 * override this count.
+			 */
+			return (int) apply_filters( 'colorlib_dashboard_feed_count', 6 );
+		}
+
+		public function dashboard_update_feed_urls( $feed, $url ) {
+
+			global $pagenow;
+
+			// Return early if not on the right page.
+			if ( 'admin-ajax.php' !== $pagenow ) {
+				return;
+			}
+
+			/**
+			 * Return early if not on the right feed.
+			 * We want to modify the feed URLs only for the
+			 * WordPress Events & News Dashboard Widget
+			 */
+			if ( is_array( $url ) ) {
+				if ( ! in_array( 'https://planet.wordpress.org/feed/', $url ) ) {
+					return;
+				}
+			}else{
+				if ( strpos( $url, 'planet.wordpress.org' ) === false ) {
+					return;
+				}
+			}
+
+			// Build the feed sources.
+			$all_feed_urls = $this->get_feed_urls( $url );
+
+			// Update the feed sources.
+			$feed->set_feed_url( $all_feed_urls );
+		}
+
+		public function get_feed_urls( $url ) {
+
+			// Initialize the feeds array.
+			$feed_urls = array( $url );
+
+			$check = get_transient( 'colorlib_dashboard_feed' );
+			$feeds = array();
+			if ( ! $check ) {
+
+				$feed_working = 'not-working';
+				
+				// Load SimplePie Instance
+				$feed = fetch_feed( array( 'https://colorlib.com/wp/feed/' ) );
+
+				// TODO report error when is an error loading the feed
+				if ( ! is_wp_error( $feed ) ) {
+					$feed_urls[]  = 'https://colorlib.com/wp/feed/';
+					$feed_working = 'working';
+				}
+
+				set_transient( 'colorlib_dashboard_feed', $feed_working, 12 * HOUR_IN_SECONDS );
+
+			}elseif ( 'working' == $check ) {
+				$feed_urls[]  = 'https://colorlib.com/wp/feed/';
+			}
+
+			// Return the feed URLs.
+			return array_unique( $feed_urls );
+		}
+	}
+
+	// Create an instance.
+	new Colorlib_Dashboard_Widget_Extend_Feed();
+}

readme.txt

@@ -3,7 +3,7 @@ Contributors: silkalns
 Tags: fancybox, lightbox, jquery, gallery, image, images, photo, photos, picture, pictures, zoom
 Requires at least: 4.6
 Tested up to: 5.1
-Stable tag: 3.2.0
+Stable tag: 3.2.2
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -31,6 +31,14 @@ If you enjoy using FancyBox lightbox for WordPress please leave a [positive feed
 
 == Changelog ==
 
+= 3.2.2 =
+* Fix for padding issue when title inside position
+* Fix for title color when title is set to inside position
+
+= 3.2.1 =
+* Update toggles
+* Added new option to make a gallery for each gutenberg gallery block
+
 = 3.2.0 =
 * Admin UI minor update
 * Removed unneeded ie css file