Skip to content

Commit d38df9c

Browse files
authored
Merge pull request #357 from cloudinary/uat
Version 2.6.0
2 parents dee0814 + 35e20b4 commit d38df9c

25 files changed

+1020
-328
lines changed

cloudinary.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Cloudinary
44
* Plugin URI: https://cloudinary.com/documentation/wordpress_integration
55
* Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
6-
* Version: 2.5.0
6+
* Version: 2.6.0-RC-1
77
* Author: Cloudinary Ltd., XWP
88
* Author URI: https://cloudinary.com/
99
* License: GPLv2+

css/gallery-block-rtl.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/gallery-block.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/src/gallery.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
align-items: center;
5050
}
5151

52+
.wp-block-cloudinary-gallery .block-editor-media-placeholder .components-placeholder__label .dashicon {
53+
margin-right: 8px;
54+
}
55+
5256
/* stylelint-disable */
5357
.wp-block-cloudinary-gallery .block-editor-media-placeholder.is-appender .components-placeholder__label {
5458
display: none;

instance.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,21 @@ function get_plugin_instance() {
2525

2626
return $cloudinary_plugin;
2727
}
28+
29+
/**
30+
* Get an instance of the CLI Class.
31+
*/
32+
function cloudinary_cli_instance() {
33+
if ( class_exists( '\WPCOM_VIP_CLI_Command' ) ) {
34+
return new CLI_VIP();
35+
}
36+
37+
return new CLI();
38+
}
39+
40+
if ( defined( 'WP_CLI' ) && WP_CLI ) {
41+
$plugin_instance = get_plugin_instance();
42+
$cli = cloudinary_cli_instance();
43+
$cli->setup_cloudinary( $plugin_instance );
44+
\WP_CLI::add_command( 'cloudinary', $cli );
45+
}

js/cloudinary.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/gallery-block.asset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '5d10da56cc3f0e4a9cf2b2a3e7ee85d0');
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '2695e94cb7e3a139b92189c7f3552ac8');

js/gallery-block.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/src/components/widget.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ if ( wp.media && window.CLDN ) {
248248
* Render callback for the content region in the `upload` mode.
249249
*/
250250
cloudinaryContent() {
251+
this.$el.addClass( 'hide-toolbar' );
251252
const state = this.state();
252253
const view = new Cloudinary( {
253254
controller: this,

php/class-cli-vip.php

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
/**
3+
* Cloudinary CLI for VIP.
4+
*
5+
* @package Cloudinary
6+
*/
7+
8+
namespace Cloudinary;
9+
10+
use Cloudinary\Traits\CLI_Trait;
11+
12+
/**
13+
* CLI VIP class.
14+
*
15+
* @since 2.5.1
16+
*/
17+
class CLI_VIP extends \WPCOM_VIP_CLI_Command {
18+
19+
use CLI_Trait;
20+
21+
/**
22+
* Output the Intro.
23+
*
24+
* @since 2.5.1
25+
* @link http://patorjk.com/software/taag/#p=display&c=echo&f=Calvin%20S&t=Cloudinary%20CLI
26+
*/
27+
public function do_intro() {
28+
static $intro;
29+
if ( ! $intro ) {
30+
\WP_CLI::log( '' );
31+
\WP_CLI::log( '╔═╗┬ ┌─┐┬ ┬┌┬┐┬┌┐┌┌─┐┬─┐┬ ┬ ╔═╗╦ ╦ ╦ ╦╦╔═╗' );
32+
\WP_CLI::log( '║ │ │ ││ │ ││││││├─┤├┬┘└┬┘ ║ ║ ║ ╚╗╔╝║╠═╝' );
33+
\WP_CLI::log( '╚═╝┴─┘└─┘└─┘─┴┘┴┘└┘┴ ┴┴└─ ┴ ╚═╝╩═╝╩ ╚╝ ╩╩ ' );
34+
$intro = true;
35+
}
36+
}
37+
}

0 commit comments

Comments
 (0)