diff -r 53cff4b4a802 -r bde1974c263b web/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js	Wed Feb 03 15:37:20 2010 +0000
@@ -0,0 +1,207 @@
+
+(function() {
+	tinymce.create('tinymce.plugins.wpEditImage', {
+
+		init : function(ed, url) {
+			var t = this;
+
+			t.url = url;
+			t._createButtons();
+
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
+			ed.addCommand('WP_EditImage', function() {
+				var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w, cls = ed.dom.getAttrib(el, 'class');
+
+				if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
+					return;
+
+				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' );
+			});
+
+			ed.onInit.add(function(ed) {
+				tinymce.dom.Event.add(ed.getBody(), 'dragstart', function(e) {
+					if ( !tinymce.isGecko && e.target.nodeName == 'IMG' && ed.dom.getParent(e.target, 'dl.wp-caption') )
+						return tinymce.dom.Event.cancel(e);
+				});
+			});
+
+			ed.onMouseUp.add(function(ed, e) {
+				if ( tinymce.isWebKit || tinymce.isOpera )
+					return;
+
+				if ( ed.dom.getParent(e.target, 'div.mceTemp') || ed.dom.is(e.target, 'div.mceTemp') ) {					
+					window.setTimeout(function(){
+						var ed = tinyMCE.activeEditor, n = ed.selection.getNode(), DL = ed.dom.getParent(n, 'dl.wp-caption');
+
+						if ( DL && n.width != ( parseInt(ed.dom.getStyle(DL, 'width'), 10) - 10 ) ) {
+							ed.dom.setStyle(DL, 'width', parseInt(n.width, 10) + 10);
+							ed.execCommand('mceRepaint');
+						}
+					}, 100);
+				}
+			});
+
+			ed.onMouseDown.add(function(ed, e) {
+				var p;
+
+				if ( e.target.nodeName == 'IMG' && ed.dom.getAttrib(e.target, 'class').indexOf('mceItem') == -1 ) {
+					ed.plugins.wordpress._showButtons(e.target, 'wp_editbtns');
+					if ( tinymce.isGecko && (p = ed.dom.getParent(e.target, 'dl.wp-caption')) && ed.dom.hasClass(p.parentNode, 'mceTemp') )
+						ed.selection.select(p.parentNode);
+				}
+			});
+
+			ed.onKeyPress.add(function(ed, e) {
+				var DL, DIV, P;
+
+				if ( e.keyCode == 13 && (DL = ed.dom.getParent(ed.selection.getNode(), 'DL')) && ed.dom.hasClass(DL, 'wp-caption') ) {
+					P = ed.dom.create('p', {}, '&nbsp;');
+					if ( (DIV = DL.parentNode) && DIV.nodeName == 'DIV' ) 
+						ed.dom.insertAfter( P, DIV );
+					else
+						ed.dom.insertAfter( P, DL );
+
+					if ( P.firstChild )
+						ed.selection.select(P.firstChild);
+					else
+						ed.selection.select(P);
+
+					tinymce.dom.Event.cancel(e);
+					return false;
+				}
+			});
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = t._do_shcode(o.content);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.get)
+					o.content = t._get_shcode(o.content);
+			});
+		},
+
+		_do_shcode : function(co) {
+			return co.replace(/\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\][\s\u00a0]*/g, function(a,b,c){
+				var id, cls, w, 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;
+				
+				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>';
+			});
+		},
+
+		_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;
+				
+				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;
+				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]';
+			});
+		},
+
+		_createButtons : function() {
+			var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM, editButton, dellButton;
+
+			DOM.remove('wp_editbtns');
+
+			DOM.add(document.body, 'div', {
+				id : 'wp_editbtns',
+				style : 'display:none;'
+			});
+
+			editButton = DOM.add('wp_editbtns', 'img', {
+				src : t.url+'/img/image.png',
+				id : 'wp_editimgbtn',
+				width : '24',
+				height : '24',
+				title : ed.getLang('wpeditimage.edit_img')
+			});
+
+			tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
+				var ed = tinyMCE.activeEditor;
+				ed.windowManager.bookmark = ed.selection.getBookmark('simple');
+				ed.execCommand("WP_EditImage");
+			});
+
+			dellButton = DOM.add('wp_editbtns', 'img', {
+				src : t.url+'/img/delete.png',
+				id : 'wp_delimgbtn',
+				width : '24',
+				height : '24',
+				title : ed.getLang('wpeditimage.del_img')
+			});
+
+			tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
+				var ed = tinyMCE.activeEditor, el = ed.selection.getNode(), p;
+
+				if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('mceItem') == -1 ) {
+					if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') )
+						ed.dom.remove(p);
+					else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 )
+						ed.dom.remove(p);
+					else
+						ed.dom.remove(el);
+
+					ed.execCommand('mceRepaint');
+					return false;
+				}
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Edit Image',
+				author : 'WordPress',
+				authorurl : 'http://wordpress.org',
+				infourl : '',
+				version : "1.0"
+			};
+		}
+	});
+
+	tinymce.PluginManager.add('wpeditimage', tinymce.plugins.wpEditImage);
+})();