From f2d2f6bb458104dac3cb4488abf39bdf1710c4aa Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Mon, 19 Nov 2012 01:23:45 +0000 Subject: [PATCH] Media: Make TinyMCE attachment and gallery controls always show when the corresponding view is selected. props SergeyBiryukov. fixes #22463, see #21390. git-svn-id: https://develop.svn.wordpress.org/trunk@22652 602fd350-edb4-49c9-b593-d223f7449a82 --- .../tinymce/plugins/wordpress/editor_plugin_src.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js index a50ebf10ee..dd02ebf56e 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js @@ -6,7 +6,7 @@ var DOM = tinymce.DOM; tinymce.create('tinymce.plugins.WordPress', { - mceTout : 0, + showButtons : 0, init : function(ed, url) { var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key; @@ -375,14 +375,11 @@ 'display' : 'block' }); - if ( this.mceTout ) - clearTimeout(this.mceTout); - - this.mceTout = setTimeout( function(){ed.plugins.wordpress._hideButtons();}, 5000 ); + this.showButtons = true; }, _hideButtons : function() { - if ( !this.mceTout ) + if ( ! this.showButtons ) return; if ( document.getElementById('wp_editbtns') ) @@ -391,8 +388,7 @@ if ( document.getElementById('wp_gallerybtns') ) tinymce.DOM.hide('wp_gallerybtns'); - clearTimeout(this.mceTout); - this.mceTout = 0; + this.showButtons = false; }, // Resizes the iframe by a relative height value