Merge pull request #111 from oceanwp/rc-2.4.3

Rc 2.4.3
oceanwp · Nov 28, 2024 · 50d6fb3 · 50d6fb3
2 parents 09ae33a + 54fd3fd
commit 50d6fb3
Show file tree

Hide file tree

Showing 13 changed files with 290 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -269,6 +269,7 @@ build/
 
 # src folder
 includes/post-settings/src/
+includes/post-settings/oe-ps-src/
 
 # vender folder
 vendor/

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -145,6 +145,7 @@ module.exports = function (grunt) {
                     "!node_modules/**",
                     "!includes/post-settings/node_modules/**",
                     "!includes/post-settings/src/**",
+                    "!includes/post-settings/oe-ps-src/**",
                     "!build/**",
                     "!src/**",
                     "!.git/**",

diff --git a/assets/js/oceanwp-plugin-install.js b/assets/js/oceanwp-plugin-install.js
@@ -1,5 +1,6 @@
 jQuery(document).ready(function($) {
-    $(document).on('click', '.install-now', function(e) {
+    // Target only the plugin list in your custom tab
+    $('#oceanwp-plugin-list').on('click', '.install-now', function(e) {
         e.preventDefault();
 
         var button = $(this);
@@ -31,7 +32,7 @@ jQuery(document).ready(function($) {
         });
     });
 
-    $(document).on('click', '.activate-now', function(e) {
+    $('#oceanwp-plugin-list').on('click', '.activate-now', function(e) {
         e.preventDefault();
 
         var button = $(this);
@@ -60,6 +61,5 @@ jQuery(document).ready(function($) {
                 alert('An error occurred. Please try again.');
             }
         });
-
     });
 });
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,12 @@
 == Changelog ==
 
+= 2.4.3 - NOV 27 2024 =
+- Added: Compatibility: WordPress: Bottom margin styles for wp.components.SelectControl is deprecated since version 6.7 and will be removed in version 7.0.
+- Added: Compatibility: WordPress: Bottom margin styles for wp.components.BaseControl is deprecated since version 6.7 and will be removed in version 7.0.
+- Added: Compatibility: WordPress: Bottom margin styles for wp.components.TextControl is deprecated since version 6.7 and will be removed in version 7.0.
+- Fixed: Plugin installation error on some instances "Installation failed; Destination folder already exists.".
+- Fixed: Customizer: Site Preloader: Typo error for "Default Text".
+
 = 2.4.2 - OCT 29 2024 =
 - Updated: Freemius SDK: version 2.9.0
 - Updated: Compatibility: WordPress: version number.

diff --git a/includes/plugins-tab.php b/includes/plugins-tab.php
@@ -34,8 +34,8 @@ public function __construct() {
 	 * Enqueues the necessary scripts for handling AJAX plugin installation.
 	 */
 	public function enqueue_scripts( $hook_suffix ) {
-		// Only enqueue the scripts on the plugin installation page.
-		if ( $hook_suffix === 'plugin-install.php' || $hook_suffix === 'plugin-information' ) {
+		// Only enqueue the scripts on the plugin installation page and our custom tab.
+		if ( 'plugin-install.php' === $hook_suffix && isset( $_GET['tab'] ) && 'oceanwp_plugins_tab' === $_GET['tab'] ) {
 			wp_enqueue_script( 'plugin-install' );
 			wp_enqueue_script( 'updates' );
 			wp_enqueue_script( 'oceanwp-plugin-install', plugin_dir_url( __FILE__ ) . '../assets/js/oceanwp-plugin-install.js', array( 'jquery' ), OE_VERSION, true );
@@ -72,29 +72,32 @@ public function display_oceanwp_plugins_tab_content() {
 		if ( ! current_user_can( 'install_plugins' ) ) {
 			wp_die( __( 'You do not have sufficient permissions to access this page.', 'ocean-extra' ) );
 		}
-
+	
 		?>
 		<div class="wrap">
 			<h2><?php _e( 'For OceanWP', 'ocean-extra' ); ?></h2>
-			<?php
-			// Query Plugins by Author.
-			$api = plugins_api(
-				'query_plugins',
-				array(
-					'author'   => 'oceanwp',
-					'per_page' => 20,
-				)
-			);
-
-			if ( is_wp_error( $api ) ) {
-				echo '<div class="error"><p>' . $api->get_error_message() . '</p></div>';
-			} else {
-				$this->ocean_display_plugins_table( $api->plugins );
-			}
-			?>
+			<div id="oceanwp-plugin-list">
+				<?php
+				// Query Plugins by Author.
+				$api = plugins_api(
+					'query_plugins',
+					array(
+						'author'   => 'oceanwp',
+						'per_page' => 20,
+					)
+				);
+
+				if ( is_wp_error( $api ) ) {
+					echo '<div class="error"><p>' . $api->get_error_message() . '</p></div>';
+				} else {
+					$this->ocean_display_plugins_table( $api->plugins );
+				}
+				?>
+			</div>
 		</div>
 		<?php
 	}
+
 
 	/**
 	 * Displays the plugins using the default WordPress layout.

diff --git a/includes/post-settings/assets/index.asset.php b/includes/post-settings/assets/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives'), 'version' => '1bc0ef77bcda560111fc');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives'), 'version' => '73df94afd5b3eb33ddab');
diff --git a/includes/post-settings/assets/index.js b/includes/post-settings/assets/index.js
diff --git a/includes/post-settings/package.json b/includes/post-settings/package.json
@@ -3,8 +3,8 @@
     "version": "1.0.0",
     "description": "OceanWP Post Settings",
     "scripts": {
-        "build": "wp-scripts build src/index.js --output-path=assets",
-        "start": "wp-scripts start src/index.js --output-path=assets",
+        "build": "wp-scripts build oe-ps-src/index.js --output-path=assets",
+        "start": "wp-scripts start oe-ps-src/index.js --output-path=assets",
         "lint:js": "wp-scripts lint-js",
         "lint:pkg-json": "wp-scripts lint-pkg-json"
     },

diff --git a/includes/preloader/customizer.php b/includes/preloader/customizer.php
@@ -205,7 +205,7 @@ public function register_customize_options($options) {
 
 				'oe_title_for_preloader_default_settings' => [
 					'type'            => 'ocean-title',
-					'label'           => esc_html__( 'Defualt Preloader Settings', 'ocean-extra' ),
+					'label'           => esc_html__( 'Default Preloader Settings', 'ocean-extra' ),
 					'section'         => 'ocean_preloader',
 					'transport'       => 'postMessage',
 					'priority'        => 10,

diff --git a/includes/update-message.php b/includes/update-message.php
@@ -106,28 +106,6 @@ public function plugin_update_message( $plugin_data, $new_data ) {
 
 		}
 
-		/**
-		 * Enqueue scripts
-		 *
-		 * @since   2.2.9
-		 */
-		public function ms_plugin_update_message( $file, $plugin ) {
-
-			if ( is_multisite() && version_compare( $plugin['Version'], $plugin['new_version'], '<') ) {
-
-				$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-
-				printf(
-					'<tr class="plugin-update-tr">
-						<td colspan="%s" class="plugin-update update-message notice inline notice-warning notice-alt">%s</td>
-					</tr>',
-					$wp_list_table->get_column_count(),
-					$this->plugin_update_content()
-				);
-			}
-
-		}
-
 		/**
 		 * Script
 		 */
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives'), 'version' => '1bc0ef77bcda560111fc');
		<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives'), 'version' => '73df94afd5b3eb33ddab');