Ticket #14380: 14380.diff

wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js

@@ -113 +113 @@
 
                 _do_shcode : function(co) {
                         return co.replace(/(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?[\s\u00a0]*/g, function(a,b,c){
-                                var id, cls, w, cap, div_cls;
+                                var id, cls, cap, div_cls;
                                 
                                 b = b.replace(/\\'|\\&#39;|\\&#039;/g, '&#39;').replace(/\\"|\\&quot;/g, '&quot;');
                                 c = c.replace(/\\&#39;|\\&#039;/g, '&#39;').replace(/\\&quot;/g, '&quot;');
                                 id = b.match(/id=['"]([^'"]+)/i);
                                 cls = b.match(/align=['"]([^'"]+)/i);
-                                w = b.match(/width=['"]([0-9]+)/);
                                 cap = b.match(/caption=['"]([^'"]+)/i);
 
                                 id = ( id && id[1] ) ? id[1] : '';
                                 cls = ( cls && cls[1] ) ? cls[1] : 'alignnone';
-                                w = ( w && w[1] ) ? w[1] : '';
                                 cap = ( cap && cap[1] ) ? cap[1] : '';
-                                if ( ! w || ! cap ) return c;
+                                if ( ! cap ) return c;
                                 
                                 div_cls = (cls == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp';
 
-                                return '<div class="'+div_cls+'" draggable><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+(10+parseInt(w))+
-                                'px"><dt class="wp-caption-dt">'+c+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
+                                return '<div class="'+div_cls+'" draggable><dl id="'+id+'" class="wp-caption '+cls+'"><dt class="wp-caption-dt">'+c+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
                         });
                 },
 
                 _get_shcode : function(co) {
                         return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){
-                                var id, cls, w;
+                                var id, cls;
                                 
                                 id = b.match(/id=['"]([^'"]+)/i);
                                 cls = b.match(/class=['"]([^'"]+)/i);
-                                w = c.match(/width=['"]([0-9]+)/);
 
                                 id = ( id && id[1] ) ? id[1] : '';
                                 cls = ( cls && cls[1] ) ? cls[1] : 'alignnone';
-                                w = ( w && w[1] ) ? w[1] : '';
 
-                                if ( ! w || ! cap ) return c;
+                                if ( ! cap ) return c;
                                 cls = cls.match(/align[^ '"]+/) || 'alignnone';
                                 cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, '&#39;').replace(/"/g, '&quot;');
 
-                                return '[caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/caption]';
+                                return '[caption id="'+id+'" align="'+cls+'" caption="'+cap+'"]'+c+'[/caption]';
                         });
                 },
 

wp-includes/media.php

@@ -729 +729 @@
         extract(shortcode_atts(array(
                 'id'    => '',
                 'align' => 'alignnone',
-                'width' => '',
                 'caption' => ''
         ), $attr));
 
-        if ( 1 > (int) $width || empty($caption) )
+        if ( empty($caption) )
                 return $content;
 
         if ( $id ) $id = 'id="' . esc_attr($id) . '" ';
 
-        return '<div ' . $id . 'class="wp-caption ' . esc_attr($align) . '" style="width: ' . (10 + (int) $width) . 'px">'
+        return '<div ' . $id . 'class="wp-caption ' . esc_attr($align) . '">'
         . do_shortcode( $content ) . '<p class="wp-caption-text">' . $caption . '</p></div>';
 }
 

wp-content/themes/twentyten/style.css

@@ -811 +811 @@
 }
 .wp-caption {
         background: #f1f1f1;
+        display: inline-block;
         line-height: 18px;
         margin-bottom: 20px;
         max-width: 632px !important; /* prevent too-wide images from breaking layout */

wp-content/themes/twentyten/editor-style.css

@@ -274 +274 @@
         -webkit-border-radius: 0;
         border-radius: 0;
         color: #888;
+        display: inline-block;
         font-size: 12px;
         line-height: 18px;
         margin-bottom: 20px;

wp-admin/includes/media.php

@@ -150 +150 @@
                 $align = 'none';
 
         $shcode = '[caption id="' . $id . '" align="align' . $align
-        . '" width="' . $width . '" caption="' . addslashes($caption) . '"]' . $html . '[/caption]';
+        . '" caption="' . addslashes($caption) . '"]' . $html . '[/caption]';
 
         return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
 }
@@ -1687 +1687 @@
                         html = '<a href="'+f.url.value+'">'+html+'</a>';
 
                 if ( caption )
-                        html = '[caption id="" align="'+t.align+'" width="'+t.width+'" caption="'+caption+'"]'+html+'[/caption]';
+                        html = '[caption id="" align="'+t.align+'" caption="'+caption+'"]'+html+'[/caption]';
 
                 var win = window.dialogArguments || opener || parent || top;
                 win.send_to_editor(html);