From 46b3eb1d818899cf614c6f870f1bf46c36bcbb9a Mon Sep 17 00:00:00 2001
From: Rami Yushuvaev <ramiy@elementor.com>
Date: Thu, 19 Oct 2023 13:36:05 +0300
Subject: [PATCH 1/5] Tweak: Theme settings page

---
 assets/dev/js/admin/hello-admin.scss          | 14 +++++++++++
 .../js/admin/pages/panels/scripts-styles.js   | 24 ++++++++++++-------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/assets/dev/js/admin/hello-admin.scss b/assets/dev/js/admin/hello-admin.scss
index 72bbf348..548c4dee 100644
--- a/assets/dev/js/admin/hello-admin.scss
+++ b/assets/dev/js/admin/hello-admin.scss
@@ -42,6 +42,20 @@
 			background: #ffffff;
 		}
 
+		.components-notice {
+			margin: 0;
+			margin-block-end: 20px;
+
+			.dashicon {
+				padding-inline-end: 10px;
+				color: #f0b849;
+			}
+
+			button {
+				display: none;
+			}
+		}
+
 		.code-example {
 			display: inline-block;
 			margin-block-end: 1.5rem;
diff --git a/assets/dev/js/admin/pages/panels/scripts-styles.js b/assets/dev/js/admin/pages/panels/scripts-styles.js
index 7cb7302f..c41ad8a4 100644
--- a/assets/dev/js/admin/pages/panels/scripts-styles.js
+++ b/assets/dev/js/admin/pages/panels/scripts-styles.js
@@ -1,29 +1,34 @@
 import { __ } from '@wordpress/i18n';
 import { SETTINGS } from '../settings.js';
-import { PanelBody, ToggleControl } from '@wordpress/components';
+import { PanelBody, ToggleControl, Notice, Dashicon } from '@wordpress/components';
 
 export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 	return (
 		<PanelBody title={ __( 'Scripts & Styles', 'hello-elementor' ) } >
 
+			<Notice status="warning" isDismissible="false">
+				<Dashicon icon="flag" />
+				{ __( 'Be cautious, disabling some of the following options may break your website.', 'hello-elementor' ) } 
+			</Notice>
+
 			<ToggleControl
 				label={ __( 'Unregister Emoji scripts & styles', 'hello-elementor' ) }
-				help={ __( 'Scripts and styles required to display Emojis.', 'hello-elementor' ) }
+				help={ __( 'Disable emoji-related scripts and styles.', 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.EMOJI ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.EMOJI, value ) }
 			/>
 
 			<ToggleControl
-				label={ __( 'Unregister oEmbed script', 'hello-elementor' ) }
-				help={ __( 'oEmbed-specific JavaScript that loads embeded elements from external recources.', 'hello-elementor' ) }
+				label={ __( 'Unregister wp-embed script', 'hello-elementor' ) }
+				help={ __( 'Disable the script responsible for inline HTML embed of external resources.', 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.OEMBED_SCRIPT ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.OEMBED_SCRIPT, value ) }
 			/>
-			<code className="code-example"> &lt;script type=&quot;text/javascript&quot; src=&quot;https://{ window.location.hostname }/wp-includes/js/wp-embeds.min.js&quot; /&gt; </code>
+			<code className="code-example"> &lt;script type=&quot;text/javascript&quot; src=&quot;https://{ window.location.hostname }/wp-includes/js/wp-embed.min.js&quot; /&gt; </code>
 
 			<ToggleControl
 				label={ __( 'Unregister classic-theme styles', 'hello-elementor' ) }
-				help={ __( "Styles associated with the classic themes that don't use Gutenberg.", 'hello-elementor' ) }
+				help={ __( "Disable the styles associated with classic themes that don't use Gutenberg.", 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.CLASSIC_THEME_STYLES ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.CLASSIC_THEME_STYLES, value ) }
 			/>
@@ -31,14 +36,15 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 
 			<ToggleControl
 				label={ __( 'Unregister Gutenberg styles', 'hello-elementor' ) }
-				help={ __( 'Gutenberg styles for a cleaner look and enhanced website performance.', 'hello-elementor' ) }
+				help={ __( 'Disable all Gutenberg-related CSS, both static and inline styles.', 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.GUTENBERG ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.GUTENBERG, value ) }
 			/>
+			<code className="code-example"> &lt;link rel=&quot;stylesheet&quot; href=&quot;http://dev.local/wp-includes/css/dist/block-library/style.css&quot; /&gt; </code>
 
 			<ToggleControl
 				label={ __( 'Unregister Hello style.css', 'hello-elementor' ) }
-				help={ __( "Hello theme's style.css file which contains CSS reset rules.", 'hello-elementor' ) }
+				help={ __( "Disable the Hello theme's style.css file which contains CSS reset rules for unified cross-browser view.", 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.HELLO_STYLE ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.HELLO_STYLE, value ) }
 			/>
@@ -46,7 +52,7 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 
 			<ToggleControl
 				label={ __( 'Unregister Hello theme.css', 'hello-elementor' ) }
-				help={ __( "Hello theme's theme.css file which contains CSS rules that style WordPress elements.", 'hello-elementor' ) }
+				help={ __( "Disable the Hello theme's theme.css file which contains CSS rules that style WordPress elements.", 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.HELLO_THEME ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.HELLO_THEME, value ) }
 			/>

From ed48c63f7122348b7c4015feb543df703e6a75bd Mon Sep 17 00:00:00 2001
From: Rami Yushuvaev <ramiy@elementor.com>
Date: Thu, 19 Oct 2023 13:43:20 +0300
Subject: [PATCH 2/5] JS lint

---
 assets/dev/js/admin/pages/panels/scripts-styles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/dev/js/admin/pages/panels/scripts-styles.js b/assets/dev/js/admin/pages/panels/scripts-styles.js
index c41ad8a4..2793db5a 100644
--- a/assets/dev/js/admin/pages/panels/scripts-styles.js
+++ b/assets/dev/js/admin/pages/panels/scripts-styles.js
@@ -8,7 +8,7 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 
 			<Notice status="warning" isDismissible="false">
 				<Dashicon icon="flag" />
-				{ __( 'Be cautious, disabling some of the following options may break your website.', 'hello-elementor' ) } 
+				{ __( 'Be cautious, disabling some of the following options may break your website.', 'hello-elementor' ) }
 			</Notice>
 
 			<ToggleControl

From d9e061103a4ff2f11dfc647f3ee5f063b9165665 Mon Sep 17 00:00:00 2001
From: Rami Yushuvaev <ramiy@elementor.com>
Date: Thu, 19 Oct 2023 13:47:00 +0300
Subject: [PATCH 3/5] update

---
 assets/dev/js/admin/pages/panels/scripts-styles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/dev/js/admin/pages/panels/scripts-styles.js b/assets/dev/js/admin/pages/panels/scripts-styles.js
index 2793db5a..07d18faf 100644
--- a/assets/dev/js/admin/pages/panels/scripts-styles.js
+++ b/assets/dev/js/admin/pages/panels/scripts-styles.js
@@ -44,7 +44,7 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 
 			<ToggleControl
 				label={ __( 'Unregister Hello style.css', 'hello-elementor' ) }
-				help={ __( "Disable the Hello theme's style.css file which contains CSS reset rules for unified cross-browser view.", 'hello-elementor' ) }
+				help={ __( "Disable Hello theme's style.css file which contains CSS reset rules for unified cross-browser view.", 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.HELLO_STYLE ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.HELLO_STYLE, value ) }
 			/>
@@ -52,7 +52,7 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 
 			<ToggleControl
 				label={ __( 'Unregister Hello theme.css', 'hello-elementor' ) }
-				help={ __( "Disable the Hello theme's theme.css file which contains CSS rules that style WordPress elements.", 'hello-elementor' ) }
+				help={ __( "Disable Hello theme's theme.css file which contains CSS rules that style WordPress elements.", 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.HELLO_THEME ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.HELLO_THEME, value ) }
 			/>

From d92048c03193f9d134d16f07d4d7e6961b109966 Mon Sep 17 00:00:00 2001
From: Rami Yushuvaev <ramiy@elementor.com>
Date: Thu, 19 Oct 2023 13:51:51 +0300
Subject: [PATCH 4/5] update

---
 assets/dev/js/admin/pages/panels/scripts-styles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/dev/js/admin/pages/panels/scripts-styles.js b/assets/dev/js/admin/pages/panels/scripts-styles.js
index 07d18faf..b9057e08 100644
--- a/assets/dev/js/admin/pages/panels/scripts-styles.js
+++ b/assets/dev/js/admin/pages/panels/scripts-styles.js
@@ -20,7 +20,7 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 
 			<ToggleControl
 				label={ __( 'Unregister wp-embed script', 'hello-elementor' ) }
-				help={ __( 'Disable the script responsible for inline HTML embed of external resources.', 'hello-elementor' ) }
+				help={ __( 'Disable the script which is responsible for embedding external resources.', 'hello-elementor' ) }
 				checked={ !! settingsData[ SETTINGS.OEMBED_SCRIPT ] || false }
 				onChange={ ( value ) => updateSettings( SETTINGS.OEMBED_SCRIPT, value ) }
 			/>

From b33a0a4693451686aa59581d401cd61ada8ffdaa Mon Sep 17 00:00:00 2001
From: Rami Yushuvaev <ramiy@elementor.com>
Date: Thu, 19 Oct 2023 14:03:04 +0300
Subject: [PATCH 5/5] update

---
 assets/dev/js/admin/pages/panels/scripts-styles.js | 4 ++--
 assets/dev/js/admin/pages/settings.js              | 2 +-
 includes/settings-functions.php                    | 4 ++--
 readme.txt                                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/dev/js/admin/pages/panels/scripts-styles.js b/assets/dev/js/admin/pages/panels/scripts-styles.js
index b9057e08..70337210 100644
--- a/assets/dev/js/admin/pages/panels/scripts-styles.js
+++ b/assets/dev/js/admin/pages/panels/scripts-styles.js
@@ -21,8 +21,8 @@ export const PanelScriptsStyles = ( { settingsData, updateSettings } ) => {
 			<ToggleControl
 				label={ __( 'Unregister wp-embed script', 'hello-elementor' ) }
 				help={ __( 'Disable the script which is responsible for embedding external resources.', 'hello-elementor' ) }
-				checked={ !! settingsData[ SETTINGS.OEMBED_SCRIPT ] || false }
-				onChange={ ( value ) => updateSettings( SETTINGS.OEMBED_SCRIPT, value ) }
+				checked={ !! settingsData[ SETTINGS.WP_EMBED_SCRIPT ] || false }
+				onChange={ ( value ) => updateSettings( SETTINGS.WP_EMBED_SCRIPT, value ) }
 			/>
 			<code className="code-example"> &lt;script type=&quot;text/javascript&quot; src=&quot;https://{ window.location.hostname }/wp-includes/js/wp-embed.min.js&quot; /&gt; </code>
 
diff --git a/assets/dev/js/admin/pages/settings.js b/assets/dev/js/admin/pages/settings.js
index e36aa2a1..54f47fcb 100644
--- a/assets/dev/js/admin/pages/settings.js
+++ b/assets/dev/js/admin/pages/settings.js
@@ -16,7 +16,7 @@ export const SETTINGS = {
 	POST_COMMENTS_RSS: '_post_comments_rss',
 	/* Scripts & Styles */
 	EMOJI: '_emoji',
-	OEMBED_SCRIPT: '_oembed_script',
+	WP_EMBED_SCRIPT: '_wp_embed_script',
 	CLASSIC_THEME_STYLES: '_classic_theme_styles',
 	GUTENBERG: '_gutenberg',
 	HELLO_STYLE: '_hello_style',
diff --git a/includes/settings-functions.php b/includes/settings-functions.php
index 887c7525..2a6d7217 100644
--- a/includes/settings-functions.php
+++ b/includes/settings-functions.php
@@ -95,7 +95,7 @@ function hello_elementor_tweak_settings() {
 		'POST_COMMENTS_RSS' => '_post_comments_rss',
 		/* Scripts & Styles */
 		'EMOJI' => '_emoji',
-		'OEMBED_SCRIPT' => '_oembed_script',
+		'WP_EMBED_SCRIPT' => '_wp_embed_script',
 		'CLASSIC_THEME_STYLES' => '_classic_theme_styles',
 		'GUTENBERG' => '_gutenberg',
 		'HELLO_STYLE' => '_hello_style',
@@ -207,7 +207,7 @@ function hello_elementor_render_tweaks( $settings_group, $settings ) {
 		remove_action( 'wp_print_styles', 'wp_enqueue_emoji_styles' ); // WP 6.4 and above
 	} );
 
-	hello_elementor_do_tweak( $settings_group . $settings['OEMBED_SCRIPT'], function() {
+	hello_elementor_do_tweak( $settings_group . $settings['WP_EMBED_SCRIPT'], function() {
 		remove_action( 'wp_head', 'wp_oembed_add_host_js' );
 		add_action( 'wp_enqueue_scripts', function() {
 			wp_deregister_script( 'wp-embed' );
diff --git a/readme.txt b/readme.txt
index 7204cd03..19056d5c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -52,7 +52,7 @@ Source: https://stocksnap.io/photo/4B83RD7BV9
 * New: Option to remove site comments RSS feed.
 * New: Option to remove post comments RSS feed.
 * New: Option to unregister Emoji scripts & styles.
-* New: Option to unregister oEmbed script.
+* New: Option to unregister wp-embed script.
 * New: Option to unregister classic-theme styles.
 * New: Option to unregister Gutenberg styles.
 * New: Option to unregister Hello style.css.