Changeset 8307

Timestamp:

07/10/2008 04:39:14 PM (16 years ago)

Author:

ryan

Message:

Fix image resizing inside captions, add edit alt field to the advanced tab. Props azaozz. see #6812

Location:

trunk

Files:

• wp-admin/gears-manifest.php (modified) (4 diffs)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (7 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -65 +65 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080709",
+"version" : "<?php echo $man_version; ?>_20080710",
 "entries" : [
 <?php echo $defaults; ?>
@@ -132 +132 @@
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311c" },
 { "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
@@ -149 +149 @@
 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311b" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311c" },
 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
 
@@ -162 +162 @@
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311b" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311c" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -412 +412 @@
 medium:"' . mce_escape( __('Medium') ) . '",
 full_size:"' . mce_escape( __('Full Size') ) . '",
-alt_help:"' . js_escape( __('Alternate text, e.g. "The Mona Lisa"') )  . '",
 current_link:"' . mce_escape( __('Current Link') ) . '",
 link_to_img:"' . mce_escape( __('Link to Image') ) . '",
@@ -436 +435 @@
 s130:"' . mce_escape( __('130%') ) . '",
 img_title:"' . mce_escape( __('Edit Image Title') ) . '",
-caption:"' . mce_escape( __('Edit Image Caption') ) . '"
+caption:"' . mce_escape( __('Edit Image Caption') ) . '",
+alt:"' . mce_escape( __('Edit Alternate Text') ) . '"
 });
 ';

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -5 +5 @@
 <title></title>
 
-<script type="text/javascript" src="js/editimage.js?ver=311"></script>
+<script type="text/javascript" src="js/editimage.js?ver=311c"></script>
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
 
-<link rel="stylesheet" href="css/editimage.css?ver=311b" type="text/css" media="all" />
-<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
+<link rel="stylesheet" href="css/editimage.css?ver=311c" type="text/css" media="all" />
+<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta3" type="text/css" media="all" />
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
@@ -75 +75 @@
         </tr>
 
-        <tr class="">
+        <tr>
             <th valign="top" scope="row" class="label">
                 <label for="img_title">
@@ -86 +86 @@
         </tr>
 
