Prepare Gridable 1.2.10 for WordPress 7.0

Author: georgeolaru

.gitignore

@@ -18,8 +18,9 @@ wp-content/plugins/hello.php
 
 .sass-cache
 node_modules
+.claude
 
 admin/css/*.map
 public/css/*.map
 
-*.map
+*.map

admin/addons/attributes.php

@@ -1,5 +1,9 @@
 <?php
-// print option html
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+// Print option HTML templates used by the Classic Editor media modal.
 function gridable_default_attributes_modal_options_templates() { ?>
 	<script type="text/html" id="tmpl-gridable-row-option-color">
 		<fieldset class="colorpicker">
@@ -49,4 +53,4 @@ function gridable_default_attributes_modal_options_templates() { ?>
 	</script>
 
 <?php }
-add_action( 'gridable_print_row_options_templates', 'gridable_default_attributes_modal_options_templates' );
+add_action( 'gridable_print_row_options_templates', 'gridable_default_attributes_modal_options_templates' );

admin/class-gridable-admin.php

@@ -1,5 +1,9 @@
 <?php
 
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * The admin-specific functionality of the plugin.
  *
@@ -58,22 +62,33 @@ public function add_media_button( $editor_id ) {
 		$icon = '<span class="wp-media-buttons-icon dashicons dashicons-layout" style="font-size:16px;margin-top:-2px;"></span>';
 
 		printf( '<a href="#" class="button gridable-insert-row-button" id="%s" data-editor="%s" title="%s">%s %s</a>',
-			'gridable-add-row-button-' . $editor_id,
+			esc_attr( 'gridable-add-row-button-' . $editor_id ),
 			esc_attr( $editor_id ),
 			esc_attr__( 'Add Row', 'gridable' ),
-			$icon,
+			wp_kses( $icon, array(
+				'span' => array(
+					'class' => true,
+					'style' => true,
+				),
+			) ),
 			esc_html__( 'Add Row', 'gridable' )
 		);
 
 		/**
 		 * Enqueue the editor script only when there is an editor on page.
 		 * We ditch `admin_enqueue_scripts` intentionally since the editor can appear on non-edit pages like theme options
 		 */
-		wp_register_script( 'select2', plugin_dir_url( __FILE__ ) . 'js/select2.min.js', array( 'jquery' ), $this->version );
+		wp_register_script( 'select2', plugin_dir_url( __FILE__ ) . 'js/select2.min.js', array( 'jquery' ), $this->version, true );
 
 		wp_enqueue_script( 'gridable-add-row-button', plugin_dir_url( __FILE__ ) . 'js/add-row-button.js', array(
+			'backbone',
 			'jquery',
+			'media-editor',
+			'media-views',
+			'quicktags',
+			'shortcode',
 			'wp-color-picker',
+			'wp-util',
 			'select2',
 		), $this->version, true );
 
