Changeset 8167

Timestamp:

06/23/08 15:26:03 (2 months ago)

Author:

ryan

Message:

Edit image updates from azaozz. see #6811

Files:

• trunk/wp-admin/gears-manifest.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css (modified) (4 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (5 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (4 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (14 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -64 +64 @@
-{
-"betaManifestVersion" : 1,
-18
+22
-"entries" : [
-<?php echo $defaults; ?>

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

@@ -4 +4 @@
-function mce_escape($text) {
-    global $language;
-
+
-    if ( 'en' == $language ) return $text;
-    else return js_escape($text);
@@ -422 +422 @@
-orig_size:"' . mce_escape( __('Original Size') ) . '",
-css:"' . mce_escape( __('CSS Class') ) . '",
+s60:"' . mce_escape( __('60%') ) . '",
+s70:"' . mce_escape( __('70%') ) . '",
+s80:"' . mce_escape( __('80%') ) . '",
+s90:"' . mce_escape( __('90%') ) . '",
+s100:"' . mce_escape( __('100%') ) . '",
+s110:"' . mce_escape( __('110%') ) . '",
+s120:"' . mce_escape( __('120%') ) . '",
+s130:"' . mce_escape( __('130%') ) . '",
-caption:"' . mce_escape( __('Caption') ) . '"
-});
- 
+
-?>

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

@@ -25 +25 @@
-                }
-            });
-
+
-            // Register commands
-            ed.addCommand('WP_More', function() {
-                ed.execCommand('mceInsertContent', 0, moreHTML);
-            });
-
+
-            ed.addCommand('WP_Page', function() {
-                ed.execCommand('mceInsertContent', 0, nextpageHTML);
-            });
-
+
-            ed.addCommand('WP_Help', function() {
-                    ed.windowManager.open({
@@ -81 +81 @@
-                title : 'wordpress.wp_help_desc',
-                image : url + '/img/help.gif',
- 
+
-            });
-
@@ -91 +91 @@
-
-            // Add class "alignleft", "alignright" and "aligncenter" when selecting align for images.
-itor
-ode, bl, dom = editor
+
+, bl, dom = ed
-
-                if ( 'JustifyCenter' == cmd ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    dir = cmd.substring(7).toLowerCase();
-
-
-
-
-
+
+
+
-                    } else if ( 'JustifyCenter' == cmd ) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-                    } else {
-
-
-
-
+
+
-                    }
-                }

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

@@ -5 +5 @@
-}
-
-
+#basic 
-    display: block;
-    float: right;
-5
+4
-    margin: 5px 3px 5px 5px; 
-}
@@ -37 +37 @@
-}
-
-.alignleft {
-    float: right;
-}
-
-.show-align,
-
+
+
-    float: left;
-}
@@ -51 +48 @@
-#img_dim input,
-#img_prop label,
-
+
+
+
-    float: right;
-}
@@ -64 +63 @@
-    margin: 0 5px 0 10px;
-}
+
+#img_size_title {
+    text-align: left;
+}

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

@@ -19 +19 @@
-    border-radius: 3px;
-    cursor: pointer;
- 
+
-}
-
@@ -60 +60 @@
-
-th.label {
-28
+07
-}
-
@@ -105 +105 @@
-#sidemenu li {
-    list-style: none;
-    
-}
-
-#sidemenu li {
-    
-    display: inline;
-}
@@ -129 +127 @@
-
-#sidemenu a.current {
-
-
+
+
+
+
+
+
+
+
-    border-style:solid;
-    border-width:1px;
@@ -176 +180 @@
-}
-
+#basic .align .field label {
+    padding: 0 0 0 24px;
+}
+
+#basic {
+    padding-top: 2px;
+}
+
+td {
+    padding: 2px 0;
+}
+
+#img_size {
+    float: right;
+    text-align: center;
+    cursor: pointer;
+    background-color: #f1f1f1;
+    padding: 5px 0;
+    width: 45px;
+}
+
+#img_size div {
+    font-size: 10px;
+    padding: 2px;
+    border: 1px solid #f1f1f1;
+    line-height: 15px;
+    height: 15px;
+    -moz-border-radius: 3px;
+    -khtml-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    color: #07273E;
+}
+
+#img_size div#s100 {
+    border-color: #A3A3A3;
+    background-color: #E5E5E5;
+}
+
+#img_size_div {
+    width: 100px;
+    float: left;
+    cursor: default;
+}
+
+#img_size_title {
+    margin: 0 7px 5px;
+    text-align: right;
+    font-weight: bold;
+}
+
+#img_align_td {
+    padding: 2px 0 8px;
+}

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

@@ -9 +9 @@
-
-<link rel="stylesheet" href="css/editimage.css?ver=3101" type="text/css" media="all" />
-leeding2
+eta1
-<script type="text/javascript">
-if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
@@ -27 +27 @@
-<div id="img-edit">
-<form class="media-upload-form" action="" onsubmit="wpImage.update();">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <div class="show-align" id="show_align">
-        <img id="img_demo" src="img/image.png" alt="" />
@@ -66 +75 @@
-        </tr>
-
-        <tr class="image-size">
-            <th valign="top" scope="row" class="label">
-                <label for="img_size">
-                <span class="alignleft">{#wpeditimage.size}</span>
-                </label>
-            </th>
-            <td class="field" id="img_size">
-                <input onclick="wpImage.imgEditSize('thumbnail')" type="radio" name="img_size" id="thumbnail" value="thumbnail" />
-                <label for="thumbnail" id="lb_sizethumb">{#wpeditimage.thumbnail}</label>
-
-                <input onclick="wpImage.imgEditSize('medium')" type="radio" name="img_size" id="medium" value="medium" />
-                <label for="medium" id="lb_sizemedium">{#wpeditimage.medium}</label>
-
-                <input onclick="wpImage.imgEditSize('full')" type="radio" name="img_size" id="full" value="full" />
-                <label for="full" id="lb_sizefull">{#wpeditimage.full_size}</label>
-            </td>
-        </tr>
-
-        <tr class="">
-            <th valign="top" scope="row" class="label">
@@ -115 +106 @@
-            </th>
-            <td class="field">
-
+size="60" 
-                <input type="button" class="button" onclick="wpImage.I('link_href').value='';" value="{#wpeditimage.none}" />
-                <input type="button" class="button" id="img_url_current" onclick="wpImage.img_seturl('current')" value="{#wpeditimage.current_link}" />

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

@@ -26 +26 @@
-            });
-
-
-
-
+
+
-            });
-
@@ -43 +42 @@
-                if ( tinymce.isOpera ) return;
-                ed.plugins.wpeditimage.showButtons(e);
+            });
+/*
+            ed.onSetContent.add(function() {
+                t._fixCenter(ed.getBody());
+            });
+
+            ed.onPreProcess.add(function(ed, o) {
+                if (o.set)
+                    t._fixCenter(o.node);
+
+                if (o.get)
+                    ed.dom.removeClass(ed.dom.select('p', o.node), 'mce_iecenter');
+            });
+*/
+        },
+
+        _fixCenter : function(c) {
+            var ed = tinyMCE.activeEditor;
+
+            tinymce.each(ed.dom.select('img', c), function(n) {
+                if ( ed.dom.hasClass(n, 'aligncenter') ) {
+                    var P = ed.dom.getParent(n, 'p');
+                    if ( tinymce.isIE )
+                        ed.dom.addClass(P, 'mce_iecenter');
+                    if ( P.style && P.style.textAlign == 'center' )
+                        ed.dom.setStyle(P, 'textAlign', '');
+                }
-            });
-        },
@@ -70 +96 @@
-            }
-        },
-
+
-        hideButtons : function() {
-            tinymce.DOM.hide('wp_editbtns');

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

@@ -39 +39 @@
-        var t = this, win = t.getWin();
-
+        
-        // To avoid domain relaxing issue in Opera
-        function close() {
+            win.tb_remove();
-            t.editor.execCommand('mceRepaint');
-            win.tb_remove();
-            tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
-        };
@@ -81 +82 @@
-        for ( i = 0; i < styles.length; i++ ) {
-            var url = styles.item(i).href;
- {
+
-                document.write( '<link rel="stylesheet" href="'+url+'" type="text/css" media="all" />' );
-                break;
-            }
-        }
-    },
@@ -96 +95 @@
-    link_rel : '',
-    target_value : '',
+    current_size_sel : 's100',
+    width : '',
+    height : '',
-
-    setTabs : function(tab) {
-        var t = this;
-
+
-        if ( 'current' == tab.className ) return false;
-        t.I('div_advanced').style.display = ( 'tab_advanced' == tab.id ) ? 'block' : 'none';
@@ -132 +134 @@
-        cls = cls.replace( /\s+/g, ' ' ).replace( /^\s/, '' );
-
+        if ( 'aligncenter' == v ) {
+            t.I('hspace').value = '';
+            t.updateStyle('hspace');
+        }
+        
-        t.I('img_classes').value = cls;
-    },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        var t = this, f = document.forms[0], sz, m = null;
-
-
+, w = t.width || W, h = t.height || H, id = el.id || 's100'
-
-        if ( ! t.preloadImg || W == "" || H == "" )
-            return;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        t.demoSetSize();
-    },
@@ -200 +201 @@
-        demo.height = f.height.value ? Math.floor(f.height.value * 0.5) : '';
-    },
-
+
-    demoSetStyle : function() {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    origSize : function() {
-
-
-
-
+, el = t.I('s100')
+
+width = t.
+height = t.
-        t.demoSetSize();
-imgSizeCls(
+showSize(el
-    },
-
@@ -232 +236 @@
-    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;
-
+   
-        tinyMCEPopup.restoreSelection();
-        el = ed.selection.getNode();
@@ -238 +242 @@
-
-        f.img_src.value = d.src = link = ed.dom.getAttrib(el, 'src');
+        ed.dom.setStyle(el, 'float', '');
-
-        f.img_title.value = ed.dom.getAttrib(el, 'title');
@@ -249 +254 @@
-        f.img_classes.value = c = ed.dom.getAttrib(el, 'class');
-        f.img_style.value = ed.dom.getAttrib(el, 'style');
-
+
-        // Move attribs to styles
-        if (dom.getAttrib(el, 'align'))
-            t.updateStyle('align');
-
-        if (dom.getAttrib(el, 'hspace'))
-            t.updateStyle('hspace');
@@ -273 +275 @@
-
-        f.link_target.checked = ( t.target_value && t.target_value == '_blank' ) ? 'checked' : '';
-
+
-        fname = link.substring( link.lastIndexOf('/') );
-        fname = fname.replace(/-[0-9]{2,4}x[0-9]{2,4}/, '' );
-        t.link = link.substring( 0, link.lastIndexOf('/') ) + fname;
-
-        if ( c.indexOf('size-thumbnail') != -1 )
-            t.I('thumbnail').checked = "checked";
-        else if ( c.indexOf('size-medium') != -1 )
-            t.I('medium').checked = "checked";
-        else if ( c.indexOf('size-full') != -1 )
-            t.I('full').checked = "checked";
-
-        if ( c.indexOf('alignleft') != -1 ) {
@@ -299 +294 @@
-        }
-
+        t.getImageData();
+
+        if ( (t.width * 1.3) > parseInt(t.preloadImg.width) ) {
+            var s130 = t.I('s130'), s120 = t.I('s120'), s110 = t.I('s110');
+
+            s130.onclick = s120.onclick = s110.onclick = null;
+            s130.onmouseover = s120.onmouseover = s110.onmouseover = null;
+            s130.style.color = s120.style.color = s110.style.color = '#aaa';
+        }
+
-        document.body.style.display = '';
-
-
-
+
-        // Test if is attachment
-
-
-
-
+
+
+
+
+
-    },
-
@@ -328 +332 @@
-
-    update : function() {
-p, el, b
+el, P, v = f.img_classes.value
-
-        tinyMCEPopup.restoreSelection();
@@ -335 +339 @@
-        if (el.nodeName != 'IMG') return;
-        if (f.img_src.value === '') t.remove();
+        P = ed.dom.getParent(el, 'p');
+        if ( P && P.style && P.style.textAlign == 'center' )
+            ed.dom.setStyle(P, 'textAlign', '');
+/*
+        if ( tinymce.isIE ) {
+            if ( f.img_classes.value.indexOf('aligncenter') != -1 )
+                ed.dom.addClass(P, 'mce_iecenter');
+            else ed.dom.removeClass(P, 'mce_iecenter');
+        }
+*/
+        if ( v.indexOf('alignleft') != -1 )
+            tinyMCEPopup.execCommand('JustifyLeft');
+        else if ( v.indexOf('alignright') != -1 )
+            tinyMCEPopup.execCommand('JustifyRight');
+        else if ( v.indexOf('aligncenter') != -1 )
+            tinyMCEPopup.execCommand('JustifyCenter');
-
-        ed.dom.setAttribs(el, {
@@ -393 +413 @@
-        tinyMCEPopup.close();
-    },
-
+
-    updateStyle : function(ty) {
-        var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : f.img_style.value});
@@ -467 +487 @@
-        var f = document.forms[0];
-
-   
+
-    },
-

trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css

@@ -12 +12 @@
-img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
-img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-*/

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

@@ -227 +227 @@
-if ( $disk_cache ) {
-
-18
+22
-
-    foreach ( $initArray as $v )

trunk/wp-includes/script-loader.php

@@ -36 +36 @@
-
-    // Modify this version when tinyMCE plugins are changed.
-18
+22
-    $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
-