-        <tr class="post_excerpt">
-            <th valign="top" scope="row" class="label">
-                <label for="img_alt">
+        <tr>
+            <th valign="top" scope="row" class="label">
+                <label for="img_cap">
                 <span class="alignleft">{#wpeditimage.caption}</span>
                 </label>
             </th>
             <td class="field">
-                <input type="text" id="img_alt" name="img_alt" value="" size="60" />
-                <p class="help">{#wpeditimage.alt_help}</p>
-            </td>
-        </tr>
-
-        <tr class="url">
+                <input type="text" id="img_cap" name="img_cap" value="" size="60" />
+            </td>
+        </tr>
+
+        <tr>
             <th valign="top" scope="row" class="label">
                 <label for="link_href">
@@ -130 +129 @@
             </td>
         </tr>
+        
+        <tr>
+            <th valign="top" scope="row" class="label">
+                <label for="img_alt">
+                <span class="alignleft">{#wpeditimage.alt}</span>
+                </label>
+            </th>
+            <td class="field">
+                <input type="text" id="img_alt" name="img_alt" value="" size="60" />
+            </td>
+        </tr>
 
         <tr id="img_dim">

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

@@ -16 +16 @@
                     return;
 
-                tb_show('', url + '/editimage.html?ver=311b&TB_iframe=true');
+                tb_show('', url + '/editimage.html?ver=311c&TB_iframe=true');
                 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
             });
@@ -35 +35 @@
 
             ed.onMouseUp.add(function(ed, e) {
-                if ( ! tinymce.isOpera ) return;
-                if ( e.target.nodeName == 'IMG' )
-                    ed.plugins.wpeditimage.showButtons(e.target);
+                if ( tinymce.isOpera ) {
+                    if ( e.target.nodeName == 'IMG' )
+                        ed.plugins.wpeditimage.showButtons(e.target);
+                } else if ( ! tinymce.isWebKit ) {
+                    var n = ed.selection.getNode(), DL;
+                    
+                    if ( n.nodeName == 'IMG' && (DL = ed.dom.getParent(n, 'DL')) ) {                    
+                        window.setTimeout(function(){
+                            var ed = tinyMCE.activeEditor, n = ed.selection.getNode(), DL = ed.dom.getParent(n, 'DL');
+                        
+                            if ( n.width != (parseInt(ed.dom.getStyle(DL, 'width')) - 10) ) {
+                                ed.dom.setStyle(DL, 'width', parseInt(n.width)+10);
+                                ed.execCommand('mceRepaint');
+                            }
+                        }, 100);
+                    }
+                }
             });
 

trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

@@ -246 +246 @@
 
     setup : function() {
-        var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption;
+        var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null;
         document.dir = tinyMCEPopup.editor.getParam('directionality','');
         tinyMCEPopup.restoreSelection();
@@ -256 +256 @@
         t.getImageData();
         c = ed.dom.getAttrib(el, 'class');
-        caption = t.img_alt = ed.dom.getAttrib(el, 'alt');
 
         if ( DL = dom.getParent(el, 'dl') ) {
             var dlc = ed.dom.getAttrib(DL, 'class');
             dlc = dlc.match(/align[^ "']+/i);
-            if ( dlc && ! dom.hasClass(el, dlc) )
+            if ( dlc && ! dom.hasClass(el, dlc) ) {
                 c += ' '+dlc;
+                tinymce.trim(c);
+            }
 
             tinymce.each(DL.childNodes, function(e) {
@@ -272 +273 @@
         }
 
+        f.img_cap.value = caption;
         f.img_title.value = ed.dom.getAttrib(el, 'title');
-        f.img_alt.value = caption;
+        f.img_alt.value = ed.dom.getAttrib(el, 'alt');
         f.border.value = ed.dom.getAttrib(el, 'border');
         f.vspace.value = ed.dom.getAttrib(el, 'vspace');
@@ -356 +358 @@
         }
 
-        if ( f.img_alt.value != '' && f.width.value != '' ) {
+        if ( f.img_cap.value != '' && f.width.value != '' ) {
             do_caption = 1;
             img_class = img_class.replace( /align[^ "']+\s?/gi, '' );
@@ -371 +373 @@
             src : f.img_src.value,
             title : f.img_title.value,
-            alt : t.img_alt,
+            alt : f.img_alt.value,
             width : f.width.value,
             height : f.height.value,
@@ -430 +432 @@
 
                 if ( (DT = ed.dom.getParent(el, 'dt')) && (DD = DT.nextSibling) && ed.dom.hasClass(DD, 'wp_caption_dd') )
-                    ed.dom.setHTML(DD, f.img_alt.value);
+                    ed.dom.setHTML(DD, f.img_cap.value);
 
             } else {
@@ -448 +450 @@
 
                 html = '<dl id="'+cap_id+'" class="wp_caption '+t.align+'" style="width: '+cap_width+
-                'px"><dt class="wp_caption_dt">'+html+'</dt><dd class="wp_caption_dd">'+f.img_alt.value+'</dd></dl>';
+                'px"><dt class="wp_caption_dt">'+html+'</dt><dd class="wp_caption_dd">'+f.img_cap.value+'</dd></dl>';
 
                 cap = ed.dom.create('div', {'class': div_cls}, html);

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -223 +223 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080708');
+    $cacheKey = apply_filters('tiny_mce_version', '20080709');
 
     foreach ( $initArray as $v )

trunk/wp-includes/script-loader.php

@@ -38 +38 @@
 
     // Modify this version when tinyMCE plugins are changed.
-    $mce_version = apply_filters('tiny_mce_version', '20080708');
+    $mce_version = apply_filters('tiny_mce_version', '20080709');
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );