From 2c1a6ad2df9c3f08f7e2313174b0c6ea2ef533cb Mon Sep 17 00:00:00 2001 From: "Soare Robert Daniel (Mac 2023)" Date: Thu, 21 Mar 2024 14:56:32 +0200 Subject: [PATCH 1/2] fix: allow mix content in title field for map content --- css/settings.css | 6 +++--- includes/admin/feedzy-rss-feeds-import.php | 3 +++ includes/views/js/import-metabox-edit.js | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/css/settings.css b/css/settings.css index b5e637c1..98304e62 100644 --- a/css/settings.css +++ b/css/settings.css @@ -902,9 +902,9 @@ input.fz-switch-toggle[type=checkbox]:checked:before{ } .fz-form-wrap .tagify__tag{ position: relative; - margin-left: 0; - margin-right: 16px; - margin-bottom: 16px; + margin-left: 2px; + margin-right: 2px; + margin-bottom: 2px; vertical-align: top; } .fz-form-wrap .tagify__tag>div{ diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php index 402d5a12..7b9f693e 100644 --- a/includes/admin/feedzy-rss-feeds-import.php +++ b/includes/admin/feedzy-rss-feeds-import.php @@ -1416,6 +1416,9 @@ private function run_job( $job, $max ) { $item_date = date( get_option( 'date_format' ) . ' at ' . get_option( 'time_format' ), $item['item_date'] ); $item_date = $item['item_date_formatted']; + // Transform any structure like [[{"value":"[#item_title]"}]] to [#item_title]. + $import_title = preg_replace('/\[\[\{"value":"(\[#[^]]+\])"\}\]\]/', '$1', $import_title); + // Get translated item title. $translated_title = ''; if ( $import_auto_translation && ( false !== strpos( $import_title, '[#translated_title]' ) || false !== strpos( $post_excerpt, '[#translated_title]' ) ) ) { diff --git a/includes/views/js/import-metabox-edit.js b/includes/views/js/import-metabox-edit.js index e1c184f0..ee39fdde 100644 --- a/includes/views/js/import-metabox-edit.js +++ b/includes/views/js/import-metabox-edit.js @@ -468,7 +468,7 @@ } ); // Tagify for normal textbox. - $( '.fz-input-tagify:not(.fz-tagify-image)' ).tagify( { + $( '.fz-input-tagify:not(.fz-tagify-image):not([name="feedzy_meta_data[import_post_title]"])' ).tagify( { editTags: false, originalInputValueFormat: function( valuesArr ) { return valuesArr.map( function( item ) { @@ -478,6 +478,11 @@ } } ); + // Tagify the title field. + $( '.fz-input-tagify[name="feedzy_meta_data[import_post_title]"]:not(.fz-tagify-image)' ).tagify( { + mode: 'mix' + } ); + // Tagify for normal mix content field. $( '.fz-tagify-image' ).tagify( { mode: 'mix', From 1146c233c712843791f2b9b18bb99ef568562c5a Mon Sep 17 00:00:00 2001 From: "Soare Robert Daniel (Mac 2023)" Date: Thu, 21 Mar 2024 15:09:33 +0200 Subject: [PATCH 2/2] chore: phpcs --- includes/admin/feedzy-rss-feeds-import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php index 7b9f693e..376787c5 100644 --- a/includes/admin/feedzy-rss-feeds-import.php +++ b/includes/admin/feedzy-rss-feeds-import.php @@ -1417,7 +1417,7 @@ private function run_job( $job, $max ) { $item_date = $item['item_date_formatted']; // Transform any structure like [[{"value":"[#item_title]"}]] to [#item_title]. - $import_title = preg_replace('/\[\[\{"value":"(\[#[^]]+\])"\}\]\]/', '$1', $import_title); + $import_title = preg_replace( '/\[\[\{"value":"(\[#[^]]+\])"\}\]\]/', '$1', $import_title ); // Get translated item title. $translated_title = '';