Skip to content

Commit

Permalink
Merge [release-editor-267-wp] in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins Jancovici authored and Jenkins Jancovici committed Oct 11, 2023
2 parents 056206b + 3c1bbb7 commit 45df3c3
Show file tree
Hide file tree
Showing 2,961 changed files with 12,824 additions and 18,466 deletions.
34 changes: 31 additions & 3 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.2.2<br>
Requires PHP: 5.6.20<br>
Stable tag: 2.4.27<br>
Tested up to: 6.3.1<br>
Requires PHP: 7.0.0<br>
Stable tag: 2.4.28<br>
License: GPLv3<br>
License URI: https://www.gnu.org/licenses/gpl-3.0.html

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

## Changelog

### 2.4.28 - 2023-10-11
* New: Added Internal Link on the link option for all elements
* Improved: Removed getPage request added pageData inside config
* Improved: Sections container width was changed in 1170px
* Improved: Changed icon for the Webhooks integration on forms
* Improved: Removed the ability to change icons in responsive views for the icon element
* Improved: Button width for default fill type
* Improved: Rename Tags titles in Saved blocks
* Improved: Rearrange Global typography styles
* Improved: Responsive views change automatically when you select the devices in global typography styling
* Fixed: Text color picker on dynamic elements
* Fixed: Hover on certain elements that have motion effects set
* Fixed: Drag and Drop was not working on images with link
* Fixed: Lightbox preview
* Fixed: Toolbars label text length
* Fixed: Dynamic text with gradient color was not visible
* Fixed: Hover animation not working for the same item after sliding
* Fixed: Column content align when scroll animation is applied
* Fixed: Text space for ordered and unordered lists
* Fixed: The accordion element disappears after deleting tags
* Fixed: Opacity for Gradient color does not work correctly
* Fixed: Button Spacing incorrectly affects position and alignment
* Fixed: Global styling not changing
* Fixed: Audio element is still playing after the pop-up is closed
* Fixes: Global colors for Image shadow
* Fixes: Global colors for Image border
* Fixed: Tab and Accordion elements heading get hidden under Sticky/Fixed menu on mobiles

### 2.4.27 - 2023-08-08
* New: Added 26 new premade design templates

Expand Down
22 changes: 17 additions & 5 deletions admin/blocks/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,19 @@ public function actionCreateGlobalBlock()
$this->error(400, "Invalid status");
}

if ( json_decode( $editorData ) === null && json_last_error() !== JSON_ERROR_NONE ) {
$this->error( 400, "Invalid JSON data" );
}

$bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_GLOBAL);

/**
* @var Brizy_Editor_Post $block;
*/
$block = $bockManager->createEntity($this->param('uid'), $status);
$block->setMeta(stripslashes($this->param('meta')));
$block->set_editor_data($editorData);
$block->set_needs_compile(true);
$block->set_editor_data( $editorData );
$block->set_needs_compile(true);

if($this->param('title'))
{
Expand Down Expand Up @@ -308,7 +312,10 @@ public function actionUpdateGlobalBlock()
$block->setMeta(stripslashes($this->param('meta')));
}
if ($this->param('data')) {
$block->set_editor_data(stripslashes($this->param('data')));
$data = stripslashes( $this->param( 'data' ) );
if ( json_decode( $data ) !== null && ! json_last_error() ) {
$block->set_editor_data( $data );
}
}

if($this->param('title'))
Expand Down Expand Up @@ -359,7 +366,8 @@ public function actionUpdateGlobalBlock()

