X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8a06f4f9392d1ac373442f82ee40428a3cb81395..449d082fcc4873c1f7d363a0d9f7409be7f6e77d:/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
index d0ca4ed5..f24d0baf 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
@@ -10,12 +10,30 @@
 
 			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
 			ed.addCommand('WP_EditImage', function() {
-				var el = ed.selection.getNode();
+				var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w;
+				var cls = ed.dom.getAttrib(el, 'class');
 
-				if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' )
+				if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
 					return;
 
-				tb_show('', url + '/editimage.html?ver=311g&TB_iframe=true');
+				tb_show('', url + '/editimage.html?ver=321&TB_iframe=true');
+				tinymce.DOM.setStyles('TB_window', {
+					'width':( W - 50 )+'px',
+					'height':( H - 45 )+'px',
+					'margin-left':'-'+parseInt((( W - 50 ) / 2),10) + 'px'
+				});
+
+				if ( ! tinymce.isIE6 ) {
+					tinymce.DOM.setStyles('TB_window', {
+						'top':'20px',
+						'marginTop':'0'
+					});
+				}
+
+				tinymce.DOM.setStyles('TB_iframeContent', {
+					'width':( W - 50 )+'px',
+					'height':( H - 75 )+'px'
+				});
 				tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
 			});
 
@@ -125,8 +143,9 @@
 
 		showButtons : function(n) {
 			var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y;
+			var cls = ed.dom.getAttrib(n, 'class');
 
-			if (ed.dom.getAttrib(n, 'class').indexOf('mceItem') != -1)
+			if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 )
 				return;
 
 			vp = ed.dom.getViewPort(ed.getWin());