Changeset 25922 for branches/3.7

Timestamp:

10/26/2013 02:51:31 AM (7 years ago)

Author:

nacin

Message:

3.7 regression: Fix the width of captioned images inserted into the visual editor.

Pulls some arithmetic outside of some string concatenation to avoid a nasty uglify.js regression: ​https://github.com/mishoo/UglifyJS2/pull/330.

Merges [25921] to the 3.7 branch.

props LucP.
fixes #25700.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (modified) (1 diff)

branches/3.7/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js

@@ -161 +161 @@
                     div_cls += ' mceIEcenter';
 
-                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+( 10 + parseInt(w) )+
+                w = parseInt( w, 10 ) + 10;
+                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+w+
                 'px"><dt class="wp-caption-dt">'+img+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
             });