Changeset 3689958

Timestamp:

09/10/2026 01:19:12 PM (6 weeks ago)

Author:

voordemensen

Message:

2.1.4: guard wp.data subscriber in admin script (fixes Yoast editor breakage since 2.1.3)

Location:

voordemensen

Files:

• tags/2.1.4 (copied) (copied from voordemensen/trunk )
• tags/2.1.4/css (copied) (copied from voordemensen/trunk/css )
• tags/2.1.4/js (copied) (copied from voordemensen/trunk/js )
• tags/2.1.4/js/vdm_adminscript.js (modified) (2 diffs)
• tags/2.1.4/js/vdm_session.js (copied) (copied from voordemensen/trunk/js/vdm_session.js )
• tags/2.1.4/readme.txt (copied) (copied from voordemensen/trunk/readme.txt ) (2 diffs)
• tags/2.1.4/voordemensen.php (copied) (copied from voordemensen/trunk/voordemensen.php ) (3 diffs)
• tags/2.1.4/voordemensen_admin.php (copied) (copied from voordemensen/trunk/voordemensen_admin.php )
• tags/2.1.4/voordemensen_metaboxes.php (copied) (copied from voordemensen/trunk/voordemensen_metaboxes.php )
• tags/2.1.4/voordemensen_shortcodes.php (copied) (copied from voordemensen/trunk/voordemensen_shortcodes.php )
• trunk/js/vdm_adminscript.js (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/voordemensen.php (modified) (3 diffs)

voordemensen/tags/2.1.4/js/vdm_adminscript.js

@@ -4 +4 @@
   * @fires createNotice
 */
-const unsubscribe = wp.data.subscribe(function () {
-    let select = wp.data.select('core/editor');
-    var isSavingPost = select.isSavingPost();
-    var isAutosavingPost = select.isAutosavingPost();
-    var didPostSaveRequestSucceed = select.didPostSaveRequestSucceed();
-    var EditedPostContent = select.getEditedPostContent();
-    if (isSavingPost && !isAutosavingPost && didPostSaveRequestSucceed) {
-        if(EditedPostContent.includes('[vdm') && !jQuery('#voordemensen_event_id').val()) {
+( function ( wp ) {
+    if ( ! wp || ! wp.data || typeof wp.data.subscribe !== 'function' ) {
+        return;
+    }
+
+    var unsubscribe = wp.data.subscribe( function () {
+        // Other plugins' stores (e.g. Yoast SEO) can emit before 'core/editor' is registered,
+        // and some editor screens never register it at all. Never throw inside a subscriber:
+        // an exception here aborts wp.data's listener loop and breaks every other plugin
+        // that subscribed to the same store.
+        var editor = wp.data.select( 'core/editor' );
+        if ( ! editor || typeof editor.isSavingPost !== 'function' ) {
+            return;
+        }
+
+        if ( ! editor.isSavingPost() || editor.isAutosavingPost() || ! editor.didPostSaveRequestSucceed() ) {
+            return;
+        }
+
+        var content    = editor.getEditedPostContent() || '';
+        var eventField = document.getElementById( 'voordemensen_event_id' );
+        var eventId    = eventField ? eventField.value : '';
+
+        if ( content.indexOf( '[vdm' ) !== -1 && ! eventId ) {
             unsubscribe();
-            jQuery('#voordemensen_event_id').focus();
-            ( function( wp ) {
-                wp.data.dispatch( 'core/notices' ).createNotice(
+            if ( eventField ) {
+                eventField.focus();
+            }
+            var notices = wp.data.dispatch( 'core/notices' );
+            if ( notices && typeof notices.createNotice === 'function' ) {
+                notices.createNotice(
                     'error',
-                    'Let op: je gebruikt een VoordeMensen-shortcode terwijl deze post niet aan een VoordeMensen Evenement is gekoppeld!', 
+                    'Let op: je gebruikt een VoordeMensen-shortcode terwijl deze post niet aan een VoordeMensen Evenement is gekoppeld!',
                     {
                         isDismissible: true,
@@ -23 +42 @@
                     }
                 );
-            } )( window.wp );
-        }        
-    }
-});
+            }
+        }
+    } );
+} )( window.wp );

voordemensen/tags/2.1.4/readme.txt

@@ -6 +6 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 2.1.3
+Stable tag: 2.1.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -62 +62 @@
 == Changelog ==
 
+= 2.1.4 =
+Fixed: since 2.1.3 the block editor's save-warning script could break other plugins' editor UI (reported with Yoast SEO: its dropdowns no longer opened) with the console error "Cannot read properties of undefined (reading 'isSavingPost')". The script subscribed to wp.data and read the 'core/editor' store unguarded; when another plugin's store updated before 'core/editor' was registered, the callback threw and aborted wp.data's listener loop for everyone. The script now checks that the store exists before using it, declares its wp-data / wp-notices dependencies, and is only loaded in the block editor of a post or page.
+
 = 2.1.3 =
 Fixed: the editor save-warning that flags a VoordeMensen shortcode on a post with no linked event never appeared, because its admin script was enqueued under a handle it was not registered with, so the script never loaded. It now works in the block editor.

voordemensen/tags/2.1.4/voordemensen.php

@@ -4 +4 @@
  * Plugin URI:        https://github.com/VoordeMensen/wordpress-plugin
  * Description:       Verbind WordPress met het VoordeMensen kaartverkoopsysteem
- * Version:           2.1.3
+ * Version:           2.1.4
  * Requires at least: 5.0
  * Requires PHP:      7.4
@@ -158 +158 @@
 add_action('init', 'voordemensen_register_script');
 function voordemensen_register_script(){
-        wp_register_script( 'vdm_script', plugins_url('/js/vdm_script.js', __FILE__), array('jquery'), '2.1.3', true );
+        wp_register_script( 'vdm_script', plugins_url('/js/vdm_script.js', __FILE__), array('jquery'), '2.1.4', true );
 }
 add_action('admin_init', 'voordemensen_register_adminscript');
 function voordemensen_register_adminscript() {
-        wp_register_script( 'vdm_adminscript', plugins_url('/js/vdm_adminscript.js', __FILE__), array('jquery'), '2.1.3', true);
+        // Uses wp.data (core/editor + core/notices); depend on those handles so load order is guaranteed.
+        wp_register_script( 'vdm_adminscript', plugins_url('/js/vdm_adminscript.js', __FILE__), array('wp-data', 'wp-notices'), '2.1.4', true);
 }
 
@@ -171 +172 @@
 }
 
+// The save-warning script only makes sense in the block editor of a post/page:
+// enqueue_block_editor_assets fires only when the block editor is loaded, and the
+// screen check skips the site editor / widgets screen where 'core/editor' does not exist.
+add_action( 'enqueue_block_editor_assets', 'voordemensen_enqueue_block_editor_script' );
+function voordemensen_enqueue_block_editor_script() {
+    $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
+    if ( $screen && 'post' !== $screen->base ) {
+        return;
+    }
+    wp_enqueue_script( 'vdm_adminscript' );
+}
+
 function voordemensen_admin_queue( $hook ) {
-    global $post; 
-    if ( $hook == 'post-new.php' || $hook == 'post.php' ) {
-                wp_enqueue_script('vdm_adminscript');
-    }
-
     // Register and enqueue the external CSS file
-    wp_register_style('voordemensen_admin_style', plugins_url('css/admin-style.css', __FILE__), array(), '2.1.3');
+    wp_register_style('voordemensen_admin_style', plugins_url('css/admin-style.css', __FILE__), array(), '2.1.4');
     wp_enqueue_style('voordemensen_admin_style');
 }

voordemensen/trunk/js/vdm_adminscript.js

@@ -4 +4 @@
   * @fires createNotice
 */
-const unsubscribe = wp.data.subscribe(function () {
-    let select = wp.data.select('core/editor');
-    var isSavingPost = select.isSavingPost();
-    var isAutosavingPost = select.isAutosavingPost();
-    var didPostSaveRequestSucceed = select.didPostSaveRequestSucceed();
-    var EditedPostContent = select.getEditedPostContent();
-    if (isSavingPost && !isAutosavingPost && didPostSaveRequestSucceed) {
-        if(EditedPostContent.includes('[vdm') && !jQuery('#voordemensen_event_id').val()) {
+( function ( wp ) {
+    if ( ! wp || ! wp.data || typeof wp.data.subscribe !== 'function' ) {
+        return;
+    }
+
+    var unsubscribe = wp.data.subscribe( function () {
+        // Other plugins' stores (e.g. Yoast SEO) can emit before 'core/editor' is registered,
+        // and some editor screens never register it at all. Never throw inside a subscriber:
+        // an exception here aborts wp.data's listener loop and breaks every other plugin
+        // that subscribed to the same store.
+        var editor = wp.data.select( 'core/editor' );
+        if ( ! editor || typeof editor.isSavingPost !== 'function' ) {
+            return;
+        }
+
+        if ( ! editor.isSavingPost() || editor.isAutosavingPost() || ! editor.didPostSaveRequestSucceed() ) {
+            return;
+        }
+
+        var content    = editor.getEditedPostContent() || '';
+        var eventField = document.getElementById( 'voordemensen_event_id' );
+        var eventId    = eventField ? eventField.value : '';
+
+        if ( content.indexOf( '[vdm' ) !== -1 && ! eventId ) {
             unsubscribe();
-            jQuery('#voordemensen_event_id').focus();
-            ( function( wp ) {
-                wp.data.dispatch( 'core/notices' ).createNotice(
+            if ( eventField ) {
+                eventField.focus();
+            }
+            var notices = wp.data.dispatch( 'core/notices' );
+            if ( notices && typeof notices.createNotice === 'function' ) {
+                notices.createNotice(
                     'error',
-                    'Let op: je gebruikt een VoordeMensen-shortcode terwijl deze post niet aan een VoordeMensen Evenement is gekoppeld!', 
+                    'Let op: je gebruikt een VoordeMensen-shortcode terwijl deze post niet aan een VoordeMensen Evenement is gekoppeld!',
                     {
                         isDismissible: true,
@@ -23 +42 @@
                     }
                 );
-            } )( window.wp );
-        }        
-    }
-});
+            }
+        }
+    } );
+} )( window.wp );

voordemensen/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 2.1.3
+Stable tag: 2.1.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -62 +62 @@
 == Changelog ==
 
+= 2.1.4 =
+Fixed: since 2.1.3 the block editor's save-warning script could break other plugins' editor UI (reported with Yoast SEO: its dropdowns no longer opened) with the console error "Cannot read properties of undefined (reading 'isSavingPost')". The script subscribed to wp.data and read the 'core/editor' store unguarded; when another plugin's store updated before 'core/editor' was registered, the callback threw and aborted wp.data's listener loop for everyone. The script now checks that the store exists before using it, declares its wp-data / wp-notices dependencies, and is only loaded in the block editor of a post or page.
+
 = 2.1.3 =
 Fixed: the editor save-warning that flags a VoordeMensen shortcode on a post with no linked event never appeared, because its admin script was enqueued under a handle it was not registered with, so the script never loaded. It now works in the block editor.

voordemensen/trunk/voordemensen.php

@@ -4 +4 @@
  * Plugin URI:        https://github.com/VoordeMensen/wordpress-plugin
  * Description:       Verbind WordPress met het VoordeMensen kaartverkoopsysteem
- * Version:           2.1.3
+ * Version:           2.1.4
  * Requires at least: 5.0
  * Requires PHP:      7.4
@@ -158 +158 @@
 add_action('init', 'voordemensen_register_script');
 function voordemensen_register_script(){
-        wp_register_script( 'vdm_script', plugins_url('/js/vdm_script.js', __FILE__), array('jquery'), '2.1.3', true );
+        wp_register_script( 'vdm_script', plugins_url('/js/vdm_script.js', __FILE__), array('jquery'), '2.1.4', true );
 }
 add_action('admin_init', 'voordemensen_register_adminscript');
 function voordemensen_register_adminscript() {
-        wp_register_script( 'vdm_adminscript', plugins_url('/js/vdm_adminscript.js', __FILE__), array('jquery'), '2.1.3', true);
+        // Uses wp.data (core/editor + core/notices); depend on those handles so load order is guaranteed.
+        wp_register_script( 'vdm_adminscript', plugins_url('/js/vdm_adminscript.js', __FILE__), array('wp-data', 'wp-notices'), '2.1.4', true);
 }
 
@@ -171 +172 @@
 }
 
+// The save-warning script only makes sense in the block editor of a post/page:
+// enqueue_block_editor_assets fires only when the block editor is loaded, and the
+// screen check skips the site editor / widgets screen where 'core/editor' does not exist.
+add_action( 'enqueue_block_editor_assets', 'voordemensen_enqueue_block_editor_script' );
+function voordemensen_enqueue_block_editor_script() {
+    $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
+    if ( $screen && 'post' !== $screen->base ) {
+        return;
+    }
+    wp_enqueue_script( 'vdm_adminscript' );
+}
+
 function voordemensen_admin_queue( $hook ) {
-    global $post; 
-    if ( $hook == 'post-new.php' || $hook == 'post.php' ) {
-                wp_enqueue_script('vdm_adminscript');
-    }
-
     // Register and enqueue the external CSS file
-    wp_register_style('voordemensen_admin_style', plugins_url('css/admin-style.css', __FILE__), array(), '2.1.3');
+    wp_register_style('voordemensen_admin_style', plugins_url('css/admin-style.css', __FILE__), array(), '2.1.4');
     wp_enqueue_style('voordemensen_admin_style');
 }