Skip to content

Commit 4698bfb

Browse files
kprajapatiikprajapatii
authored
Merge pull request #754 from kprajapatii/master
Merge SD v1.2.6 & AUI v0.2.21
2 parents 902dbfe + 5637873 commit 4698bfb

File tree

8 files changed

+27
-38
lines changed

8 files changed

+27
-38
lines changed

‎vendor/ayecode/wp-ayecode-ui/change-log.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
= 0.2.21 - 2024-07-31 =
2+
* JS error on FSE theme edit template part page - FIXED
3+
14
= 0.2.20 - 2024-07-05 =
25
* Multiple carousels breaks carousel in modal - FIXED
36

‎vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AyeCode_UI_Settings {
3535
*
3636
* @var string
3737
*/
38-
public $version = '0.2.20';
38+
public $version = '0.2.21';
3939

4040
/**
4141
* Class textdomain.

‎vendor/ayecode/wp-ayecode-ui/includes/inc/bs5-js.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,39 +1146,22 @@ function aui_fse_sync_site_colors($color){
11461146
* @param $color
11471147
*/
11481148
function aui_fse_sync_site_typography(){
1149-
// const select = wp.data.select('core/edit-site').getSettings();
1150-
// const select = wp.data.select('core/edit-site');
1151-
// console.log(select);
1152-
1153-
1154-
// console.log(settings.styles[3].css);
1155-
11561149
const getGlobalStyles = () => {
11571150
const { select } = wp.data;
11581151
const settings = select('core/block-editor').getSettings();
1159-
// console.log(settings);
1160-
return settings.styles[3].css ? settings.styles[3].css : null;
11611152

1153+
return ( settings && settings.styles && settings.styles[3].css ? settings.styles[3].css : null );
11621154
};
11631155

11641156
// set the initial styles
11651157
let Styles = getGlobalStyles();
11661158

1167-
// console.log('#####'+colorHex);
1168-
11691159
wp.data.subscribe(() => {
1170-
1171-
// console.log(wp.data);
1172-
11731160
// get the current styles
11741161
const newStyles = getGlobalStyles();
11751162

1176-
// console.log(newStyles);
1177-
11781163
// only do something if newStyles has changed.
11791164
if( newStyles && Styles !== newStyles ) {
1180-
1181-
11821165
// heading sizes
11831166
aui_updateCssRule('body.editor-styles-wrapper h1', 'font-size', aui_parseCSS(newStyles, 'h1', 'font-size'));
11841167
aui_updateCssRule('body.editor-styles-wrapper h2', 'font-size', aui_parseCSS(newStyles, 'h2', 'font-size'));

‎vendor/ayecode/wp-super-duper/change-log.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
= 1.2.6 - 2024-07-18 =
2+
* render_block hook only had 2 args prior to WP 5.9 which could cause fatal error when running WP < 5.9 - FIXED
3+
14
= 1.2.5 - 2024-07-17 =
25
* non FSE themes can fail to render templates with blocks - FIXED
36

‎vendor/ayecode/wp-super-duper/sd-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3714,7 +3714,7 @@ function sd_gd_field_rule_search( $search, $post_type, $rule, $field = array(),
37143714
* @param $thiss
37153715
* @return mixed|string
37163716
*/
3717-
function sd_blocks_render_blocks($block_content, $parsed_block, $thiss ){
3717+
function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array() ){
37183718

37193719
// Check if ita a nested block that needs to be wrapped
37203720
if(! empty($parsed_block['attrs']['sd_shortcode_close'])){

‎vendor/ayecode/wp-super-duper/wp-super-duper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
if ( ! class_exists( 'WP_Super_Duper' ) ) {
77

8-
define( 'SUPER_DUPER_VER', '1.2.5' );
8+
define( 'SUPER_DUPER_VER', '1.2.6' );
99

1010
/**
1111
* A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.

‎vendor/composer/installed.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@
5959
},
6060
{
6161
"name": "ayecode/wp-ayecode-ui",
62-
"version": "0.2.20",
63-
"version_normalized": "0.2.20.0",
62+
"version": "0.2.21",
63+
"version_normalized": "0.2.21.0",
6464
"source": {
6565
"type": "git",
6666
"url": "https://github.com/AyeCode/wp-ayecode-ui.git",
67-
"reference": "1c1e1610ac1005dfbb944ed32656b552b698665d"
67+
"reference": "d1bda4d3a6d51cef412beea914201c7f1ade26fd"
6868
},
6969
"dist": {
7070
"type": "zip",
71-
"url": "https://api.github.com/repos/AyeCode/wp-ayecode-ui/zipball/1c1e1610ac1005dfbb944ed32656b552b698665d",
72-
"reference": "1c1e1610ac1005dfbb944ed32656b552b698665d",
71+
"url": "https://api.github.com/repos/AyeCode/wp-ayecode-ui/zipball/d1bda4d3a6d51cef412beea914201c7f1ade26fd",
72+
"reference": "d1bda4d3a6d51cef412beea914201c7f1ade26fd",
7373
"shasum": ""
7474
},
75-
"time": "2024-07-05T09:19:20+00:00",
75+
"time": "2024-07-31T06:18:15+00:00",
7676
"type": "library",
7777
"installation-source": "dist",
7878
"autoload": {
@@ -101,7 +101,7 @@
101101
],
102102
"support": {
103103
"issues": "https://github.com/AyeCode/wp-ayecode-ui/issues",
104-
"source": "https://github.com/AyeCode/wp-ayecode-ui/tree/0.2.20"
104+
"source": "https://github.com/AyeCode/wp-ayecode-ui/tree/0.2.21"
105105
},
106106
"install-path": "../ayecode/wp-ayecode-ui"
107107
},
@@ -206,24 +206,24 @@
206206
},
207207
{
208208
"name": "ayecode/wp-super-duper",
209-
"version": "1.2.5",
210-
"version_normalized": "1.2.5.0",
209+
"version": "1.2.6",
210+
"version_normalized": "1.2.6.0",
211211
"source": {
212212
"type": "git",
213213
"url": "https://github.com/AyeCode/wp-super-duper.git",
214-
"reference": "ce5293af2df1c8a7c5412ec810e32143242203c1"
214+
"reference": "2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc"
215215
},
216216
"dist": {
217217
"type": "zip",
218-
"url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/ce5293af2df1c8a7c5412ec810e32143242203c1",
219-
"reference": "ce5293af2df1c8a7c5412ec810e32143242203c1",
218+
"url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc",
219+
"reference": "2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc",
220220
"shasum": ""
221221
},
222222
"require": {
223223
"composer/installers": "~1.0",
224224
"php": ">=5.4.0"
225225
},
226-
"time": "2024-07-17T10:50:48+00:00",
226+
"time": "2024-07-18T15:16:04+00:00",
227227
"type": "library",
228228
"installation-source": "dist",
229229
"autoload": {
@@ -255,7 +255,7 @@
255255
],
256256
"support": {
257257
"issues": "https://github.com/AyeCode/wp-super-duper/issues",
258-
"source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.5"
258+
"source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.6"
259259
},
260260
"install-path": "../ayecode/wp-super-duper"
261261
},

‎vendor/composer/installed.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
'dev_requirement' => false,
4848
),
4949
'ayecode/wp-super-duper' => array(
50-
'pretty_version' => '1.2.5',
51-
'version' => '1.2.5.0',
52-
'reference' => 'ce5293af2df1c8a7c5412ec810e32143242203c1',
50+
'pretty_version' => '1.2.6',
51+
'version' => '1.2.6.0',
52+
'reference' => '2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../ayecode/wp-super-duper',
5555
'aliases' => array(),

0 commit comments

Comments
 (0)