Merge branch 'branch-1.8.2'

assets/css/admin.css

@@ -1179,7 +1179,7 @@ ul.imagify-datas-details.imagify-datas-details {
 	overflow: hidden;
 	border-top: 2px solid transparent;
 	padding-top: 5px;
-	font-size: 8px;
+	font-size: 11px;
 }
 .nggform .imagify-datas-actions-links {
 	position: relative;

assets/css/options.css

@@ -288,6 +288,7 @@ label[for="imagify_sizes_full"] + .imagify-info {
 }
 
 .imagify-menu-bar-img {
+	box-sizing: border-box;
 	max-width: 100%;
 	height: auto;
 	margin-top: 0;
@@ -440,7 +441,8 @@ a.btn-rocket:focus {
 }
 
 /* Menu in admin bar label exception */
-label[for="imagify_admin_bar_menu"] {
+label[for="imagify_admin_bar_menu"],
+label[for="imagify_partner_links"] {
 	font-weight: normal !important;
 	color: #626E7B !important;
 }
@@ -638,6 +640,23 @@ p.imagify-custom-folder-line {
 .imagify-folders-tree .imagify-is-open ~ label {
 	color: #7A8996;
 }
+.imagify-folders-tree .imagify-folder.imagify-loading:before,
+.imagify-folders-tree .imagify-folder .imagify-loader {
+	display: none;
+}
+.imagify-folders-tree .imagify-folder.imagify-loading .imagify-loader {
+	display: inline-block;
+	width: 13px;
+	height: 21px;
+	font-size: 1.5em;
+	vertical-align: .15em;
+}
+.imagify-folders-tree .imagify-folder.imagify-loading .imagify-loader img {
+	display: inline-block;
+	width: 100%;
+	height: auto;
+	vertical-align: middle;
+}
 
 .imagify-folders-tree button.imagify-folder:hover,
 .imagify-folders-tree button.imagify-folder:focus,

assets/js/options.js

@@ -320,17 +320,17 @@
 			return;
 		}
 
-		$button.attr( 'disabled', 'disabled' );
+		$button.attr( 'disabled', 'disabled' ).addClass( 'imagify-loading' );
 
 		if ( $tree.length ) {
 			if ( $button.hasClass( 'imagify-is-open' ) ) {
 				$tree.addClass( 'hidden' );
 				$button.removeClass(' imagify-is-open' );
 			} else {
 				$tree.removeClass( 'hidden' );
-				$button.addClass(' imagify-is-open' );
+				$button.addClass( 'imagify-is-open' );
 			}
-			$button.removeAttr( 'disabled' );
+			$button.removeAttr( 'disabled' ).removeClass( 'imagify-loading' );
 			return;
 		}
 
@@ -365,7 +365,7 @@
 				} );
 			} )
 			.always( function(){
-				$button.removeAttr( 'disabled' );
+				$button.removeAttr( 'disabled' ).removeClass( 'imagify-loading' );
 			} );
 	} );
 

imagify.php

@@ -3,7 +3,7 @@
  * Plugin Name: Imagify
  * Plugin URI: https://wordpress.org/plugins/imagify/
  * Description: Dramaticaly reduce image file sizes without losing quality, make your website load faster, boost your SEO and save money on your bandwidth using Imagify, the new most advanced image optimization tool.
- * Version: 1.8.1.1
+ * Version: 1.8.2
  * Author: WP Media
  * Author URI: https://wp-media.me/
  * Licence: GPLv2
@@ -14,10 +14,10 @@
  * Copyright 2018 WP Media
  */
 
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 // Imagify defines.
-define( 'IMAGIFY_VERSION'       , '1.8.1.1' );
+define( 'IMAGIFY_VERSION'       , '1.8.2' );
 define( 'IMAGIFY_WP_MIN'        , '4.0' );
 define( 'IMAGIFY_SLUG'          , 'imagify' );
 define( 'IMAGIFY_FILE'          , __FILE__ );

inc/3rd-party/3rd-party.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 /**
  * Plugins.
@@ -10,6 +10,7 @@
 require IMAGIFY_3RD_PARTY_PATH . 'nextgen-gallery/nextgen-gallery.php';
 require IMAGIFY_3RD_PARTY_PATH . 'regenerate-thumbnails/regenerate-thumbnails.php';
 require IMAGIFY_3RD_PARTY_PATH . 'wp-retina-2x/wp-retina-2x.php';
+require IMAGIFY_3RD_PARTY_PATH . 'wp-time-capsule/wp-time-capsule.php';
 require IMAGIFY_3RD_PARTY_PATH . 'screets-lc.php';
 require IMAGIFY_3RD_PARTY_PATH . 'wp-real-media-library.php';
 require IMAGIFY_3RD_PARTY_PATH . 'wp-rocket.php';

inc/3rd-party/amazon-s3-and-cloudfront/amazon-s3-and-cloudfront.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 /**
  * Tell if WP Offload S3 compatibility is loaded.

inc/3rd-party/amazon-s3-and-cloudfront/inc/classes/class-imagify-as3cf-attachment.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 /**
  * Imagify WP Offload S3 attachment class.

inc/3rd-party/amazon-s3-and-cloudfront/inc/classes/class-imagify-as3cf.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 /**
  * Imagify WP Offload S3 class.

inc/3rd-party/enable-media-replace/enable-media-replace.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 if ( function_exists( 'enable_media_replace' ) ) :
 

inc/3rd-party/enable-media-replace/inc/classes/class-imagify-enable-media-replace.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 /**
  * Compat class for Enable Media Replace plugin.

inc/3rd-party/formidable-pro/formidable-pro.php

@@ -1,5 +1,5 @@
 <?php
-defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
 if ( class_exists( 'FrmProEddController' ) ) :