@@ -116,13 +131,13 @@ public function print_tinymce_templates() {
 		$row_classes = array(
 			'gridable',
 			'gridable--grid',
-			'grid'
+			'grid',
 		);
 		$col_classes = array(
-			'grid__item'
+			'grid__item',
 		); ?>
-<script type="text/html" id="tmpl-gridable-grider-row"><section contenteditable="false" class="{{data.classes}} <?php echo join( ' ', apply_filters( 'gridable_mce_sh_row_classes', $row_classes ) ); ?>" {{{data.atts}}} data-gridable-row="1" data-mce-resize="false" data-mce-placeholder="1">{{{data.content}}}</section></script>
-<script type="text/html" id="tmpl-gridable-grider-col"><section unselectable="true" contenteditable="true" class="{{data.classes}} <?php echo join( ' ', apply_filters( 'gridable_mce_sh_col_classes', $col_classes ) ); ?>" {{{data.atts}}} data-mce-resize="false" data-mce-placeholder="1">{{{data.content}}}</section></script>
+<script type="text/html" id="tmpl-gridable-grider-row"><section contenteditable="false" class="{{data.classes}} <?php echo esc_attr( implode( ' ', array_map( 'sanitize_html_class', apply_filters( 'gridable_mce_sh_row_classes', $row_classes ) ) ) ); ?>" {{{data.atts}}} data-gridable-row="1" data-mce-resize="false" data-mce-placeholder="1">{{{data.content}}}</section></script>
+<script type="text/html" id="tmpl-gridable-grider-col"><section unselectable="true" contenteditable="true" class="{{data.classes}} <?php echo esc_attr( implode( ' ', array_map( 'sanitize_html_class', apply_filters( 'gridable_mce_sh_col_classes', $col_classes ) ) ) ); ?>" {{{data.atts}}} data-mce-resize="false" data-mce-placeholder="1">{{{data.content}}}</section></script>
 	<?php
 		do_action( 'gridable_print_row_options_templates' );
 		do_action( 'gridable_print_column_options_templates' );
@@ -150,8 +165,8 @@ public function change_tinymce_settings( $settings ) {
 
 	public function styles_scripts() { ?>
 		<script type="text/javascript">
-            var gridable_params = {
-                l10n: JSON.parse('<?php echo json_encode( apply_filters( 'gridable_editor_l10n_labels', array(
+			window.gridable_params = window.gridable_params || {};
+			window.gridable_params.l10n = <?php echo wp_json_encode( apply_filters( 'gridable_editor_l10n_labels', array(
 					'remove_row'         => esc_html__( 'Remove Row', 'gridable' ),
 					'remove_column'      => esc_html__( 'Remove Column', 'gridable' ),
 					'edit_row'           => esc_html__( 'Edit Row Options', 'gridable' ),
@@ -160,8 +175,7 @@ public function styles_scripts() { ?>
 					'new_column_content' => esc_html__( 'Content', 'gridable' ),
 					'column'             => esc_html__( 'Column', 'gridable' ),
 					'row'                => esc_html__( 'Row', 'gridable' ),
-				) ) ) ?>')
-            };
+				) ) ); ?>;
 		</script>
 		<?php
 	}

gridable.php

@@ -3,16 +3,16 @@
  * Plugin Name:       Gridable
  * Plugin URI:        https://pixelgrade.com/
  * Description:       A simple and intuitive tool for organizing your content into columns and rows.
- * Version:           1.2.9
+ * Version:           1.2.10
  * Author:            Pixelgrade
  * Author URI:        https://pixelgrade.com/
- * License:           GPL-2.0+
+ * License:           GPL-2.0-or-later
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
  * Text Domain:       gridable
  * Domain Path:       /languages
- * Requires at least: 4.9.9
- * Tested up to: 5.5.1
- * Requires PHP: 5.4.0
+ * Requires at least: 5.9.0
+ * Tested up to: 7.0
+ * Requires PHP: 7.4
  */
 
 // If this file is called directly, abort.
@@ -24,7 +24,7 @@
  * The code that runs during plugin activation.
  * This action is documented in includes/class-gridable-activator.php
  */
-function activate_gridable() {
+function gridable_activate() {
 	require_once plugin_dir_path( __FILE__ ) . 'includes/class-gridable-activator.php';
 	Gridable_Activator::activate();
 }
@@ -33,13 +33,13 @@ function activate_gridable() {
  * The code that runs during plugin deactivation.
  * This action is documented in includes/class-gridable-deactivator.php
  */
-function deactivate_gridable() {
+function gridable_deactivate() {
 	require_once plugin_dir_path( __FILE__ ) . 'includes/class-gridable-deactivator.php';
 	Gridable_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_gridable' );
-register_deactivation_hook( __FILE__, 'deactivate_gridable' );
+register_activation_hook( __FILE__, 'gridable_activate' );
+register_deactivation_hook( __FILE__, 'gridable_deactivate' );
 
 /**
  * The core plugin class that is used to define internationalization,
@@ -56,10 +56,10 @@ function deactivate_gridable() {
  *
  * @since    1.0.0
  */
-function run_gridable() {
+function gridable_run() {
 	global $gridable_plugin;
-	$gridable_plugin = new Gridable( '1.2.9');
+	$gridable_plugin = new Gridable( '1.2.10' );
 	$gridable_plugin->run();
 
 }
-run_gridable();
+gridable_run();

includes/class-gridable-i18n.php

@@ -1,5 +1,9 @@
 <?php
 
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * Define the internationalization functionality
  *
@@ -33,13 +37,7 @@ class Gridable_i18n {
 	 * @since    1.0.0
 	 */
 	public function load_plugin_textdomain() {
-
-		load_plugin_textdomain(
-			'gridable',
-			false,
-			dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
-		);
-
+		// WordPress.org loads plugin language packs for this slug automatically.
 	}
 
 

includes/class-gridable-loader.php

@@ -1,5 +1,9 @@
 <?php
 
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * Register all actions and filters for the plugin
  *
@@ -102,7 +106,7 @@ private function add( $hooks, $hook, $component, $callback, $priority, $accepted
 			'component'     => $component,
 			'callback'      => $callback,
 			'priority'      => $priority,
-			'accepted_args' => $accepted_args
+			'accepted_args' => $accepted_args,
 		);
 
 		return $hooks;

includes/class-gridable.php

@@ -1,5 +1,9 @@
 <?php
 
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * The file that defines the core plugin class
  *
@@ -162,7 +166,7 @@ protected function is_gutenberg_active() {
 	 * @return bool
 	 */
 	protected function is_classic_editor_plugin_active() {
-		if ( class_exists( 'Classic_Editor') && method_exists('Classic_Editor', 'init_actions' ) ) {
+		if ( class_exists( 'Classic_Editor' ) && method_exists( 'Classic_Editor', 'init_actions' ) ) {
 			return true;
 		}
 
@@ -207,8 +211,10 @@ public function define_admin_hooks() {
 
 		add_action( 'media_buttons', array( $plugin_admin, 'add_media_button' ), 15 );
 
-		// Check if Gutenberg is active and if we are in the Editor screen
-		if ( ! $this->is_gutenberg_active() && is_admin() ) {
+		// Gridable's editing UI is intentionally limited to Classic Editor/TinyMCE.
+		// Register the TinyMCE plugin whenever admin TinyMCE initializes so Classic Editor
+		// per-post switching works even when the global default editor is the block editor.
+		if ( is_admin() ) {
 			add_filter( 'mce_external_plugins', array( $plugin_admin, 'add_tinymce_plugin' ) );
 		}
 

package.json

@@ -2,7 +2,7 @@
   "name": "gridable",
   "repository": "git+https://github.com/pixelgrade/gridable.git",
   "author": "Pixelgrade",
-  "license": "GPL-2.0+",
+  "license": "GPL-2.0-or-later",
   "keywords": [
     "Pixelgrade",
     "Grid"
@@ -14,7 +14,7 @@
     "gulp-autoprefixer": "^6.0.0",
     "gulp-concat": "^2.6.1",
     "gulp-exec": "^3.0.2",
-    "gulp-help": "github:chmontgomery/gulp-help#gulp4",
+    "gulp-help": "git+https://github.com/chmontgomery/gulp-help.git#gulp4",
     "gulp-load-plugins": "*",
     "gulp-rsync": "*",
     "gulp-rtlcss": "^1.2.0",