sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@28024 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-04-07 22:54:13 +00:00
parent 0d6acf5b5b
commit e28f610ead
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-includes/class-wp-editor.php
View File

@ -733,6 +733,15 @@ final class _WP_Editors {
add_thickbox();
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 ) );
}
public static function wp_mce_translation() {

4
src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js
View File

@ -30,9 +30,9 @@ tinymce.WPWindowManager = tinymce.InlineWindowManager = function( editor ) {
}
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.");
}
return;