Changeset 28024

Timestamp:

04/07/2014 10:54:13 PM (11 years ago)

Author:

azaozz

Message:

Fix typo and add more text to the error shown when 'wpdialogs' is not enqueued. Add 'wp_enqueue_editor' action fired when scripts and styles for the editor are being enqueued, fixes #16284

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wpdialogs/plugin.js (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -734 +734 @@
             wp_enqueue_script('media-upload');
         }
+
+        /**
+         * Fires when scripts and styles are enqueued for the editor
+         *
+         * @since 3.9.0
+         *
+         * @param array An array containing boolean values whether TinyMCE and Quicktags are being loaded.
+         */
+        do_action( 'wp_enqueue_editor', array( 'tinymce' => self::$has_tinymce, 'quicktags' => self::$has_quicktags ) ); 
     }
 

trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js

@@ -31 +31 @@
 
         if ( typeof jQuery === 'undefined' || ! jQuery.wp || ! jQuery.wp.wpdialog ) {
-            // wpdialod.js is not loaded
+            // wpdialog.js is not loaded
             if ( window.console && window.console.error ) {
-                window.console.error('wpdialog.js is not loaded. Please set it as dependency for your script when calling wp_enqueue_script().');
+                window.console.error("wpdialog.js is not loaded. Please set 'wpdialogs' as dependency for your script when calling wp_enqueue_script(). You may also want to enqueue the 'wp-jquery-ui-dialog' stylesheet.");
             }