WordPress 3.9.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 64c5ff1c5a0fec0e0a176b6f32f54f87231d66a6..b79146ac05424a41b21cef126906b4e74abc77e7 100644 (file)
--- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -63,7 +63,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
        // Hide the toolbars after loading
        editor.on( 'PostRender', function() {
-               if ( getUserSetting('hidetb', '0') === '0' ) {
+               if ( editor.getParam( 'wordpress_adv_hidden', true ) && getUserSetting( 'hidetb', '0' ) === '0' ) {
                        toggleToolbars( 'hide' );
                }
        });
@@ -317,7 +317,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
                        dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
                                if ( typeof window.jQuery !== 'undefined' ) {
                                        // Trigger the jQuery handlers.
-                                       window.jQuery( document ).triggerHandler( event.type );
+                                       window.jQuery( document ).trigger( new window.jQuery.Event( event ) );
                                }
                        });
                }