public function actionUpdateGlobalBlocks()
{
//$this->verifyNonce( self::nonce );
$this->verifyNonce( self::nonce );

try {

if (!$this->param('uid')) {
Expand Down Expand Up @@ -410,7 +418,11 @@ public function actionUpdateGlobalBlocks()
}

if (isset($this->param('data')[$i]) && !empty($this->param('data')[$i])) {
$block->set_editor_data(stripslashes($this->param('data')[$i]));
$data = stripslashes( $this->param( 'data' )[ $i ] );

if ( json_decode( $data ) !== null && ! json_last_error() ) {
$block->set_editor_data( stripslashes( $this->param( 'data' )[ $i ] ) );
}
}

if (isset($this->param('is_autosave')[$i]) && (int)$this->param('is_autosave')[$i] === 1) {
Expand Down
10 changes: 5 additions & 5 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.27
* Version: 2.4.28
* Text Domain: brizy
* License: GPLv3
* Domain Path: /languages
Expand All @@ -17,12 +17,12 @@
$_SERVER['HTTPS'] = 'on';
}

define('BRIZY_DEVELOPMENT', true );
define('BRIZY_DEVELOPMENT', false );
define('BRIZY_LOG', false );
define('BRIZY_VERSION', '2.4.27');
define('BRIZY_VERSION', '2.4.28');
define('BRIZY_MINIMUM_PRO_VERSION', '2.4.15');
define('BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '264-wp' );
define('BRIZY_SYNC_VERSION', '264');
define('BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '267-wp' );
define('BRIZY_SYNC_VERSION', '267');
define('BRIZY_FILE', __FILE__);
define('BRIZY_PLUGIN_BASE', plugin_basename(BRIZY_FILE));
define('BRIZY_PLUGIN_PATH', dirname(BRIZY_FILE));
Expand Down
9 changes: 8 additions & 1 deletion import/provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@

class Brizy_Import_Provider {

const DEMO_URL = 'https://websitebuilder-demo.net/wp-json/demos/v1/';

private $mainSite;

public function __construct() {
$this->mainSite = 'https://websitebuilder-demo.net/wp-json/demos/v1/';

if ( class_exists( 'BrizyPro_Admin_WhiteLabel' ) && BrizyPro_Admin_WhiteLabel::_init()->getEnabled() ) {
$this->mainSite = __bt( 'starter-templates-url', self::DEMO_URL );
} else {
$this->mainSite = self::DEMO_URL;
}
}

/**
Expand Down
35 changes: 0 additions & 35 deletions public/editor-build/264-wp/editor/css/editor.min.css

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/css/preview.min.css

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/js/editor.min.js

This file was deleted.

2 changes: 0 additions & 2 deletions public/editor-build/264-wp/editor/js/editor.vendor.min.js

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/js/group-1_3.min.js

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/js/group-2_3.min.js

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/js/group-3.min.js

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/js/group-3_7.min.js

This file was deleted.

1 change: 0 additions & 1 deletion public/editor-build/264-wp/editor/js/group-all.min.js

This file was deleted.

2 changes: 0 additions & 2 deletions public/editor-build/264-wp/editor/js/preview.min.js

This file was deleted.

File renamed without changes.
35 changes: 35 additions & 0 deletions public/editor-build/267-wp/editor/css/editor.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/editor-build/267-wp/editor/css/preview.min.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JBH2TsVjTX0cvAPbTAfguQGcCBTjTRxWv3a9CdUaGWUrHcUrHcC+JAwaw3Lsv2nfJMDov25fCcVtxBDpu2Onx2fexAa9CdYcCATjvAq9CgH1whDfvhLXv2rpwcCaTgfmvW1sxQrfJMDfxgPov2LeCd48wAZ0uWVeJMDHHs40GNw2HdGrFXY1Fde4GNGrGsVXHM45HtYqHNU5IWqrHM44IXG5IXSsCXKoHNw4GNKrGtemGNOoGtasGdK5HsUtFdG2HdK3Hta3FXY0FdOrIXU1HXaaKtGoGNC2HXe0HdOmGNKoGtK2IXetIMUtFdU4INO3HXY2FXY0FdGqIXC5IXaaGs4qHtSrHXa1GcqrHW4sGXesING5CYGtFdU2GdwsGda5FXY0FdYrGXC4IMUtFdYqHdG1HdCmGNKoGXG0Htw2IMUtFdC4GXa4INK1FXYtFda1GtO0HtSaKtGoINCtHdKrHsqrGs4rIXO2IXK0CXKoIXerINS1HcqrGc41Hte5GXeaHM44HXUrHNYqHWqrGc4sHXetGtG0CYG2Fda0HNG5HNKtFXYrFdeqGXC5INKaHs44GNCqHXYrGcqrGM44GXaqGXS3CXaoINOtGdCqGXOmGNYoINO1Hdw1CYGrGW4tINK3INw2FXYsFdY0GXC2GXGaGNYoHtO0GNKtGMqrGc44GNe4Hde5CXYsFdw3GdarGtYmGNGoIXStHdY1IMVXGNCoINS0GNC4HWqrHW4qHNasHde1CXYsFde4INGqGNKmGNKoGXetHNU4HcUrGc45IXetGXY0FXY0FdY2Gte4HdSaKtYsFde4INGqGNKmGNKoGdS4GXC1HcUrGc43Htw4HXw3FXY0FdK1GXetGdeaGNCoGdesIXK2HsqrHW43HdYtHtY4CYGrGM41INGqGtO1FXY1FdCqINKrGXwaGNUoHtwsGtetHMqrHM41HdY4GXU5CXeoINOtHXC5IXGmGNOoHtStGNS2HsVXIM4rGtw4GdC1GsqrHM45HdK1GtC1CXaoGdw4HNarINCmGNSoGXG4GtS2HcU3FdKrHtS2GtYmGNOoINarGtYtCZiaNNUoHda5HtKrINw2FXYrFdC2HXGrIMVXGW42IXYtHNU5HNKmGNYoGdKsHNU0HWUqFdS1HXK5INS4HMqrGM4rHtwqHdU1CXUoHdC5GtC2HdCrFXYrFdYrHdS1GXaaKtUoGdU0HtKqINC3FXYqFdU4IXUqHtCaGW4qGXY2HtasGXKtGcq5FdU4Gda1HdCaGWq4FdUqGta3GNYrCYGqFXSoHXYrHXUtGdGaGW40HXaqIXU1HNKmHW45GNC5GXSqHMUrFdGrHtG5GXG5FXGoHNe4INe0GNeaKtYoHdC2GNw5INemGs4rGtU4GNa3GMUrFda4Hte3INa2FXCoIXU1Gdw3GtGaGc4sHNwrIXK4GMqsFdKsHdUtIXKaKtGoGNSrHtG2INKmGM40INStINe2GMU0FdCsHNwrIXK4FXUoIXC1GNaqGdw1CXOoHXS1INYrHXwmGW40GXG5INUrHWVXHc4qGNYtGdw4IWqqFdCrINKqHXasGcU2FdOqGNG2GtO0FXUoGNYtHda3Htw2CXwoGdK5IXKsHdwmGW4qGdYtINOrGNS0CYG3FdK4HXw5GNC3FW0qFdUqHtYtGNwqHNK4CXaoGW43HXKqGterGXKqHdw4GXG0HNUrHtatGXemFNUoGXU3GNGrHtU1HXaaIW43HNY4GtO1HWqqFdUsGNG5HNYrHdKaKteoHdC3IXO4GNemGW4rGdG3HNSqHdSaGNUoGdGtHdemGW4sHde3HXSsHtCaGNUoINKrIXesGcqqFdO0IXGqGdC5IWVXGNYoGXO3Hda4GsqqFdO5GtSqINSqGsUrGM4rHta1GNemGW42HXG5HNYqHNKaGNYoGdYqHXU0IMqqFdS1HtG3HNK0CYGrGc4rGtY3GtemGM4qHtOsGXe0IWUrGc44IXUsGNasFXYoHNw4HdCtINaaGNGoHNS5INSqGMqsFdC0HXaqINY4CYGrHW44HdCrHtw1FXGoHXerHNe5GMUrHM42IXw4HNKmHM4rGNO5HXe5CXY1FdetGda3GNamHc44IXw5Hda5HcVXGNOoINa5INGqIWq3FdGqGXw2IXa1CXY2FXwoHXw4HdKrINaaGNSmIW4qGdU2HNY1IMVXGNOoINe4GtCrIWq4FdK3HtU4GXw0CXY1Fde5GNSqIMq4FdSsIXYqHNU5CXY1Fde2GNKqGNGmIW44IXY0INUtIMVXGNOoIXa5GdG4HMq5FdK5Gte3IXU0CXY1Fdw3IXK3HsqrGW4qGXC0GdS3CXY1FdO5IXeqINCmGNUoHNG3HtC0GMVXGNOoHXw4GXw4HMqrGW44INOrHXa0CXY1FdGrGtSrHXKmGNYoGdesIXK1IMUrHM4sIXOqIXOmGNYoGdesIXK1IMVXGNOoGdwtGtG3HMqrGM4sINC4HXO5CXY0Fda2HtCrGdYmGNUoHtUqHXe0IWUrHW4tIXCsGNYmIM45HtO1Htw5GcVXGNCoGdCsGtSsGMq2Fdw0HNGtHXa1CXeoHtOtHtCtHNCmGs4qHNG2Gda0IWU4Fde5IXOtGNO3FXYoINCqINK1IXOaKtaoHXS5IXe3GdYmGM4rGtU1IXOqHsU4FdY1HXG5HXamGW42HtKrHNO5GdKaIW4rGdU4GtU3GMqqFdS0IXe4HNY5IMVXIW4qHNG3GXC1HWqqFdSqGtS3Hta5GsU3Fde2HXw1HtwrFXUoHdUqGtCrHte3CXwoIXesHNe0INCmGW42HXO2GderGXCaKtwoIXOtINe2GdCmGW42HderGdY3HteaHs42HdSqGtwtHWqqFdetHtSqINOrHMU3FdCtGNG4GdKsFXYoHNa4HdesGdwaKtSoIXe3HXY5HtSmGc4qINU0Gda3GsU2FdY1INUqINa2FXGoGNe0HNa0HNKaHM41INUqINa1IMq0FdU0GtS3HtUrCYG0FdYtGtKrHtC0FXSoGdCqGNU1HtYaGc4qHNKrGdCqIMq5FdGtHdC0GNOaGM4tHXO5GNe4HsqrGW4tINa0HXSrCYGrFdUrHde5GNasFXYqFda5GtK3GXKaGW43GtS3GtY2INwmGNYoGde5HNO4GMUqFdwsHXe4HXC2HsqrGM4sINe1HNarCYGqFdwrGtCtHdatHsqrGM4tGXYsGtSrCXUoHde4GNGsINe4FXYrFdC4HXK1HNSaGW42IXe3HXY5HtSmGNYoGdS0GtY5CZicCAfeJMDXv21cuQ5fTW1NuAZqTMCaTgfmvX0cS3PswgPoxYHpvA9sCcVguQrmFRD1vAO9Cg5pvhjfwg8cJdqpwAZ0uX48F2w+JW9txgw+
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JBH2TqiaCWUaxgffx0DpyX0cGWUqCXY2CXY2CaiaCX4ECWUaCXrhCBH0wg9lTN0cvg9oTMCaw3Lsv2nfP2fexAa9CdYcCATjvAq9CgH1whDfvhLXv2rpwcCaTgfmvZD1vAO9CgP2TQ5pTAKcJaiaCWUaCWU8TqiaCWUaCWUaCBLsSQ5tTg9svN0cxBDbvhHmSRLfEW0sHXaoGXUqGXUqFWUnGtG1FdUqGXUqGWecWcUaCWUaCWUaTgfmvX0cS3PswgPoxYHpvA9sCaiaCWUaCWUaCATjvArMxQrfJMDov256TRDpCaiaCWUaCWU+WcUaCWUaCWUaJBVbxAaaTX0cNNC1HWqtHXeaNXC0IMqtHXeaKtC0IW40HXw3GNOmGtK5CXC0IWqtHXaoHNOsGda1CXC0IWqtHXaaNXC0IWqtGtSaKtC0IWqtGtOoHXK3HtY1CXC0IW40HXw3GNOmGtG1CXC0IMqtGtOaNXC1HWqtGtOaKtC1HW41HNCsIXOmGtG1CXC1HMqtGtOoHXK3HtY1CXC1HMqtGtSaNXC1HMqtHXaaKtC1HMqtHXaoHNOsGda1CXC1HW41HNCsIXOmGtK5CXC1HWqtHXeaGW43HXKqGterGXKqHdw4GXG0QcVHGdO3FXG0GWVGGdO5FXG0GWVGGdO5FXG0HWVGGdO3FXG0HWVGGdO3FXG0GWVuCY0sHdCmGtK3CYqsHNemGtK3CYqsHNemGtK2CYqsHNwmGtK2CYqsHNwmGtK4CYGsHNwmGtK4FdO1GdC4HMUsHNwoHXK3HtY1FXG0IMUsHNamGtK5CYqsHdGmGtK5CYGsHdGoHNOsGda1FXG0IMUsHdKmGtK4FdO1GdC4HMUsHdKmGtK4CYqsHdKmGtK2CYqsHdCmGtK2CYqsHdCmGtK3CZiaNNC2GsqtGtOaNXC1IWqtGtOaKtC1Hs40HXw3GNOmGtG1CXC1HsqtGtOoHXK3HtY1CXC1HsqtGtSaNXC1HsqtGtaaNXC1IMqtGtaaNXC1IMqtGtwaNXC2GcqtGtwaNXC2GcqtGtaaNXC2HWqtGtaaNXC2HWqtGtSaKtC2HWqtGtOoHXK3HtY1CXC2Gs41HNCsIXOmGtG1CXC2GsqtGtOaQcVHGdSsFXG0GWVGGdS0FXG0GWVGGdS0FXG0HWVGGdSsFXG0HWVGGdSsFXG0GWVuCd48F3VbxAa+WcUaCWUaCXqpTt4ECWUaCXqpTt4ECWU8F3H2Tt4=
Loading

0 comments on commit 45df3c3

Please sign in to comment.