Edit image fixes from azaozz: : new link not created if the image has class "aligncenter" in Safari; recalculates the demo image size properly and applies any inline styles to it; if relative link is added, it's converted to absolute; "Unknown error" in IE6. see #6811

git-svn-id: http://svn.automattic.com/wordpress/trunk@8191 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/gears-manifest.php

@@ -64,7 +64,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 ?>
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080622",
+"version" : "<?php echo $man_version; ?>_20080625",
 "entries" : [
 <?php echo $defaults; ?>
 
@@ -126,7 +126,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=3101" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=3101" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=3101" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3101" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3102" },
 
 { "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=3101" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=3101" },

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

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title></title>
 
-<script type="text/javascript" src="js/editimage.js?ver=3101"></script>
+<script type="text/javascript" src="js/editimage.js?ver=3102"></script>
 <script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
 
 <link rel="stylesheet" href="css/editimage.css?ver=3101" type="text/css" media="all" />

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

@@ -38,12 +38,10 @@ tinyMCEPopup = {
 	close : function() {
 		var t = this, win = t.getWin();
 
-		
 		// To avoid domain relaxing issue in Opera
 		function close() {
 			win.tb_remove();
-			t.editor.execCommand('mceRepaint');
+			tinymce = tinyMCE = t.editor = t.dom = t.dom.doc = null; // Cleanup
-			tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
 		};
 
 		if (tinymce.isOpera)
@@ -153,6 +151,18 @@ var wpImage = {
 		el.style.backgroundColor = '#E5E5E5';
 	},
 
+	showSizeSet : function() {
+		var t = this;
+		
+		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';
+		}
+	},
+
 	showSizeRem : function() {
 		var t = this, demo = t.I('img_demo'), f = document.forms[0];
 
@@ -175,13 +185,11 @@ var wpImage = {
 	},
 
 	imgEditSize : function(el) {
-		var t = this, f = document.forms[0], sz, m = null;
+		var t = this, f = document.forms[0];
 
+		if ( ! t.preloadImg || ! t.preloadImg.width || ! t.preloadImg.height )	return;
 		var W = parseInt(t.preloadImg.width), H = parseInt(t.preloadImg.height), w = t.width || W, h = t.height || H, id = el.id || 's100';
 
-		if ( ! t.preloadImg || W == "" || H == "" )
-			return;
-
 		size = parseInt(id.substring(1)) / 100;
 
 		w = Math.round(w * size);
@@ -197,8 +205,8 @@ var wpImage = {
 	demoSetSize : function(img) {
 		var demo = this.I('img_demo'), f = document.forms[0];
 
-		demo.width = f.width.value ? Math.floor(f.width.value * 0.5) : '';
+		demo.width = f.width.value ? Math.round(f.width.value * 0.5) : '';
-		demo.height = f.height.value ? Math.floor(f.height.value * 0.5) : '';
+		demo.height = f.height.value ? Math.round(f.height.value * 0.5) : '';
 	},
 
 	demoSetStyle : function() {
@@ -216,6 +224,7 @@ var wpImage = {
 
 		f.width.value = t.width = t.preloadImg.width;
 		f.height.value = t.height = t.preloadImg.height;
+		t.showSizeSet();
 		t.demoSetSize();
 		t.showSize(el);
 	},
@@ -242,6 +251,7 @@ var wpImage = {
 
 		f.img_src.value = d.src = link = ed.dom.getAttrib(el, 'src');
 		ed.dom.setStyle(el, 'float', '');
+		t.getImageData();
 
 		f.img_title.value = ed.dom.getAttrib(el, 'title');
 		f.img_alt.value = ed.dom.getAttrib(el, 'alt');
@@ -293,16 +303,7 @@ var wpImage = {
 			d.className = "alignnone";
 		}
 
-		t.getImageData();
+		if ( t.width && t.preloadImg.width ) t.showSizeSet();
-
-		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
@@ -331,29 +332,23 @@ var wpImage = {
 	},
 
 	update : function() {
-		var t = this, f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, el, P, v = f.img_classes.value;
+		var t = this, f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, el, P, A, v = f.img_classes.value;
 
 		tinyMCEPopup.restoreSelection();
 		el = ed.selection.getNode();
 
 		if (el.nodeName != 'IMG') return;
 		if (f.img_src.value === '') t.remove();
+
+		A = ed.dom.getParent(el, 'A');
 		P = ed.dom.getParent(el, 'p');
-		if ( P && P.style && P.style.textAlign == 'center' )
+
-			ed.dom.setStyle(P, 'textAlign', '');
+/*		if ( tinymce.isIE ) {
-/*
-		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, {
 			src : f.img_src.value,
@@ -362,27 +357,26 @@ var wpImage = {
 			width : f.width.value,
 			height : f.height.value,
 			style : f.img_style.value,
-			'class' : f.img_classes.value
+			'class' : '' //f.img_classes.value
 		});
 
-		pa = ed.dom.getParent(el, 'A');
-
 		if ( ! f.link_href.value ) {
-			if ( pa ) {
+			if ( A ) {
 				tinyMCEPopup.execCommand("mceBeginUndoLevel");
 				b = ed.selection.getBookmark();
 				ed.dom.remove(pa, 1);
 				ed.selection.moveToBookmark(b);
 				tinyMCEPopup.execCommand("mceEndUndoLevel");
-				tinyMCEPopup.close();
-				return;
 			}
-		}
+		} else {
-
 			tinyMCEPopup.execCommand("mceBeginUndoLevel");
 	
 			// Create new anchor elements
-		if (pa == null) {
+			if ( A == null ) {
+				
+				if ( ! f.link_href.value.match(/https?:\/\//) )
+					f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
+				
 				tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
 	
 				tinymce.each(ed.dom.select("a"), function(n) {
@@ -399,7 +393,7 @@ var wpImage = {
 					}
 				});
 			} else {
-			ed.dom.setAttribs(pa, {
+				ed.dom.setAttribs(A, {
 					href : f.link_href.value,
 					title : f.link_title.value,
 					rel : f.link_rel.value,
@@ -408,8 +402,20 @@ var wpImage = {
 					style : f.link_style.value
 				});
 			}
-
 			tinyMCEPopup.execCommand("mceEndUndoLevel");
+		}
+		
+		ed.dom.setAttrib(el, 'class', f.img_classes.value);
+		
+		if ( v.indexOf('aligncenter') != -1 ) {
+			if ( P && ( ! P.style || P.style.textAlign != 'center' ) )
+				ed.dom.setStyle(P, 'textAlign', 'center');
+		} else {
+			if ( P && P.style && P.style.textAlign == 'center' )
+				ed.dom.setStyle(P, 'textAlign', '');
+		}
+
+		ed.execCommand('mceRepaint');
 		tinyMCEPopup.close();
 	},
 
@@ -493,10 +499,14 @@ var wpImage = {
 		var f = document.forms[0], t = wpImage;
 
 		if ( f.width.value == '' || f.height.value == '' ) {
-			f.width.value = t.preloadImg.width;
+			f.width.value = t.width = t.preloadImg.width;
-			f.height.value = t.preloadImg.height;
+			f.height.value = t.height = t.preloadImg.height;
 		}
+		
+		t.showSizeSet();
 		t.demoSetSize();
+		if ( f.img_style.value )
+			t.demoSetStyle();
 	},
 
 	getImageData : function() {