Skip to content

Commit

Permalink
Merge [release-editor-278-wp] in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins Jancovici authored and Jenkins Jancovici committed Feb 7, 2024
2 parents 597e770 + eee3bcb commit 3e6cd78
Show file tree
Hide file tree
Showing 2,933 changed files with 9,215 additions and 4,426 deletions.
28 changes: 26 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Contributors: themefuse<br>
Requires at least: 4.5<br>
Tested up to: 6.4.2<br>
Tested up to: 6.4.3<br>
Requires PHP: 7.0.0<br>
Stable tag: 2.4.39<br>
Stable tag: 2.4.40<br>
License: GPLv3<br>
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -136,6 +136,30 @@ $bodyHtml = apply_filters( 'brizy_content', $html->get_body(), Brizy_Editor_Proj

## Changelog

### 2.4.40 - 2024-02-07
* New: Help video functionality inside the builder
* New: Added variable fonts
* New: Text highlight color
* Improved: Custom Attributes position in the right sidebar
* Improved: Include Global Style when saving layouts
* Improved: Toolbar options arrow position on Rows
* Improved: Extract React from editor build, and add this as standalone script in HTML
* Improved: Disable shorten/extend actions for AI text in some cases
* Improved: Drag and drop for Icons and Buttons
* Improved: Tabs UI colors in right sidebar
* Fixed: Progress bar comes out of the wrapper
* Fixed: Text Link option pasted value doesn't save if instantly closing toolbar
* Fixed: Video player won't extend on mobile on IOS
* Fixed: Form Select arrow
* Fixed: Column align when Effects are enabled
* Fixed: Writing long texts in Form fields
* Fixed: Video element crashed when imported with a block
* Fixed: Column alignment doesn't work on Auto distribute option
* Fixed: Toolbar css issue when searching a Collection Type name
* Fixed: Copy Styles don't apply for Dynamic Content Rich Text
* Fixed: Background button and icon hover color didn't match preview
* Fixed: Video background for blocks and columns unable to pause

### 2.4.39 - 2024-01-17
* New: Add Right Click Context Menu to Tabs Element
* New: Added tooltip message when saving draft pages
Expand Down
8 changes: 4 additions & 4 deletions brizy.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Plugin URI: https://brizy.io/
* Author: Brizy.io
* Author URI: https://brizy.io/
* Version: 2.4.39
* Version: 2.4.40
* Text Domain: brizy
* License: GPLv3
* Domain Path: /languages
Expand All @@ -19,10 +19,10 @@

define('BRIZY_DEVELOPMENT', false );
define('BRIZY_LOG', false );
define('BRIZY_VERSION', '2.4.39');
define('BRIZY_VERSION', '2.4.40');
define('BRIZY_MINIMUM_PRO_VERSION', '2.4.15');
define('BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '276-wp' );
define('BRIZY_SYNC_VERSION', '276');
define('BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '278-wp' );
define('BRIZY_SYNC_VERSION', '278');
define('BRIZY_FILE', __FILE__);
define('BRIZY_PLUGIN_BASE', plugin_basename(BRIZY_FILE));
define('BRIZY_PLUGIN_PATH', dirname(BRIZY_FILE));
Expand Down
11 changes: 7 additions & 4 deletions editor/zip/archiver.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ public function addEntityToZip(ZipArchive $z, Brizy_Editor_Zip_ArchiveItem $item
'title' => $block->getTitle(),
'meta' => $block->getMeta(),
'media' => $block->getMedia(),
'data' => $block->get_editor_data(),
'globalStyles' => $block->getGlobalStyles(),
'data' => $block->get_editor_data(true),
'editorVersion' => $this->syncVersion,
'files' => [
'images' => [],
Expand All @@ -102,6 +101,10 @@ public function addEntityToZip(ZipArchive $z, Brizy_Editor_Zip_ArchiveItem $item
'hasPro' => $item->isPro(),
);

if($block instanceof Brizy_Editor_Layout) {
$data['globalStyles'] = $block->getGlobalStyles();
}

if (method_exists($block, 'getTags')) {
$data['tags'] = $block->getTags();
}
Expand Down Expand Up @@ -201,11 +204,11 @@ private function createSingleFromZipPath(ZipArchive $z, $dir)
$block->set_editor_data($data->data);
$block->setMeta($data->meta);

if ($data->title) {
if (isset($data->title)) {
$block->setTitle($data->title);
}

if (method_exists($entityClass, 'setTags')) {
if (method_exists($entityClass, 'setTags') && isset($data->tags)) {
$block->setTags($data->tags);
}

Expand Down
Loading

0 comments on commit 3e6cd78

Please sign in to comment.