Skip to content

Commit 7362b67

Browse files
giucu91giucu91
authored
Merge pull request #11 from MachoThemes/3.2.6
3.2.6
2 parents 77e9ad5 + acb5d68 commit 7362b67

File tree

5 files changed

+101
-54
lines changed

5 files changed

+101
-54
lines changed

‎assets/css/fancybox.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,11 @@ body.compensate-for-scrollbar {
882882
opacity: 1;
883883
}
884884

885+
/* Admin bar overfloat fix */
886+
.fancybox-container.fancybox-is-open {
887+
z-index:99999;
888+
}
889+
885890
/* Styling for Small-Screen Devices */
886891
@media all and (max-width: 576px) {
887892
.fancybox-thumbs {

‎fancybox.php‎

Lines changed: 62 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* Plugin Name: FancyBox for WordPress
44
* Plugin URI: https://wordpress.org/plugins/fancybox-for-wordpress/
55
* Description: Integrates <a href="http://fancyapps.com/fancybox/3/">FancyBox 3</a> into WordPress.
6-
* Version: 3.2.5
6+
* Version: 3.2.6
77
* Author: Colorlib
88
* Author URI: https://colorlib.com/wp/
9-
* Tested up to: 5.2
9+
* Tested up to: 5.3
1010
* Requires: 4.6 or higher
1111
* License: GPLv3 or later
1212
* License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -36,7 +36,7 @@
3636
* Plugin Init
3737
*/
3838
// Constants
39-
define( 'FBFW_VERSION', '3.2.5' );
39+
define( 'FBFW_VERSION', '3.2.6' );
4040
define( 'FBFW_PATH', plugin_dir_path( __FILE__ ) );
4141
define( 'FBFW_URL', plugin_dir_url( __FILE__ ) );
4242
define( 'FBFW_PLUGIN_BASE', plugin_basename( __FILE__ ) );
@@ -75,60 +75,61 @@ function mfbfw_defaults() {
7575

7676
$default_settings = array(
7777
// Appearance
78-
'border' => '',
79-
'borderColor' => '#BBBBBB',
80-
'paddingColor' => '#FFFFFF',
81-
'padding' => '10',
82-
'overlayShow' => 'on',
83-
'overlayColor' => '#666666',
84-
'overlayOpacity' => '0.3',
85-
'titleShow' => 'on',
86-
'titlePosition' => 'inside',
87-
'titleColor' => '#333333',
88-
'showNavArrows' => 'on',
89-
'titleSize' => '14',
90-
'showCloseButton' => '',
91-
'showToolbar' => 'on',
92-
// Animations
93-
'zoomOpacity' => 'on',
94-
'zoomSpeedIn' => '500',
95-
'zoomSpeedChange' => '300',
96-
'transitionIn' => 'fade',
97-
'transitionEffect' => 'fade',
98-
// Behaviour
99-
'hideOnOverlayClick' => 'function(current, event) {
78+
'border' => '',
79+
'borderColor' => '#BBBBBB',
80+
'paddingColor' => '#FFFFFF',
81+
'padding' => '10',
82+
'overlayShow' => 'on',
83+
'overlayColor' => '#666666',
84+
'overlayOpacity' => '0.3',
85+
'titleShow' => 'on',
86+
'captionShow' => '',
87+
'titlePosition' => 'inside',
88+
'titleColor' => '#333333',
89+
'showNavArrows' => 'on',
90+
'titleSize' => '14',
91+
'showCloseButton' => '',
92+
'showToolbar' => 'on',
93+
// Animations
94+
'zoomOpacity' => 'on',
95+
'zoomSpeedIn' => '500',
96+
'zoomSpeedChange' => '300',
97+
'transitionIn' => 'fade',
98+
'transitionEffect' => 'fade',
99+
// Behaviour
100+
'hideOnOverlayClick' => 'function(current, event) {
100101
return current.type === "image" ? "close" : false;
101102
},',
102-
'hideOnContentClick' => '',
103-
'enableEscapeButton' => 'on',
104-
'cyclic' => '',
105-
'mouseWheel' => '',
106-
'disableWoocommercePages' => '',
107-
'disableWoocommerceProducts' => '',
108-
// Gallery Type
109-
'galleryType' => 'all',
110-
'customExpression' => 'jQuery(thumbnails).attr("data-fancybox","gallery").getTitle();',
111-
// Misc
112-
'autoDimensions' => 'on',
113-
'frameWidth' => '560',
114-
'frameHeight' => '340',
115-
'loadAtFooter' => '',
116-
'callbackEnable' => '',
117-
'callbackOnStart' => 'function() { alert("Start!"); }',
118-
'callbackOnCancel' => 'function() { alert("Cancel!"); }',
119-
'callbackOnComplete' => 'function() { alert("Complete!"); }',
120-
'callbackOnCleanup' => 'function() { alert("CleanUp!"); }',
121-
'callbackOnClose' => 'function() { alert("Close!"); }',
122-
'copyTitleFunction' => 'var arr = jQuery("a[data-fancybox]");
103+
'hideOnContentClick' => '',
104+
'enableEscapeButton' => 'on',
105+
'cyclic' => '',
106+
'mouseWheel' => '',
107+
'disableWoocommercePages' => '',
108+
'disableWoocommerceProducts' => '',
109+
// Gallery Type
110+
'galleryType' => 'all',
111+
'customExpression' => 'jQuery(thumbnails).attr("data-fancybox","gallery").getTitle();',
112+
// Misc
113+
'autoDimensions' => 'on',
114+
'frameWidth' => '560',
115+
'frameHeight' => '340',
116+
'loadAtFooter' => '',
117+
'callbackEnable' => '',
118+
'callbackOnStart' => 'function() { alert("Start!"); }',
119+
'callbackOnCancel' => 'function() { alert("Cancel!"); }',
120+
'callbackOnComplete' => 'function() { alert("Complete!"); }',
121+
'callbackOnCleanup' => 'function() { alert("CleanUp!"); }',
122+
'callbackOnClose' => 'function() { alert("Close!"); }',
123+
'copyTitleFunction' => 'var arr = jQuery("a[data-fancybox]");
123124
jQuery.each(arr, function() {
124125
var title = jQuery(this).children("img").attr("title");
125126
var caption = jQuery(this).next("figcaption").html();
126127
if(caption.length){jQuery(this).attr("title",title+" " + caption)}else{ jQuery(this).attr("title",title);};
127128
}); ',
128-
'nojQuery' => '',
129-
'extraCallsEnable' => '',
130-
'extraCallsData' => '',
131-
'uninstall' => '',
129+
'nojQuery' => '',
130+
'extraCallsEnable' => '',
131+
'extraCallsData' => '',
132+
'uninstall' => '',
132133
);
133134

134135
return $default_settings;
@@ -214,12 +215,22 @@ function mfbfw_init() {
214215

215216
// fix undefined index copyTitleFunction. $mfbfw array misses this index.
216217

217-
$mfbfw['copyTitleFunction'] = 'var arr = jQuery("a[data-fancybox]");
218+
if (isset($mfbfw['captionShow']) && 'on' == $mfbfw['captionShow']) {
219+
$mfbfw['copyTitleFunction'] = 'var arr = jQuery("a[data-fancybox]");
220+
jQuery.each(arr, function() {
221+
var title = jQuery(this).children("img").attr("title");
222+
if(title){jQuery(this).attr("title",title)}
223+
}); ';
224+
} else {
225+
$mfbfw['copyTitleFunction'] = 'var arr = jQuery("a[data-fancybox]");
218226
jQuery.each(arr, function() {
219227
var title = jQuery(this).children("img").attr("title");
220228
var caption = jQuery(this).next("figcaption").html();
221229
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);}
222230
}); ';
231+
}
232+
233+
223234

224235
$afterLoad = '';
225236
if ( $mfbfw['titlePosition'] == 'inside' ) {

‎lib/admin-tab-appearance.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,32 @@ class="colorpick" value="<?php echo $settings['titleColor']; ?>" size="7"
226226
</fieldset>
227227
</td>
228228
</tr>
229+
<tr valign="top">
230+
<th scope="row"><?php _e( 'Hide caption*', 'mfbfw' ); ?>
231+
<span class="tooltip-right"
232+
data-tooltip="<?php _e( 'Hide the caption in lightbox. In some cases both figure caption and image title are displayed in the lightbox (default: off)', 'mfbfw' ); ?>">
233+
<i class="dashicons dashicons-editor-help"></i>
234+
</span>
235+
</th>
236+
<td>
237+
<fieldset>
238+
<div class="epsilon-toggle">
239+
<input class="epsilon-toggle__input" type="checkbox" id="captionShow" name="mfbfw[captionShow]" <?php checked( 1, isset( $settings['captionShow'] ) && $settings['captionShow'] );?> >
240+
<div class="epsilon-toggle__items">
241+
<span class="epsilon-toggle__track"></span>
242+
<span class="epsilon-toggle__thumb"></span>
243+
<svg class="epsilon-toggle__off" width="6" height="6" aria-hidden="true" role="img" focusable="false" viewBox="0 0 6 6">
244+
<path d="M3 1.5c.8 0 1.5.7 1.5 1.5S3.8 4.5 3 4.5 1.5 3.8 1.5 3 2.2 1.5 3 1.5M3 0C1.3 0 0 1.3 0 3s1.3 3 3 3 3-1.3 3-3-1.3-3-3-3z"></path>
245+
</svg>
246+
<svg class="epsilon-toggle__on" width="2" height="6" aria-hidden="true" role="img" focusable="false" viewBox="0 0 2 6">
247+
<path d="M0 0h2v6H0z"></path>
248+
</svg>
249+
</div>
250+
</div>
251+
<div class="cf"></div>
252+
</fieldset>
253+
</td>
254+
</tr>
229255
<tr valign="top">
230256
<th scope="row"><?php _e( 'Navigation Arrows', 'mfbfw' ); ?>
231257
<span class="tooltip-right"

‎lib/admin-tab-other.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
<tr valign="top">
246246
<th scope="row"><?php _e( 'Remove settings', 'mfbfw' ); ?>
247247
<span class="tooltip-right"
248-
data-tooltip="<?php _e( 'Remove Settings when plugin is deactivated from the "Manage Plugins" page. (default: off)', 'mfbfw' ); ?>">
248+
data-tooltip="<?php echo esc_attr__( 'Remove Settings when plugin is deactivated from the "Manage Plugins" page. (default: off)', 'mfbfw' ); ?>">
249249
<i class="dashicons dashicons-editor-help"></i>
250250
</span>
251251
</th>

‎readme.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Contributors: silkalns
33
Tags: fancybox, lightbox, jquery, gallery, image, images, photo, photos, picture, pictures, zoom
44
Requires at least: 4.6
5-
Tested up to: 5.2
6-
Stable tag: 3.2.5
5+
Tested up to: 5.3
6+
Stable tag: 3.2.6
77
License: GPLv3 or later
88
License URI: http://www.gnu.org/licenses/gpl-3.0.html
99

@@ -31,6 +31,11 @@ If you enjoy using FancyBox lightbox for WordPress please leave a [positive feed
3131

3232
== Changelog ==
3333

34+
= 3.2.6 =
35+
* Admin bar overfloat fix
36+
* Tooltip description bug fix
37+
* Add option for caption hide/show
38+
3439
= 3.2.5 =
3540
* Fix title hide/show option
3641
* Fix extra height on lightbox image wrapper

0 commit comments

Comments
 (0)