From 6b9eccd1f0e3c111e6e0f570efe0f5f36bada298 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 26 Mar 2014 23:12:48 +0000 Subject: [PATCH] Add an .html4-captions class to the editor when HTML5 captions are not supported, for theme use. see #26642. git-svn-id: https://develop.svn.wordpress.org/trunk@27758 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js | 7 +++---- src/wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 2d2e587fdd..9e448b782a 100644 --- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -397,11 +397,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } editor.on( 'init', function() { - var dom = editor.dom; + var dom = editor.dom, + captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions'; - if ( editor.getParam( 'wpeditimage_html5_captions' ) ) { - dom.addClass( editor.getBody(), 'html5-captions' ); - } + dom.addClass( editor.getBody(), captionClass ); // Add caption field to the default image dialog editor.on( 'wpLoadImageForm', function( event ) { diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php index b7cfc2135e..66921e43b8 100644 --- a/src/wp-includes/version.php +++ b/src/wp-includes/version.php @@ -18,7 +18,7 @@ $wp_db_version = 26691; * * @global string $tinymce_version */ -$tinymce_version = '4020-20140319a'; +$tinymce_version = '4020-20140326'; /** * Holds the required PHP version