WordPress 4.1

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / wordpress / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js
index 15f0ccf541b19caa321e15d110b9952dbfac879b..f3af6490ced16185f755fd0f26901c0bd61382ec 100644 (file)
--- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -7,6 +7,10 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
        var DOM = tinymce.DOM, wpAdvButton, modKey, style,
                last = 0;
 
+       if ( typeof window.jQuery !== 'undefined' ) {
+               window.jQuery( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
+       }
+
        function toggleToolbars( state ) {
                var iframe, initial, toolbars,
                        pixels = 0;
@@ -189,8 +193,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
                        title: 'Keyboard Shortcuts',
                        width: 450,
                        height: 420,
-                       inline: 1,
-                       classes: 'wp-help'
+                       classes: 'wp-help',
+                       buttons: { text: 'Close', onclick: 'close' }
                });
        });