<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20681] trunk: Compress scripts/styles: 3.4-beta3-20681.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20681">20681</a></dd>
<dt>Author</dt> <dd>bumpbot</dd>
<dt>Date</dt> <dd>2012-05-02 01:58:25 +0000 (Wed, 02 May 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Compress scripts/styles: 3.4-beta3-20681. TinyMCE updated.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjseditorjs">trunk/wp-admin/js/editor.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimageeditor_pluginjs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimagejseditimagejs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js</a></li>
<li><a href="#trunkwpincludesjstinymcewptinymcejsgz">trunk/wp-includes/js/tinymce/wp-tinymce.js.gz</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjseditorjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/editor.js (20680 => 20681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/editor.js        2012-05-02 01:41:15 UTC (rev 20680)
+++ trunk/wp-admin/js/editor.js        2012-05-02 01:58:25 UTC (rev 20681)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var switchEditors={switchto:function(b){var c=b.id,a=c.length,e=c.substr(0,a-5),d=c.substr(a-4);this.go(e,d)},go:function(g,f){g=g||&quot;content&quot;;f=f||&quot;toggle&quot;;var c=this,b=tinyMCE.get(g),a,d,e=tinymce.DOM;a=&quot;wp-&quot;+g+&quot;-wrap&quot;;d=e.get(g);if(&quot;toggle&quot;==f){if(b&amp;&amp;!b.isHidden()){f=&quot;html&quot;}else{f=&quot;tmce&quot;}}if(&quot;tmce&quot;==f||&quot;tinymce&quot;==f){if(b&amp;&amp;!b.isHidden()){return false}if(typeof(QTags)!=&quot;undefined&quot;){QTags.closeAllTags(g)}if(tinyMCEPreInit.mceInit[g]&amp;&amp;tinyMCEPreInit.mceInit[g].wpautop){d.value=c.wpautop(d.value)}if(b){b.show()}else{b=new tinymce.Editor(g,tinyMCEPreInit.mceInit[g]);b.render()}e.removeClass(a,&quot;html-active&quot;);e.addClass(a,&quot;tmce-active&quot;);setUserSetting(&quot;editor&quot;,&quot;tinymce&quot;)}else{if(&quot;html&quot;==f){if(b&amp;&amp;b.isHidden()){return false}if(b){d.style.height=b.getContentAreaContainer().offsetHeight+20+&quo
 t;px&quot;;b.hide()}e.removeClass(a,&quot;tmce-active&quot;);e.addClass(a,&quot;html-active&quot;);setUserSetting(&quot;editor&quot;,&quot;html&quot;)}}return false},_wp_Nop:function(c){var d,b,e=false,a=false;if(c.indexOf(&quot;&lt;pre&quot;)!=-1||c.indexOf(&quot;&lt;script&quot;)!=-1){e=true;c=c.replace(/&lt;(pre|script)[^&gt;]*&gt;[\s\S]+?&lt;\/\1&gt;/g,function(f){f=f.replace(/&lt;br ?\/?&gt;(\r\n|\n)?/g,&quot;&lt;wp-temp-lb&gt;&quot;);return f.replace(/&lt;\/?p( [^&gt;]*)?&gt;(\r\n|\n)?/g,&quot;&lt;wp-temp-lb&gt;&quot;)})}if(c.indexOf(&quot;[caption&quot;)!=-1){a=true;c=c.replace(/\[caption[^\]]+\]/g,function(f){return f.replace(/&lt;br([^&gt;]*)&gt;[\r\n]*/g,&quot;&lt;wp-temp-br$1&gt;&quot;)})}d=&quot;blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset&quot;;c=c.replace(new RegExp(&quot;\\s*&lt;/(&quot;+d+&quot;)&gt;\\s*&quot;,&quot;g&quot;),&quot;&lt;/$1&gt;\n&quot;);c=c.replace(new RegExp(&quot;\\s*&lt;((?:&quot;+d+&quot;)(?: [^&gt;]*)?)&gt;&qu
 ot;,&quot;g&quot;),&quot;\n&lt;$1&gt;&quot;);c=c.replace(/(&lt;p [^&gt;]+&gt;.*?)&lt;\/p&gt;/g,&quot;$1&lt;/p#&gt;&quot;);c=c.replace(/&lt;div( [^&gt;]*)?&gt;\s*&lt;p&gt;/gi,&quot;&lt;div$1&gt;\n\n&quot;);c=c.replace(/\s*&lt;p&gt;/gi,&quot;&quot;);c=c.replace(/\s*&lt;\/p&gt;\s*/gi,&quot;\n\n&quot;);c=c.replace(/\n[\s\u00a0]+\n/g,&quot;\n\n&quot;);c=c.replace(/\s*&lt;br ?\/?&gt;\s*/gi,&quot;\n&quot;);c=c.replace(/\s*&lt;div/g,&quot;\n&lt;div&quot;);c=c.replace(/&lt;\/div&gt;\s*/g,&quot;&lt;/div&gt;\n&quot;);c=c.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,&quot;\n\n[caption$1[/caption]\n\n&quot;);c=c.replace(/caption\]\n\n+\[caption/g,&quot;caption]\n\n[caption&quot;);b=&quot;blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset&quot;;c=c.replace(new RegExp(&quot;\\s*&lt;((?:&quot;+b+&quot;)(?: [^&gt;]*)?)\\s*&gt;&quot;,&quot;g&quot;),&quot;\n&lt;$1&gt;&quot;);c=c.replace(new RegExp(&quot;\\s*&lt;/(&quot;+b+&quot;)&gt;\\s*&quot;,&quot;g&quot;),&quot;&lt
 ;/$1&gt;\n&quot;);c=c.replace(/&lt;li([^&gt;]*)&gt;/g,&quot;\t&lt;li$1&gt;&quot;);if(c.indexOf(&quot;&lt;hr&quot;)!=-1){c=c.replace(/\s*&lt;hr( [^&gt;]*)?&gt;\s*/g,&quot;\n\n&lt;hr$1&gt;\n\n&quot;)}if(c.indexOf(&quot;&lt;object&quot;)!=-1){c=c.replace(/&lt;object[\s\S]+?&lt;\/object&gt;/g,function(f){return f.replace(/[\r\n]+/g,&quot;&quot;)})}c=c.replace(/&lt;\/p#&gt;/g,&quot;&lt;/p&gt;\n&quot;);c=c.replace(/\s*(&lt;p [^&gt;]+&gt;[\s\S]*?&lt;\/p&gt;)/g,&quot;\n$1&quot;);c=c.replace(/^\s+/,&quot;&quot;);c=c.replace(/[\s\u00a0]+$/,&quot;&quot;);if(e){c=c.replace(/&lt;wp-temp-lb&gt;/g,&quot;\n&quot;)}if(a){c=c.replace(/&lt;wp-temp-br([^&gt;]*)&gt;/g,&quot;&lt;br$1&gt;&quot;)}return c},_wp_Autop:function(a){var b=&quot;table|thead|tfoot|tbody|tr|td|th|caption|col|colgroup|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]|fieldset|legend|hr|noscript|menu|samp|header|footer|article|section|hgroup|nav|aside|details|summary&quot;;if(a.indexOf(&quot;&lt;object&q
 uot;)!=-1){a=a.replace(/&lt;object[\s\S]+?&lt;\/object&gt;/g,function(c){return c.replace(/[\r\n]+/g,&quot;&quot;)})}a=a.replace(/&lt;[^&lt;&gt;]+&gt;/g,function(c){return c.replace(/[\r\n]+/g,&quot; &quot;)});if(a.indexOf(&quot;&lt;pre&quot;)!=-1||a.indexOf(&quot;&lt;script&quot;)!=-1){a=a.replace(/&lt;(pre|script)[^&gt;]*&gt;[\s\S]+?&lt;\/\1&gt;/g,function(c){return c.replace(/(\r\n|\n)/g,&quot;&lt;wp_temp_br&gt;&quot;)})}a=a+&quot;\n\n&quot;;a=a.replace(/&lt;br \/&gt;\s*&lt;br \/&gt;/gi,&quot;\n\n&quot;);a=a.replace(new RegExp(&quot;(&lt;(?:&quot;+b+&quot;)(?: [^&gt;]*)?&gt;)&quot;,&quot;gi&quot;),&quot;\n$1&quot;);a=a.replace(new RegExp(&quot;(&lt;/(?:&quot;+b+&quot;)&gt;)&quot;,&quot;gi&quot;),&quot;$1\n\n&quot;);a=a.replace(/&lt;hr( [^&gt;]*)?&gt;/gi,&quot;&lt;hr$1&gt;\n\n&quot;);a=a.replace(/\r\n|\r/g,&quot;\n&quot;);a=a.replace(/\n\s*\n+/g,&quot;\n\n&quot;);a=a.replace(/([\s\S]+?)\n\n/g,&quot;&lt;p&gt;$1&lt;/p&gt;\n&quot;);a=a.replace(/&lt;p&gt;\s*?&lt;\/p&gt;/gi,&qu
 ot;&quot;);a=a.replace(new RegExp(&quot;&lt;p&gt;\\s*(&lt;/?(?:&quot;+b+&quot;)(?: [^&gt;]*)?&gt;)\\s*&lt;/p&gt;&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(/&lt;p&gt;(&lt;li.+?)&lt;\/p&gt;/gi,&quot;$1&quot;);a=a.replace(/&lt;p&gt;\s*&lt;blockquote([^&gt;]*)&gt;/gi,&quot;&lt;blockquote$1&gt;&lt;p&gt;&quot;);a=a.replace(/&lt;\/blockquote&gt;\s*&lt;\/p&gt;/gi,&quot;&lt;/p&gt;&lt;/blockquote&gt;&quot;);a=a.replace(new RegExp(&quot;&lt;p&gt;\\s*(&lt;/?(?:&quot;+b+&quot;)(?: [^&gt;]*)?&gt;)&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(new RegExp(&quot;(&lt;/?(?:&quot;+b+&quot;)(?: [^&gt;]*)?&gt;)\\s*&lt;/p&gt;&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(/\s*\n/gi,&quot;&lt;br /&gt;\n&quot;);a=a.replace(new RegExp(&quot;(&lt;/?(?:&quot;+b+&quot;)[^&gt;]*&gt;)\\s*&lt;br /&gt;&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(/&lt;br \/&gt;(\s*&lt;\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)&gt;)/gi,&quot;$1&quot;);a=a.replace(/(?:&lt;p&gt;|&lt;br ?\/?&gt;)*\s*\[caption
 ([^\[]+)\[\/caption\]\s*(?:&lt;\/p&gt;|&lt;br ?\/?&gt;)*/gi,&quot;[caption$1[/caption]&quot;);a=a.replace(/(&lt;(?:div|th|td|form|fieldset|dd)[^&gt;]*&gt;)(.*?)&lt;\/p&gt;/g,function(e,d,f){if(f.match(/&lt;p( [^&gt;]*)?&gt;/)){return e}return d+&quot;&lt;p&gt;&quot;+f+&quot;&lt;/p&gt;&quot;});a=a.replace(/&lt;wp_temp_br&gt;/g,&quot;\n&quot;);return a},pre_wpautop:function(b){var a=this,d={o:a,data:b,unfiltered:b},c=typeof(jQuery)!=&quot;undefined&quot;;if(c){jQuery(&quot;body&quot;).trigger(&quot;beforePreWpautop&quot;,[d])}d.data=a._wp_Nop(d.data);if(c){jQuery(&quot;body&quot;).trigger(&quot;afterPreWpautop&quot;,[d])}return d.data},wpautop:function(b){var a=this,d={o:a,data:b,unfiltered:b},c=typeof(jQuery)!=&quot;undefined&quot;;if(c){jQuery(&quot;body&quot;).trigger(&quot;beforeWpautop&quot;,[d])}d.data=a._wp_Autop(d.data);if(c){jQuery(&quot;body&quot;).trigger(&quot;afterWpautop&quot;,[d])}return d.data}};
</del><span class="cx">\ No newline at end of file
</span><ins>+var switchEditors={switchto:function(b){var c=b.id,a=c.length,e=c.substr(0,a-5),d=c.substr(a-4);this.go(e,d)},go:function(g,f){g=g||&quot;content&quot;;f=f||&quot;toggle&quot;;var c=this,b=tinyMCE.get(g),a,d,e=tinymce.DOM;a=&quot;wp-&quot;+g+&quot;-wrap&quot;;d=e.get(g);if(&quot;toggle&quot;==f){if(b&amp;&amp;!b.isHidden()){f=&quot;html&quot;}else{f=&quot;tmce&quot;}}if(&quot;tmce&quot;==f||&quot;tinymce&quot;==f){if(b&amp;&amp;!b.isHidden()){return false}if(typeof(QTags)!=&quot;undefined&quot;){QTags.closeAllTags(g)}if(tinyMCEPreInit.mceInit[g]&amp;&amp;tinyMCEPreInit.mceInit[g].wpautop){d.value=c.wpautop(d.value)}if(b){b.show()}else{b=new tinymce.Editor(g,tinyMCEPreInit.mceInit[g]);b.render()}e.removeClass(a,&quot;html-active&quot;);e.addClass(a,&quot;tmce-active&quot;);setUserSetting(&quot;editor&quot;,&quot;tinymce&quot;)}else{if(&quot;html&quot;==f){if(b&amp;&amp;b.isHidden()){return false}if(b){d.style.height=b.getContentAreaContainer().offsetHeight+20+&quo
 t;px&quot;;b.hide()}e.removeClass(a,&quot;tmce-active&quot;);e.addClass(a,&quot;html-active&quot;);setUserSetting(&quot;editor&quot;,&quot;html&quot;)}}return false},_wp_Nop:function(c){var d,b,e=false,a=false;if(c.indexOf(&quot;&lt;pre&quot;)!=-1||c.indexOf(&quot;&lt;script&quot;)!=-1){e=true;c=c.replace(/&lt;(pre|script)[^&gt;]*&gt;[\s\S]+?&lt;\/\1&gt;/g,function(f){f=f.replace(/&lt;br ?\/?&gt;(\r\n|\n)?/g,&quot;&lt;wp-temp-lb&gt;&quot;);return f.replace(/&lt;\/?p( [^&gt;]*)?&gt;(\r\n|\n)?/g,&quot;&lt;wp-temp-lb&gt;&quot;)})}if(c.indexOf(&quot;[caption&quot;)!=-1){a=true;c=c.replace(/\[caption[\s\S]+?\[\/caption\]/g,function(f){return f.replace(/&lt;br([^&gt;]*)&gt;/g,&quot;&lt;wp-temp-br$1&gt;&quot;).replace(/[\r\n\t]+/,&quot;&quot;)})}d=&quot;blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset&quot;;c=c.replace(new RegExp(&quot;\\s*&lt;/(&quot;+d+&quot;)&gt;\\s*&quot;,&quot;g&quot;),&quot;&lt;/$1&gt;\n&quot;);c=c.replace(new RegExp(&quot;\\s*&lt;((
 ?:&quot;+d+&quot;)(?: [^&gt;]*)?)&gt;&quot;,&quot;g&quot;),&quot;\n&lt;$1&gt;&quot;);c=c.replace(/(&lt;p [^&gt;]+&gt;.*?)&lt;\/p&gt;/g,&quot;$1&lt;/p#&gt;&quot;);c=c.replace(/&lt;div( [^&gt;]*)?&gt;\s*&lt;p&gt;/gi,&quot;&lt;div$1&gt;\n\n&quot;);c=c.replace(/\s*&lt;p&gt;/gi,&quot;&quot;);c=c.replace(/\s*&lt;\/p&gt;\s*/gi,&quot;\n\n&quot;);c=c.replace(/\n[\s\u00a0]+\n/g,&quot;\n\n&quot;);c=c.replace(/\s*&lt;br ?\/?&gt;\s*/gi,&quot;\n&quot;);c=c.replace(/\s*&lt;div/g,&quot;\n&lt;div&quot;);c=c.replace(/&lt;\/div&gt;\s*/g,&quot;&lt;/div&gt;\n&quot;);c=c.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,&quot;\n\n[caption$1[/caption]\n\n&quot;);c=c.replace(/caption\]\n\n+\[caption/g,&quot;caption]\n\n[caption&quot;);b=&quot;blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset&quot;;c=c.replace(new RegExp(&quot;\\s*&lt;((?:&quot;+b+&quot;)(?: [^&gt;]*)?)\\s*&gt;&quot;,&quot;g&quot;),&quot;\n&lt;$1&gt;&quot;);c=c.replace(new RegExp(&quot;\\s*&lt;/(&quot;+b+&quot;
 )&gt;\\s*&quot;,&quot;g&quot;),&quot;&lt;/$1&gt;\n&quot;);c=c.replace(/&lt;li([^&gt;]*)&gt;/g,&quot;\t&lt;li$1&gt;&quot;);if(c.indexOf(&quot;&lt;hr&quot;)!=-1){c=c.replace(/\s*&lt;hr( [^&gt;]*)?&gt;\s*/g,&quot;\n\n&lt;hr$1&gt;\n\n&quot;)}if(c.indexOf(&quot;&lt;object&quot;)!=-1){c=c.replace(/&lt;object[\s\S]+?&lt;\/object&gt;/g,function(f){return f.replace(/[\r\n]+/g,&quot;&quot;)})}c=c.replace(/&lt;\/p#&gt;/g,&quot;&lt;/p&gt;\n&quot;);c=c.replace(/\s*(&lt;p [^&gt;]+&gt;[\s\S]*?&lt;\/p&gt;)/g,&quot;\n$1&quot;);c=c.replace(/^\s+/,&quot;&quot;);c=c.replace(/[\s\u00a0]+$/,&quot;&quot;);if(e){c=c.replace(/&lt;wp-temp-lb&gt;/g,&quot;\n&quot;)}if(a){c=c.replace(/&lt;wp-temp-br([^&gt;]*)&gt;/g,&quot;&lt;br$1&gt;&quot;)}return c},_wp_Autop:function(a){var c=false,b=false,d=&quot;table|thead|tfoot|tbody|tr|td|th|caption|col|colgroup|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]|fieldset|legend|hr|noscript|menu|samp|header|footer|article|section|hgroup|nav|asi
 de|details|summary&quot;;if(a.indexOf(&quot;&lt;object&quot;)!=-1){a=a.replace(/&lt;object[\s\S]+?&lt;\/object&gt;/g,function(e){return e.replace(/[\r\n]+/g,&quot;&quot;)})}a=a.replace(/&lt;[^&lt;&gt;]+&gt;/g,function(e){return e.replace(/[\r\n]+/g,&quot; &quot;)});if(a.indexOf(&quot;&lt;pre&quot;)!=-1||a.indexOf(&quot;&lt;script&quot;)!=-1){c=true;a=a.replace(/&lt;(pre|script)[^&gt;]*&gt;[\s\S]+?&lt;\/\1&gt;/g,function(e){return e.replace(/(\r\n|\n)/g,&quot;&lt;wp-temp-lb&gt;&quot;)})}if(a.indexOf(&quot;[caption&quot;)!=-1){b=true;a=a.replace(/\[caption[\s\S]+?\[\/caption\]/g,function(e){e=e.replace(/&lt;br([^&gt;]*)&gt;/g,&quot;&lt;wp-temp-br$1&gt;&quot;);e=e.replace(/&lt;[a-zA-Z0-9]+( [^&lt;&gt;]+)?&gt;/g,function(f){return f.replace(/[\r\n\t]+/,&quot; &quot;)});return e.replace(/\s*\n\s*/g,&quot;&lt;wp-temp-br /&gt;&quot;)})}a=a+&quot;\n\n&quot;;a=a.replace(/&lt;br \/&gt;\s*&lt;br \/&gt;/gi,&quot;\n\n&quot;);a=a.replace(new RegExp(&quot;(&lt;(?:&quot;+d+&quot;)(?: [^&gt;
 ]*)?&gt;)&quot;,&quot;gi&quot;),&quot;\n$1&quot;);a=a.replace(new RegExp(&quot;(&lt;/(?:&quot;+d+&quot;)&gt;)&quot;,&quot;gi&quot;),&quot;$1\n\n&quot;);a=a.replace(/&lt;hr( [^&gt;]*)?&gt;/gi,&quot;&lt;hr$1&gt;\n\n&quot;);a=a.replace(/\r\n|\r/g,&quot;\n&quot;);a=a.replace(/\n\s*\n+/g,&quot;\n\n&quot;);a=a.replace(/([\s\S]+?)\n\n/g,&quot;&lt;p&gt;$1&lt;/p&gt;\n&quot;);a=a.replace(/&lt;p&gt;\s*?&lt;\/p&gt;/gi,&quot;&quot;);a=a.replace(new RegExp(&quot;&lt;p&gt;\\s*(&lt;/?(?:&quot;+d+&quot;)(?: [^&gt;]*)?&gt;)\\s*&lt;/p&gt;&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(/&lt;p&gt;(&lt;li.+?)&lt;\/p&gt;/gi,&quot;$1&quot;);a=a.replace(/&lt;p&gt;\s*&lt;blockquote([^&gt;]*)&gt;/gi,&quot;&lt;blockquote$1&gt;&lt;p&gt;&quot;);a=a.replace(/&lt;\/blockquote&gt;\s*&lt;\/p&gt;/gi,&quot;&lt;/p&gt;&lt;/blockquote&gt;&quot;);a=a.replace(new RegExp(&quot;&lt;p&gt;\\s*(&lt;/?(?:&quot;+d+&quot;)(?: [^&gt;]*)?&gt;)&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(new RegExp(&quot;(&lt;/?(?:&q
 uot;+d+&quot;)(?: [^&gt;]*)?&gt;)\\s*&lt;/p&gt;&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(/\s*\n/gi,&quot;&lt;br /&gt;\n&quot;);a=a.replace(new RegExp(&quot;(&lt;/?(?:&quot;+d+&quot;)[^&gt;]*&gt;)\\s*&lt;br /&gt;&quot;,&quot;gi&quot;),&quot;$1&quot;);a=a.replace(/&lt;br \/&gt;(\s*&lt;\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)&gt;)/gi,&quot;$1&quot;);a=a.replace(/(?:&lt;p&gt;|&lt;br ?\/?&gt;)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:&lt;\/p&gt;|&lt;br ?\/?&gt;)*/gi,&quot;[caption$1[/caption]&quot;);a=a.replace(/(&lt;(?:div|th|td|form|fieldset|dd)[^&gt;]*&gt;)(.*?)&lt;\/p&gt;/g,function(f,e,g){if(g.match(/&lt;p( [^&gt;]*)?&gt;/)){return f}return e+&quot;&lt;p&gt;&quot;+g+&quot;&lt;/p&gt;&quot;});if(c){a=a.replace(/&lt;wp-temp-lb&gt;/g,&quot;\n&quot;)}if(b){a=a.replace(/&lt;wp-temp-br([^&gt;]*)&gt;/g,&quot;&lt;br$1&gt;&quot;)}return a},pre_wpautop:function(b){var a=this,d={o:a,data:b,unfiltered:b},c=typeof(jQuery)!=&quot;undefined&quot;;if(c){jQuery(&quot;body&quot;).trigge
 r(&quot;beforePreWpautop&quot;,[d])}d.data=a._wp_Nop(d.data);if(c){jQuery(&quot;body&quot;).trigger(&quot;afterPreWpautop&quot;,[d])}return d.data},wpautop:function(b){var a=this,d={o:a,data:b,unfiltered:b},c=typeof(jQuery)!=&quot;undefined&quot;;if(c){jQuery(&quot;body&quot;).trigger(&quot;beforeWpautop&quot;,[d])}d.data=a._wp_Autop(d.data);if(c){jQuery(&quot;body&quot;).trigger(&quot;afterWpautop&quot;,[d])}return d.data}};
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpeditimageeditor_pluginjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (20680 => 20681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js        2012-05-02 01:41:15 UTC (rev 20680)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js        2012-05-02 01:58:25 UTC (rev 20681)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(function(){tinymce.create(&quot;tinymce.plugins.wpEditImage&quot;,{url:&quot;&quot;,editor:{},init:function(a,c){var d=this,b={};d.url=c;d.editor=a;d._createButtons();a.addCommand(&quot;WP_EditImage&quot;,function(){var i=a.selection.getNode(),g,h,e,f=a.dom.getAttrib(i,&quot;class&quot;);if(f.indexOf(&quot;mceItem&quot;)!=-1||f.indexOf(&quot;wpGallery&quot;)!=-1||i.nodeName!=&quot;IMG&quot;){return}g=tinymce.DOM.getViewPort();h=680&lt;(g.h-70)?680:g.h-70;e=650&lt;g.w?650:g.w;a.windowManager.open({file:c+&quot;/editimage.html&quot;,width:e+&quot;px&quot;,height:h+&quot;px&quot;,inline:true})});a.onInit.add(function(e){e.dom.events.add(e.getBody(),&quot;dragstart&quot;,function(g){var f;if(g.target.nodeName==&quot;IMG&quot;&amp;&amp;(f=e.dom.getParent(g.target,&quot;div.mceTemp&quot;))){e.selection.select(f)}})});a.onMouseUp.add(function(f,g){if(tinymce.isWebKit||tinymce.isOpera){return}if(b.x&amp;&amp;(g.clientX!=b.x||g.clientY!=b.y)){var h=f.selection.getNode();
 if(&quot;IMG&quot;==h.nodeName){window.setTimeout(function(){var e=f.dom.getParent(h,&quot;dl.wp-caption&quot;),i;if(h.width!=b.img_w||h.height!=b.img_h){h.className=h.className.replace(/size-[^ &quot;']+/,&quot;&quot;)}if(e){i=f.dom.getAttrib(h,&quot;width&quot;)||h.width;i=parseInt(i,10);f.dom.setStyle(e,&quot;width&quot;,10+i);f.execCommand(&quot;mceRepaint&quot;)}},100)}}b={}});a.onMouseDown.add(function(f,h){var g=h.target;if(g.nodeName!=&quot;IMG&quot;){if(g.firstChild&amp;&amp;g.firstChild.nodeName==&quot;IMG&quot;&amp;&amp;g.childNodes.length==1){g=g.firstChild}else{return}}if(f.dom.getAttrib(g,&quot;class&quot;).indexOf(&quot;mceItem&quot;)==-1){b={x:h.clientX,y:h.clientY,img_w:g.clientWidth,img_h:g.clientHeight};f.plugins.wordpress._showButtons(g,&quot;wp_editbtns&quot;)}});a.onKeyPress.add(function(f,j){var k,g,i,h;if(j.keyCode==13){k=f.selection.getNode();g=f.dom.getParent(k,&quot;dl.wp-caption&quot;);if(g){i=f.dom.getParent(g,&quot;div.mceTemp&quot;)}if(i){h=f.d
 om.create(&quot;p&quot;,{},&quot;&lt;br&gt;&quot;);f.dom.insertAfter(h,i);f.selection.select(h.firstChild);if(tinymce.isIE){f.selection.setContent(&quot;&quot;)}else{f.selection.setContent('&lt;br _moz_dirty=&quot;&quot;&gt;');f.selection.setCursorLocation(h,0)}f.dom.events.cancel(j);return false}}});a.onBeforeSetContent.add(function(e,f){f.content=e.wpSetImgCaption(f.content)});a.onPostProcess.add(function(e,f){if(f.get){f.content=e.wpGetImgCaption(f.content)}});a.wpSetImgCaption=function(e){return d._do_shcode(e)};a.wpGetImgCaption=function(e){return d._get_shcode(e)}},_do_shcode:function(a){return a.replace(/(?:&lt;p&gt;)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:&lt;\/p&gt;)?/g,function(g,d,k){var j,f,e,h,i;j=d.match(/id=['&quot;]([^'&quot;]*)['&quot;] ?/);d=d.replace(j[0],&quot;&quot;);f=d.match(/align=['&quot;]([^'&quot;]*)['&quot;] ?/);d=d.replace(f[0],&quot;&quot;);e=d.match(/width=['&quot;]([0-9]*)['&quot;] ?/);d=d.replace(e[0],&quot;&quot;);h=tin
 ymce.trim(d).replace(/caption=['&quot;]/,&quot;&quot;).replace(/['&quot;]$/,&quot;&quot;);j=(j&amp;&amp;j[1])?j[1]:&quot;&quot;;f=(f&amp;&amp;f[1])?f[1]:&quot;alignnone&quot;;e=(e&amp;&amp;e[1])?e[1]:&quot;&quot;;if(!e||!h){return k}i=&quot;mceTemp&quot;;if(f==&quot;aligncenter&quot;){i+=&quot; mceIEcenter&quot;}return'&lt;div class=&quot;'+i+'&quot;&gt;&lt;dl id=&quot;'+j+'&quot; class=&quot;wp-caption '+f+'&quot; style=&quot;width: '+(10+parseInt(e))+'px&quot;&gt;&lt;dt class=&quot;wp-caption-dt&quot;&gt;'+k+'&lt;/dt&gt;&lt;dd class=&quot;wp-caption-dd&quot;&gt;'+h+&quot;&lt;/dd&gt;&lt;/dl&gt;&lt;/div&gt;&quot;})},_get_shcode:function(a){return a.replace(/&lt;div (?:id=&quot;attachment_|class=&quot;mceTemp)[^&gt;]*&gt;([\s\S]+?)&lt;\/div&gt;/g,function(d,c){var e=c.replace(/&lt;dl ([^&gt;]+)&gt;\s*&lt;dt [^&gt;]+&gt;([\s\S]+?)&lt;\/dt&gt;\s*&lt;dd [^&gt;]+&gt;([\s\S]*?)&lt;\/dd&gt;\s*&lt;\/dl&gt;/gi,function(i,f,l,j){var k,h,g;g=l.match(/width=&quot;([0-9]*)&quot;/);g=(g&a
 mp;&amp;g[1])?g[1]:&quot;&quot;;if(!g||!j){return l}k=f.match(/id=&quot;([^&quot;]*)&quot;/);k=(k&amp;&amp;k[1])?k[1]:&quot;&quot;;h=f.match(/class=&quot;([^&quot;]*)&quot;/);h=(h&amp;&amp;h[1])?h[1]:&quot;&quot;;h=h.match(/align[a-z]+/)||&quot;alignnone&quot;;j=j.replace(/\r\n|\r/g,&quot;\n&quot;).replace(/&lt;[a-zA-Z0-9]+( [^&lt;&gt;]+)?&gt;/g,function(b){b=b.replace(/[\r\n\t]+/,&quot; &quot;).replace(/=&quot;[^&quot;]+&quot;/,function(m){return m.replace(/'/g,&quot;&amp;#39;&quot;)});return b.replace(/&quot;/g,&quot;'&quot;)});j=j.replace(/\n+/g,&quot;&lt;br /&gt;&quot;).replace(/&quot;/g,&quot;&amp;quot;&quot;);return'[caption id=&quot;'+k+'&quot; align=&quot;'+h+'&quot; width=&quot;'+g+'&quot; caption=&quot;'+j+'&quot;]'+l+&quot;[/caption]&quot;});if(e.indexOf(&quot;[caption&quot;)!==0){e=c.replace(/[\s\S]*?((?:&lt;a [^&gt;]+&gt;)?&lt;img [^&gt;]+&gt;(?:&lt;\/a&gt;)?)(&lt;p&gt;[\s\S]*&lt;\/p&gt;)?[\s\S]*/gi,&quot;&lt;p&gt;$1&lt;/p&gt;$2&quot;)}return e})},_createButtons
 :function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove(&quot;wp_editbtns&quot;);d.add(document.body,&quot;div&quot;,{id:&quot;wp_editbtns&quot;,style:&quot;display:none;&quot;});e=d.add(&quot;wp_editbtns&quot;,&quot;img&quot;,{src:b.url+&quot;/img/image.png&quot;,id:&quot;wp_editimgbtn&quot;,width:&quot;24&quot;,height:&quot;24&quot;,title:a.getLang(&quot;wpeditimage.edit_img&quot;)});tinymce.dom.Event.add(e,&quot;mousedown&quot;,function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark(&quot;simple&quot;);f.execCommand(&quot;WP_EditImage&quot;)});c=d.add(&quot;wp_editbtns&quot;,&quot;img&quot;,{src:b.url+&quot;/img/delete.png&quot;,id:&quot;wp_delimgbtn&quot;,width:&quot;24&quot;,height:&quot;24&quot;,title:a.getLang(&quot;wpeditimage.del_img&quot;)});tinymce.dom.Event.add(c,&quot;mousedown&quot;,function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName==&quot;IMG&quot;&amp;&amp;f.dom.getAttrib(g,&quot;cla
 ss&quot;).indexOf(&quot;mceItem&quot;)==-1){if((h=f.dom.getParent(g,&quot;div&quot;))&amp;&amp;f.dom.hasClass(h,&quot;mceTemp&quot;)){f.dom.remove(h)}else{if((h=f.dom.getParent(g,&quot;A&quot;))&amp;&amp;h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand(&quot;mceRepaint&quot;);return false}})},getInfo:function(){return{longname:&quot;Edit Image&quot;,author:&quot;WordPress&quot;,authorurl:&quot;http://wordpress.org&quot;,infourl:&quot;&quot;,version:&quot;1.0&quot;}}});tinymce.PluginManager.add(&quot;wpeditimage&quot;,tinymce.plugins.wpEditImage)})();
</del><span class="cx">\ No newline at end of file
</span><ins>+(function(){tinymce.create(&quot;tinymce.plugins.wpEditImage&quot;,{url:&quot;&quot;,editor:{},init:function(a,c){var d=this,b={};d.url=c;d.editor=a;d._createButtons();a.addCommand(&quot;WP_EditImage&quot;,function(){var i=a.selection.getNode(),g,h,e,f=a.dom.getAttrib(i,&quot;class&quot;);if(f.indexOf(&quot;mceItem&quot;)!=-1||f.indexOf(&quot;wpGallery&quot;)!=-1||i.nodeName!=&quot;IMG&quot;){return}g=tinymce.DOM.getViewPort();h=680&lt;(g.h-70)?680:g.h-70;e=650&lt;g.w?650:g.w;a.windowManager.open({file:c+&quot;/editimage.html&quot;,width:e+&quot;px&quot;,height:h+&quot;px&quot;,inline:true})});a.onInit.add(function(e){e.dom.events.add(e.getBody(),&quot;dragstart&quot;,function(g){var f;if(g.target.nodeName==&quot;IMG&quot;&amp;&amp;(f=e.dom.getParent(g.target,&quot;div.mceTemp&quot;))){e.selection.select(f)}})});a.onMouseUp.add(function(f,g){if(tinymce.isWebKit||tinymce.isOpera){return}if(b.x&amp;&amp;(g.clientX!=b.x||g.clientY!=b.y)){var h=f.selection.getNode();
 if(&quot;IMG&quot;==h.nodeName){window.setTimeout(function(){var e=f.dom.getParent(h,&quot;dl.wp-caption&quot;),i;if(h.width!=b.img_w||h.height!=b.img_h){h.className=h.className.replace(/size-[^ &quot;']+/,&quot;&quot;)}if(e){i=f.dom.getAttrib(h,&quot;width&quot;)||h.width;i=parseInt(i,10);f.dom.setStyle(e,&quot;width&quot;,10+i);f.execCommand(&quot;mceRepaint&quot;)}},100)}}b={}});a.onMouseDown.add(function(f,h){var g=h.target;if(g.nodeName!=&quot;IMG&quot;){if(g.firstChild&amp;&amp;g.firstChild.nodeName==&quot;IMG&quot;&amp;&amp;g.childNodes.length==1){g=g.firstChild}else{return}}if(f.dom.getAttrib(g,&quot;class&quot;).indexOf(&quot;mceItem&quot;)==-1){b={x:h.clientX,y:h.clientY,img_w:g.clientWidth,img_h:g.clientHeight};f.plugins.wordpress._showButtons(g,&quot;wp_editbtns&quot;)}});a.onKeyPress.add(function(f,j){var k,g,i,h;if(j.keyCode==13){k=f.selection.getNode();g=f.dom.getParent(k,&quot;dl.wp-caption&quot;);if(g){i=f.dom.getParent(g,&quot;div.mceTemp&quot;)}if(i){h=f.d
 om.create(&quot;p&quot;,{},&quot;&lt;br&gt;&quot;);f.dom.insertAfter(h,i);f.selection.select(h.firstChild);if(tinymce.isIE){f.selection.setContent(&quot;&quot;)}else{f.selection.setContent('&lt;br _moz_dirty=&quot;&quot;&gt;');f.selection.setCursorLocation(h,0)}f.dom.events.cancel(j);return false}}});a.onBeforeSetContent.add(function(e,f){f.content=e.wpSetImgCaption(f.content)});a.onPostProcess.add(function(e,f){if(f.get){f.content=e.wpGetImgCaption(f.content)}});a.wpSetImgCaption=function(e){return d._do_shcode(e)};a.wpGetImgCaption=function(e){return d._get_shcode(e)}},_do_shcode:function(a){return a.replace(/(?:&lt;p&gt;)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:&lt;\/p&gt;)?/g,function(j,i,h){var d,m,k,l,f,g,e=tinymce.trim;d=i.match(/id=['&quot;]([^'&quot;]*)['&quot;] ?/);i=i.replace(d[0],&quot;&quot;);m=i.match(/align=['&quot;]([^'&quot;]*)['&quot;] ?/);i=i.replace(m[0],&quot;&quot;);k=i.match(/width=['&quot;]([0-9]*)['&quot;] ?/);i=i.replace(k[0],&q
 uot;&quot;);h=e(h);g=h.match(/((?:&lt;a [^&gt;]+&gt;)?&lt;img [^&gt;]+&gt;(?:&lt;\/a&gt;)?)([\s\S]*)/i);if(g&amp;&amp;g[2]){l=e(g[2]);g=e(g[1])}else{l=e(i).replace(/caption=['&quot;]/,&quot;&quot;).replace(/['&quot;]$/,&quot;&quot;);g=h}d=(d&amp;&amp;d[1])?d[1]:&quot;&quot;;m=(m&amp;&amp;m[1])?m[1]:&quot;alignnone&quot;;k=(k&amp;&amp;k[1])?k[1]:&quot;&quot;;if(!k||!l){return h}f=&quot;mceTemp&quot;;if(m==&quot;aligncenter&quot;){f+=&quot; mceIEcenter&quot;}return'&lt;div class=&quot;'+f+'&quot;&gt;&lt;dl id=&quot;'+d+'&quot; class=&quot;wp-caption '+m+'&quot; style=&quot;width: '+(10+parseInt(k))+'px&quot;&gt;&lt;dt class=&quot;wp-caption-dt&quot;&gt;'+g+'&lt;/dt&gt;&lt;dd class=&quot;wp-caption-dd&quot;&gt;'+l+&quot;&lt;/dd&gt;&lt;/dl&gt;&lt;/div&gt;&quot;})},_get_shcode:function(a){return a.replace(/&lt;div (?:id=&quot;attachment_|class=&quot;mceTemp)[^&gt;]*&gt;([\s\S]+?)&lt;\/div&gt;/g,function(d,c){var e=c.replace(/&lt;dl ([^&gt;]+)&gt;\s*&lt;dt [^&gt;]+&gt;([\s\S]+?)&l
 t;\/dt&gt;\s*&lt;dd [^&gt;]+&gt;([\s\S]*?)&lt;\/dd&gt;\s*&lt;\/dl&gt;/gi,function(i,f,l,j){var k,h,g;g=l.match(/width=&quot;([0-9]*)&quot;/);g=(g&amp;&amp;g[1])?g[1]:&quot;&quot;;if(!g||!j){return l}k=f.match(/id=&quot;([^&quot;]*)&quot;/);k=(k&amp;&amp;k[1])?k[1]:&quot;&quot;;h=f.match(/class=&quot;([^&quot;]*)&quot;/);h=(h&amp;&amp;h[1])?h[1]:&quot;&quot;;h=h.match(/align[a-z]+/)||&quot;alignnone&quot;;j=j.replace(/\r\n|\r/g,&quot;\n&quot;).replace(/&lt;[a-zA-Z0-9]+( [^&lt;&gt;]+)?&gt;/g,function(b){return b.replace(/[\r\n\t]+/,&quot; &quot;)});j=j.replace(/\s*\n\s*/g,&quot;&lt;br /&gt;&quot;);return'[caption id=&quot;'+k+'&quot; align=&quot;'+h+'&quot; width=&quot;'+g+'&quot;]'+l+&quot; &quot;+j+&quot;[/caption]&quot;});if(e.indexOf(&quot;[caption&quot;)!==0){e=c.replace(/[\s\S]*?((?:&lt;a [^&gt;]+&gt;)?&lt;img [^&gt;]+&gt;(?:&lt;\/a&gt;)?)(&lt;p&gt;[\s\S]*&lt;\/p&gt;)?[\s\S]*/gi,&quot;&lt;p&gt;$1&lt;/p&gt;$2&quot;)}return e})},_createButtons:function(){var b=this,a=tinyM
 CE.activeEditor,d=tinymce.DOM,e,c;d.remove(&quot;wp_editbtns&quot;);d.add(document.body,&quot;div&quot;,{id:&quot;wp_editbtns&quot;,style:&quot;display:none;&quot;});e=d.add(&quot;wp_editbtns&quot;,&quot;img&quot;,{src:b.url+&quot;/img/image.png&quot;,id:&quot;wp_editimgbtn&quot;,width:&quot;24&quot;,height:&quot;24&quot;,title:a.getLang(&quot;wpeditimage.edit_img&quot;)});tinymce.dom.Event.add(e,&quot;mousedown&quot;,function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark(&quot;simple&quot;);f.execCommand(&quot;WP_EditImage&quot;)});c=d.add(&quot;wp_editbtns&quot;,&quot;img&quot;,{src:b.url+&quot;/img/delete.png&quot;,id:&quot;wp_delimgbtn&quot;,width:&quot;24&quot;,height:&quot;24&quot;,title:a.getLang(&quot;wpeditimage.del_img&quot;)});tinymce.dom.Event.add(c,&quot;mousedown&quot;,function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName==&quot;IMG&quot;&amp;&amp;f.dom.getAttrib(g,&quot;class&quot;).indexOf(&quot;mceIte
 m&quot;)==-1){if((h=f.dom.getParent(g,&quot;div&quot;))&amp;&amp;f.dom.hasClass(h,&quot;mceTemp&quot;)){f.dom.remove(h)}else{if((h=f.dom.getParent(g,&quot;A&quot;))&amp;&amp;h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand(&quot;mceRepaint&quot;);return false}})},getInfo:function(){return{longname:&quot;Edit Image&quot;,author:&quot;WordPress&quot;,authorurl:&quot;http://wordpress.org&quot;,infourl:&quot;&quot;,version:&quot;1.0&quot;}}});tinymce.PluginManager.add(&quot;wpeditimage&quot;,tinymce.plugins.wpEditImage)})();
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpeditimagejseditimagejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (20680 => 20681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js        2012-05-02 01:41:15 UTC (rev 20680)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js        2012-05-02 01:58:25 UTC (rev 20681)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var tinymce=null,tinyMCEPopup,tinyMCE,wpImage;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance(&quot;tinymce.dom.DOMUtils&quot;,document);b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&amp;&amp;window.dialogArguments)||opener||parent||top},getParam:function(b,a){return this.editor.getParam(b,a)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selec
 tion.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}}};tinyMCEPopup.init();wpImage={preInit:function(){var a=tinyMCEPopup.editor,e=tinyMCEPopup.getWin(),d=e.document.styleSheets,b,c;for(c=0;c&lt;d.length;c++){b=d.item(c).href;if(b&amp;&amp;b.indexOf(&quot;colors&quot;)!=-1){document.getElementsByTagName(&quot;head&quot;)[0].appendChild(a.dom.create(&quot;link&quot;,{rel:&quot;stylesheet&quot;,href:b}));break}}},I:function(a){return document.getElementById(a)},current:&quot;&quot;,link:&quot;&quot;,link_rel:&quot;&quot;,target_value:&quot;&quot;,current_size_sel:&quot;s100&quot;,width:&quot;&quot;,height:&quot;&quot;,align:&quot;&quot;,img_alt:&quot;&quot;,setTabs:function(b){var a=this;if(&quot;current&quot;==b.className){return false}a.I(&quot;div_advanced&quot;).style.display=(&quot;tab_advanced&quot;==b.id)?&quot;block&quot;:&quot;none&quot;;a.I(&quot;div_basic&quot;).style
 .display=(&quot;tab_basic&quot;==b.id)?&quot;block&quot;:&quot;none&quot;;a.I(&quot;tab_basic&quot;).className=a.I(&quot;tab_advanced&quot;).className=&quot;&quot;;b.className=&quot;current&quot;;return false},img_seturl:function(b){var c=this,a=c.I(&quot;link_rel&quot;).value;if(&quot;current&quot;==b){c.I(&quot;link_href&quot;).value=c.current;c.I(&quot;link_rel&quot;).value=c.link_rel}else{c.I(&quot;link_href&quot;).value=c.link;if(a){a=a.replace(/attachment|wp-att-[0-9]+/gi,&quot;&quot;);c.I(&quot;link_rel&quot;).value=tinymce.trim(a)}}},imgAlignCls:function(b){var c=this,a=c.I(&quot;img_classes&quot;).value;c.I(&quot;img_demo&quot;).className=c.align=b;a=a.replace(/align[^ &quot;']+/gi,&quot;&quot;);a+=(&quot; &quot;+b);a=a.replace(/\s+/g,&quot; &quot;).replace(/^\s/,&quot;&quot;);if(&quot;aligncenter&quot;==b){c.I(&quot;hspace&quot;).value=&quot;&quot;;c.updateStyle(&quot;hspace&quot;)}c.I(&quot;img_classes&quot;).value=a},showSize:function(e){var c=this,f=c.I(&quot;im
 g_demo&quot;),a=c.width,d=c.height,g=e.id||&quot;s100&quot;,b;b=parseInt(g.substring(1))/200;f.width=Math.round(a*b);f.height=Math.round(d*b);c.showSizeClear();e.style.borderColor=&quot;#A3A3A3&quot;;e.style.backgroundColor=&quot;#E5E5E5&quot;},showSizeSet:function(){var b=this,d,c,a;if((b.width*1.3)&gt;parseInt(b.preloadImg.width)){d=b.I(&quot;s130&quot;),c=b.I(&quot;s120&quot;),a=b.I(&quot;s110&quot;);d.onclick=c.onclick=a.onclick=null;d.onmouseover=c.onmouseover=a.onmouseover=null;d.style.color=c.style.color=a.style.color=&quot;#aaa&quot;}},showSizeRem:function(){var a=this,c=a.I(&quot;img_demo&quot;),b=document.forms[0];c.width=Math.round(b.width.value*0.5);c.height=Math.round(b.height.value*0.5);a.showSizeClear();a.I(a.current_size_sel).style.borderColor=&quot;#A3A3A3&quot;;a.I(a.current_size_sel).style.backgroundColor=&quot;#E5E5E5&quot;;return false},showSizeClear:function(){var b=this.I(&quot;img_size&quot;).getElementsByTagName(&quot;div&quot;),a;for(a=0;a&lt;b.leng
 th;a++){b[a].style.borderColor=&quot;#f1f1f1&quot;;b[a].style.backgroundColor=&quot;#f1f1f1&quot;}},imgEditSize:function(g){var d=this,i=document.forms[0],a,c,b,e,j;if(!d.preloadImg||!d.preloadImg.width||!d.preloadImg.height){return}a=parseInt(d.preloadImg.width),c=parseInt(d.preloadImg.height),b=d.width||a,e=d.height||c,j=g.id||&quot;s100&quot;;size=parseInt(j.substring(1))/100;b=Math.round(b*size);e=Math.round(e*size);i.width.value=Math.min(a,b);i.height.value=Math.min(c,e);d.current_size_sel=j;d.demoSetSize()},demoSetSize:function(a){var c=this.I(&quot;img_demo&quot;),b=document.forms[0];c.width=b.width.value?Math.round(b.width.value*0.5):&quot;&quot;;c.height=b.height.value?Math.round(b.height.value*0.5):&quot;&quot;},demoSetStyle:function(){var b=document.forms[0],a=this.I(&quot;img_demo&quot;),c=tinyMCEPopup.editor.dom;if(a){c.setAttrib(a,&quot;style&quot;,b.img_style.value);c.setStyle(a,&quot;width&quot;,&quot;&quot;);c.setStyle(a,&quot;height&quot;,&quot;&quot;)}},or
 igSize:function(){var a=this,c=document.forms[0],b=a.I(&quot;s100&quot;);c.width.value=a.width=a.preloadImg.width;c.height.value=a.height=a.preloadImg.height;a.showSizeSet();a.demoSetSize();a.showSize(b)},init:function(){var a=tinyMCEPopup.editor,b;b=document.body.innerHTML;document.body.innerHTML=a.translate(b);window.setTimeout(function(){wpImage.setup()},500)},setup:function(){var q=this,l,b,m,e,j=document.forms[0],i=tinyMCEPopup.editor,k=q.I(&quot;img_demo&quot;),h=tinyMCEPopup.dom,a,g,p=&quot;&quot;,o,n;document.dir=tinyMCEPopup.editor.getParam(&quot;directionality&quot;,&quot;&quot;);if(tinyMCEPopup.editor.getParam(&quot;wpeditimage_disable_captions&quot;,false)){q.I(&quot;cap_field&quot;).style.display=&quot;none&quot;}tinyMCEPopup.restoreSelection();b=i.selection.getNode();if(b.nodeName!=&quot;IMG&quot;){return}j.img_src.value=k.src=m=i.dom.getAttrib(b,&quot;src&quot;);i.dom.setStyle(b,&quot;float&quot;,&quot;&quot;);q.getImageData();l=i.dom.getAttrib(b,&quot;class&q
 uot;);if(a=h.getParent(b,&quot;dl&quot;)){o=i.dom.getAttrib(a,&quot;class&quot;);o=o.match(/align[^ &quot;']+/i);if(o&amp;&amp;!h.hasClass(b,o)){l+=&quot; &quot;+o;tinymce.trim(l)}g=i.dom.select(&quot;dd.wp-caption-dd&quot;,a);if(g&amp;&amp;g[0]){p=i.serializer.serialize(g[0]).replace(/^&lt;p&gt;/,&quot;&quot;).replace(/&lt;\/p&gt;$/,&quot;&quot;)}}j.img_cap_text.value=p;j.img_title.value=i.dom.getAttrib(b,&quot;title&quot;);j.img_alt.value=i.dom.getAttrib(b,&quot;alt&quot;);j.border.value=i.dom.getAttrib(b,&quot;border&quot;);j.vspace.value=i.dom.getAttrib(b,&quot;vspace&quot;);j.hspace.value=i.dom.getAttrib(b,&quot;hspace&quot;);j.align.value=i.dom.getAttrib(b,&quot;align&quot;);j.width.value=q.width=i.dom.getAttrib(b,&quot;width&quot;);j.height.value=q.height=i.dom.getAttrib(b,&quot;height&quot;);j.img_classes.value=l;j.img_style.value=i.dom.getAttrib(b,&quot;style&quot;);if(h.getAttrib(b,&quot;hspace&quot;)){q.updateStyle(&quot;hspace&quot;)}if(h.getAttrib(b,&quot;border
 &quot;)){q.updateStyle(&quot;border&quot;)}if(h.getAttrib(b,&quot;vspace&quot;)){q.updateStyle(&quot;vspace&quot;)}if(n=i.dom.getParent(b,&quot;A&quot;)){j.link_href.value=q.current=i.dom.getAttrib(n,&quot;href&quot;);j.link_title.value=i.dom.getAttrib(n,&quot;title&quot;);j.link_rel.value=q.link_rel=i.dom.getAttrib(n,&quot;rel&quot;);j.link_style.value=i.dom.getAttrib(n,&quot;style&quot;);q.target_value=i.dom.getAttrib(n,&quot;target&quot;);j.link_classes.value=i.dom.getAttrib(n,&quot;class&quot;)}j.link_target.checked=(q.target_value&amp;&amp;q.target_value==&quot;_blank&quot;)?&quot;checked&quot;:&quot;&quot;;e=m.substring(m.lastIndexOf(&quot;/&quot;));e=e.replace(/-[0-9]{2,4}x[0-9]{2,4}/,&quot;&quot;);q.link=m.substring(0,m.lastIndexOf(&quot;/&quot;))+e;if(l.indexOf(&quot;alignleft&quot;)!=-1){q.I(&quot;alignleft&quot;).checked=&quot;checked&quot;;k.className=q.align=&quot;alignleft&quot;}else{if(l.indexOf(&quot;aligncenter&quot;)!=-1){q.I(&quot;aligncenter&quot;).checke
 d=&quot;checked&quot;;k.className=q.align=&quot;aligncenter&quot;}else{if(l.indexOf(&quot;alignright&quot;)!=-1){q.I(&quot;alignright&quot;).checked=&quot;checked&quot;;k.className=q.align=&quot;alignright&quot;}else{if(l.indexOf(&quot;alignnone&quot;)!=-1){q.I(&quot;alignnone&quot;).checked=&quot;checked&quot;;k.className=q.align=&quot;alignnone&quot;}}}}if(q.width&amp;&amp;q.preloadImg.width){q.showSizeSet()}document.body.style.display=&quot;&quot;},remove:function(){var a=tinyMCEPopup.editor,c,b;tinyMCEPopup.restoreSelection();b=a.selection.getNode();if(b.nodeName!=&quot;IMG&quot;){return}if((c=a.dom.getParent(b,&quot;div&quot;))&amp;&amp;a.dom.hasClass(c,&quot;mceTemp&quot;)){a.dom.remove(c)}else{if((c=a.dom.getParent(b,&quot;A&quot;))&amp;&amp;c.childNodes.length==1){a.dom.remove(c)}else{a.dom.remove(b)}}a.execCommand(&quot;mceRepaint&quot;);tinyMCEPopup.close();return},update:function(){var m=this,v=document.forms[0],g=tinyMCEPopup.editor,e,y,d=null,n,h,p,r,o=null,k=v.
 img_classes.value,l,q,u=&quot;&quot;,j,i,s,a,B,x=&quot;&quot;,c,z,w;tinyMCEPopup.restoreSelection();e=g.selection.getNode();if(e.nodeName!=&quot;IMG&quot;){return}if(v.img_src.value===&quot;&quot;){m.remove();return}if(v.img_cap_text.value!=&quot;&quot;&amp;&amp;v.width.value!=&quot;&quot;){o=1;k=k.replace(/align[^ &quot;']+\s?/gi,&quot;&quot;)}p=g.dom.getParent(e,&quot;a&quot;);h=g.dom.getParent(e,&quot;p&quot;);n=g.dom.getParent(e,&quot;dl&quot;);r=g.dom.getParent(e,&quot;div&quot;);tinyMCEPopup.execCommand(&quot;mceBeginUndoLevel&quot;);if(v.width.value!=e.width||v.height.value!=e.height){k=k.replace(/size-[^ &quot;']+/,&quot;&quot;)}g.dom.setAttribs(e,{src:v.img_src.value,title:v.img_title.value,alt:v.img_alt.value,width:v.width.value,height:v.height.value,style:v.img_style.value,&quot;class&quot;:k});if(v.link_href.value){if(p==null){if(!v.link_href.value.match(/https?:\/\//i)){v.link_href.value=tinyMCEPopup.editor.documentBaseURI.toAbsolute(v.link_href.value)}g.getDoc(
 ).execCommand(&quot;unlink&quot;,false,null);tinyMCEPopup.execCommand(&quot;mceInsertLink&quot;,false,&quot;#mce_temp_url#&quot;,{skip_undo:1});tinymce.each(g.dom.select(&quot;a&quot;),function(b){if(g.dom.getAttrib(b,&quot;href&quot;)==&quot;#mce_temp_url#&quot;){g.dom.setAttribs(b,{href:v.link_href.value,title:v.link_title.value,rel:v.link_rel.value,target:(v.link_target.checked==true)?&quot;_blank&quot;:&quot;&quot;,&quot;class&quot;:v.link_classes.value,style:v.link_style.value})}})}else{g.dom.setAttribs(p,{href:v.link_href.value,title:v.link_title.value,rel:v.link_rel.value,target:(v.link_target.checked==true)?&quot;_blank&quot;:&quot;&quot;,&quot;class&quot;:v.link_classes.value,style:v.link_style.value})}}if(o){a=10+parseInt(v.width.value);B=(m.align==&quot;aligncenter&quot;)?&quot;mceTemp mceIEcenter&quot;:&quot;mceTemp&quot;;w=v.img_cap_text.value;w=w.replace(/\r\n|\r/g,&quot;\n&quot;).replace(/&lt;[a-zA-Z0-9]+( [^&lt;&gt;]+)?&gt;/g,function(b){b=b.replace(/[\r\n\t]
 +/,&quot; &quot;).replace(/=&quot;[^&quot;]+&quot;/,function(f){return f.replace(/'/g,&quot;&amp;#39;&quot;)});return b.replace(/&quot;/g,&quot;'&quot;)});w=w.replace(/\n+/g,&quot;&lt;br /&gt;&quot;).replace(/&quot;/g,&quot;&amp;quot;&quot;);if(n){g.dom.setAttribs(n,{&quot;class&quot;:&quot;wp-caption &quot;+m.align,style:&quot;width: &quot;+a+&quot;px;&quot;});if(r){g.dom.setAttrib(r,&quot;class&quot;,B)}if((i=g.dom.getParent(e,&quot;dt&quot;))&amp;&amp;(s=i.nextSibling)&amp;&amp;g.dom.hasClass(s,&quot;wp-caption-dd&quot;)){g.dom.setHTML(s,w)}}else{if((q=v.img_classes.value.match(/wp-image-([0-9]{1,6})/))&amp;&amp;q[1]){u=&quot;attachment_&quot;+q[1]}if(v.link_href.value&amp;&amp;(x=g.dom.getParent(e,&quot;a&quot;))){if(x.childNodes.length==1){l=g.dom.getOuterHTML(x)}else{l=g.dom.getOuterHTML(x);l=l.match(/&lt;a [^&gt;]+&gt;/i);l=l+g.dom.getOuterHTML(e)+&quot;&lt;/a&gt;&quot;}}else{l=g.dom.getOuterHTML(e)}l='&lt;dl id=&quot;'+u+'&quot; class=&quot;wp-caption '+m.align+'&quo
 t; style=&quot;width: '+a+'px&quot;&gt;&lt;dt class=&quot;wp-caption-dt&quot;&gt;'+l+'&lt;/dt&gt;&lt;dd class=&quot;wp-caption-dd&quot;&gt;'+w+&quot;&lt;/dd&gt;&lt;/dl&gt;&quot;;j=g.dom.create(&quot;div&quot;,{&quot;class&quot;:B},l);if(h){h.parentNode.insertBefore(j,h);if(h.childNodes.length==1){g.dom.remove(h)}else{if(x&amp;&amp;x.childNodes.length==1){g.dom.remove(x)}else{g.dom.remove(e)}}}else{if(c=g.dom.getParent(e,&quot;TD,TH,LI&quot;)){c.appendChild(j);if(x&amp;&amp;x.childNodes.length==1){g.dom.remove(x)}else{g.dom.remove(e)}}}}}else{if(n&amp;&amp;r){if(v.link_href.value&amp;&amp;(z=g.dom.getParent(e,&quot;a&quot;))){l=g.dom.getOuterHTML(z)}else{l=g.dom.getOuterHTML(e)}h=g.dom.create(&quot;p&quot;,{},l);r.parentNode.insertBefore(h,r);g.dom.remove(r)}}if(v.img_classes.value.indexOf(&quot;aligncenter&quot;)!=-1){if(h&amp;&amp;(!h.style||h.style.textAlign!=&quot;center&quot;)){g.dom.setStyle(h,&quot;textAlign&quot;,&quot;center&quot;)}}else{if(h&amp;&amp;h.style&amp;&am
 p;h.style.textAlign==&quot;center&quot;){g.dom.setStyle(h,&quot;textAlign&quot;,&quot;&quot;)}}if(!v.link_href.value&amp;&amp;p){y=g.selection.getBookmark();g.dom.remove(p,1);g.selection.moveToBookmark(y)}tinyMCEPopup.execCommand(&quot;mceEndUndoLevel&quot;);g.execCommand(&quot;mceRepaint&quot;);tinyMCEPopup.close()},updateStyle:function(a){var e=tinyMCEPopup.dom,c,d=document.forms[0],b=e.create(&quot;img&quot;,{style:d.img_style.value});if(tinyMCEPopup.editor.settings.inline_styles){if(a==&quot;align&quot;){e.setStyle(b,&quot;float&quot;,&quot;&quot;);e.setStyle(b,&quot;vertical-align&quot;,&quot;&quot;);c=d.align.value;if(c){if(c==&quot;left&quot;||c==&quot;right&quot;){e.setStyle(b,&quot;float&quot;,c)}else{b.style.verticalAlign=c}}}if(a==&quot;border&quot;){e.setStyle(b,&quot;border&quot;,&quot;&quot;);c=d.border.value;if(c||c==&quot;0&quot;){if(c==&quot;0&quot;){b.style.border=&quot;0&quot;}else{b.style.border=c+&quot;px solid black&quot;}}}if(a==&quot;hspace&quot;){e.s
 etStyle(b,&quot;marginLeft&quot;,&quot;&quot;);e.setStyle(b,&quot;marginRight&quot;,&quot;&quot;);c=d.hspace.value;if(c){b.style.marginLeft=c+&quot;px&quot;;b.style.marginRight=c+&quot;px&quot;}}if(a==&quot;vspace&quot;){e.setStyle(b,&quot;marginTop&quot;,&quot;&quot;);e.setStyle(b,&quot;marginBottom&quot;,&quot;&quot;);c=d.vspace.value;if(c){b.style.marginTop=c+&quot;px&quot;;b.style.marginBottom=c+&quot;px&quot;}}d.img_style.value=e.serializeStyle(e.parseStyle(b.style.cssText));this.demoSetStyle()}},checkVal:function(a){if(a.value==&quot;&quot;){if(a.id==&quot;img_src&quot;){a.value=this.I(&quot;img_demo&quot;).src||this.preloadImg.src}}},resetImageData:function(){var a=document.forms[0];a.width.value=a.height.value=&quot;&quot;},updateImageData:function(){var d=document.forms[0],b=wpImage,a=d.width.value,c=d.height.value;if(!a&amp;&amp;c){a=d.width.value=b.width=Math.round(b.preloadImg.width/(b.preloadImg.height/c))}else{if(a&amp;&amp;!c){c=d.height.value=b.height=Math.ro
 und(b.preloadImg.height/(b.preloadImg.width/a))}}if(!a){d.width.value=b.width=b.preloadImg.width}if(!c){d.height.value=b.height=b.preloadImg.height}b.showSizeSet();b.demoSetSize();if(d.img_style.value){b.demoSetStyle()}},getImageData:function(){var a=wpImage,b=document.forms[0];a.preloadImg=new Image();a.preloadImg.onload=a.updateImageData;a.preloadImg.onerror=a.resetImageData;a.preloadImg.src=tinyMCEPopup.editor.documentBaseURI.toAbsolute(b.img_src.value)}};window.onload=function(){wpImage.init()};wpImage.preInit();
</del><span class="cx">\ No newline at end of file
</span><ins>+var tinymce=null,tinyMCEPopup,tinyMCE,wpImage;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance(&quot;tinymce.dom.DOMUtils&quot;,document);b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&amp;&amp;window.dialogArguments)||opener||parent||top},getParam:function(b,a){return this.editor.getParam(b,a)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selec
 tion.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}}};tinyMCEPopup.init();wpImage={preInit:function(){var a=tinyMCEPopup.editor,e=tinyMCEPopup.getWin(),d=e.document.styleSheets,b,c;for(c=0;c&lt;d.length;c++){b=d.item(c).href;if(b&amp;&amp;b.indexOf(&quot;colors&quot;)!=-1){document.getElementsByTagName(&quot;head&quot;)[0].appendChild(a.dom.create(&quot;link&quot;,{rel:&quot;stylesheet&quot;,href:b}));break}}},I:function(a){return document.getElementById(a)},current:&quot;&quot;,link:&quot;&quot;,link_rel:&quot;&quot;,target_value:&quot;&quot;,current_size_sel:&quot;s100&quot;,width:&quot;&quot;,height:&quot;&quot;,align:&quot;&quot;,img_alt:&quot;&quot;,setTabs:function(b){var a=this;if(&quot;current&quot;==b.className){return false}a.I(&quot;div_advanced&quot;).style.display=(&quot;tab_advanced&quot;==b.id)?&quot;block&quot;:&quot;none&quot;;a.I(&quot;div_basic&quot;).style
 .display=(&quot;tab_basic&quot;==b.id)?&quot;block&quot;:&quot;none&quot;;a.I(&quot;tab_basic&quot;).className=a.I(&quot;tab_advanced&quot;).className=&quot;&quot;;b.className=&quot;current&quot;;return false},img_seturl:function(b){var c=this,a=c.I(&quot;link_rel&quot;).value;if(&quot;current&quot;==b){c.I(&quot;link_href&quot;).value=c.current;c.I(&quot;link_rel&quot;).value=c.link_rel}else{c.I(&quot;link_href&quot;).value=c.link;if(a){a=a.replace(/attachment|wp-att-[0-9]+/gi,&quot;&quot;);c.I(&quot;link_rel&quot;).value=tinymce.trim(a)}}},imgAlignCls:function(b){var c=this,a=c.I(&quot;img_classes&quot;).value;c.I(&quot;img_demo&quot;).className=c.align=b;a=a.replace(/align[^ &quot;']+/gi,&quot;&quot;);a+=(&quot; &quot;+b);a=a.replace(/\s+/g,&quot; &quot;).replace(/^\s/,&quot;&quot;);if(&quot;aligncenter&quot;==b){c.I(&quot;hspace&quot;).value=&quot;&quot;;c.updateStyle(&quot;hspace&quot;)}c.I(&quot;img_classes&quot;).value=a},showSize:function(e){var c=this,f=c.I(&quot;im
 g_demo&quot;),a=c.width,d=c.height,g=e.id||&quot;s100&quot;,b;b=parseInt(g.substring(1))/200;f.width=Math.round(a*b);f.height=Math.round(d*b);c.showSizeClear();e.style.borderColor=&quot;#A3A3A3&quot;;e.style.backgroundColor=&quot;#E5E5E5&quot;},showSizeSet:function(){var b=this,d,c,a;if((b.width*1.3)&gt;parseInt(b.preloadImg.width)){d=b.I(&quot;s130&quot;),c=b.I(&quot;s120&quot;),a=b.I(&quot;s110&quot;);d.onclick=c.onclick=a.onclick=null;d.onmouseover=c.onmouseover=a.onmouseover=null;d.style.color=c.style.color=a.style.color=&quot;#aaa&quot;}},showSizeRem:function(){var a=this,c=a.I(&quot;img_demo&quot;),b=document.forms[0];c.width=Math.round(b.width.value*0.5);c.height=Math.round(b.height.value*0.5);a.showSizeClear();a.I(a.current_size_sel).style.borderColor=&quot;#A3A3A3&quot;;a.I(a.current_size_sel).style.backgroundColor=&quot;#E5E5E5&quot;;return false},showSizeClear:function(){var b=this.I(&quot;img_size&quot;).getElementsByTagName(&quot;div&quot;),a;for(a=0;a&lt;b.leng
 th;a++){b[a].style.borderColor=&quot;#f1f1f1&quot;;b[a].style.backgroundColor=&quot;#f1f1f1&quot;}},imgEditSize:function(g){var d=this,i=document.forms[0],a,c,b,e,j;if(!d.preloadImg||!d.preloadImg.width||!d.preloadImg.height){return}a=parseInt(d.preloadImg.width),c=parseInt(d.preloadImg.height),b=d.width||a,e=d.height||c,j=g.id||&quot;s100&quot;;size=parseInt(j.substring(1))/100;b=Math.round(b*size);e=Math.round(e*size);i.width.value=Math.min(a,b);i.height.value=Math.min(c,e);d.current_size_sel=j;d.demoSetSize()},demoSetSize:function(a){var c=this.I(&quot;img_demo&quot;),b=document.forms[0];c.width=b.width.value?Math.round(b.width.value*0.5):&quot;&quot;;c.height=b.height.value?Math.round(b.height.value*0.5):&quot;&quot;},demoSetStyle:function(){var b=document.forms[0],a=this.I(&quot;img_demo&quot;),c=tinyMCEPopup.editor.dom;if(a){c.setAttrib(a,&quot;style&quot;,b.img_style.value);c.setStyle(a,&quot;width&quot;,&quot;&quot;);c.setStyle(a,&quot;height&quot;,&quot;&quot;)}},or
 igSize:function(){var a=this,c=document.forms[0],b=a.I(&quot;s100&quot;);c.width.value=a.width=a.preloadImg.width;c.height.value=a.height=a.preloadImg.height;a.showSizeSet();a.demoSetSize();a.showSize(b)},init:function(){var a=tinyMCEPopup.editor,b;b=document.body.innerHTML;document.body.innerHTML=a.translate(b);window.setTimeout(function(){wpImage.setup()},500)},setup:function(){var q=this,l,b,m,e,j=document.forms[0],i=tinyMCEPopup.editor,k=q.I(&quot;img_demo&quot;),h=tinyMCEPopup.dom,a,g,p=&quot;&quot;,o,n;document.dir=tinyMCEPopup.editor.getParam(&quot;directionality&quot;,&quot;&quot;);if(tinyMCEPopup.editor.getParam(&quot;wpeditimage_disable_captions&quot;,false)){q.I(&quot;cap_field&quot;).style.display=&quot;none&quot;}tinyMCEPopup.restoreSelection();b=i.selection.getNode();if(b.nodeName!=&quot;IMG&quot;){return}j.img_src.value=k.src=m=i.dom.getAttrib(b,&quot;src&quot;);i.dom.setStyle(b,&quot;float&quot;,&quot;&quot;);q.getImageData();l=i.dom.getAttrib(b,&quot;class&q
 uot;);if(a=h.getParent(b,&quot;dl&quot;)){o=i.dom.getAttrib(a,&quot;class&quot;);o=o.match(/align[^ &quot;']+/i);if(o&amp;&amp;!h.hasClass(b,o)){l+=&quot; &quot;+o;tinymce.trim(l)}g=i.dom.select(&quot;dd.wp-caption-dd&quot;,a);if(g&amp;&amp;g[0]){p=i.serializer.serialize(g[0]).replace(/^&lt;p&gt;/,&quot;&quot;).replace(/&lt;\/p&gt;$/,&quot;&quot;)}}j.img_cap_text.value=p;j.img_title.value=i.dom.getAttrib(b,&quot;title&quot;);j.img_alt.value=i.dom.getAttrib(b,&quot;alt&quot;);j.border.value=i.dom.getAttrib(b,&quot;border&quot;);j.vspace.value=i.dom.getAttrib(b,&quot;vspace&quot;);j.hspace.value=i.dom.getAttrib(b,&quot;hspace&quot;);j.align.value=i.dom.getAttrib(b,&quot;align&quot;);j.width.value=q.width=i.dom.getAttrib(b,&quot;width&quot;);j.height.value=q.height=i.dom.getAttrib(b,&quot;height&quot;);j.img_classes.value=l;j.img_style.value=i.dom.getAttrib(b,&quot;style&quot;);if(h.getAttrib(b,&quot;hspace&quot;)){q.updateStyle(&quot;hspace&quot;)}if(h.getAttrib(b,&quot;border
 &quot;)){q.updateStyle(&quot;border&quot;)}if(h.getAttrib(b,&quot;vspace&quot;)){q.updateStyle(&quot;vspace&quot;)}if(n=i.dom.getParent(b,&quot;A&quot;)){j.link_href.value=q.current=i.dom.getAttrib(n,&quot;href&quot;);j.link_title.value=i.dom.getAttrib(n,&quot;title&quot;);j.link_rel.value=q.link_rel=i.dom.getAttrib(n,&quot;rel&quot;);j.link_style.value=i.dom.getAttrib(n,&quot;style&quot;);q.target_value=i.dom.getAttrib(n,&quot;target&quot;);j.link_classes.value=i.dom.getAttrib(n,&quot;class&quot;)}j.link_target.checked=(q.target_value&amp;&amp;q.target_value==&quot;_blank&quot;)?&quot;checked&quot;:&quot;&quot;;e=m.substring(m.lastIndexOf(&quot;/&quot;));e=e.replace(/-[0-9]{2,4}x[0-9]{2,4}/,&quot;&quot;);q.link=m.substring(0,m.lastIndexOf(&quot;/&quot;))+e;if(l.indexOf(&quot;alignleft&quot;)!=-1){q.I(&quot;alignleft&quot;).checked=&quot;checked&quot;;k.className=q.align=&quot;alignleft&quot;}else{if(l.indexOf(&quot;aligncenter&quot;)!=-1){q.I(&quot;aligncenter&quot;).checke
 d=&quot;checked&quot;;k.className=q.align=&quot;aligncenter&quot;}else{if(l.indexOf(&quot;alignright&quot;)!=-1){q.I(&quot;alignright&quot;).checked=&quot;checked&quot;;k.className=q.align=&quot;alignright&quot;}else{if(l.indexOf(&quot;alignnone&quot;)!=-1){q.I(&quot;alignnone&quot;).checked=&quot;checked&quot;;k.className=q.align=&quot;alignnone&quot;}}}}if(q.width&amp;&amp;q.preloadImg.width){q.showSizeSet()}document.body.style.display=&quot;&quot;},remove:function(){var a=tinyMCEPopup.editor,c,b;tinyMCEPopup.restoreSelection();b=a.selection.getNode();if(b.nodeName!=&quot;IMG&quot;){return}if((c=a.dom.getParent(b,&quot;div&quot;))&amp;&amp;a.dom.hasClass(c,&quot;mceTemp&quot;)){a.dom.remove(c)}else{if((c=a.dom.getParent(b,&quot;A&quot;))&amp;&amp;c.childNodes.length==1){a.dom.remove(c)}else{a.dom.remove(b)}}a.execCommand(&quot;mceRepaint&quot;);tinyMCEPopup.close();return},update:function(){var m=this,v=document.forms[0],g=tinyMCEPopup.editor,e,y,d=null,n,h,p,r,o=null,k=v.
 img_classes.value,l,q,u=&quot;&quot;,j,i,s,a,B,x=&quot;&quot;,c,z,w;tinyMCEPopup.restoreSelection();e=g.selection.getNode();if(e.nodeName!=&quot;IMG&quot;){return}if(v.img_src.value===&quot;&quot;){m.remove();return}if(v.img_cap_text.value!=&quot;&quot;&amp;&amp;v.width.value!=&quot;&quot;){o=1;k=k.replace(/align[^ &quot;']+\s?/gi,&quot;&quot;)}p=g.dom.getParent(e,&quot;a&quot;);h=g.dom.getParent(e,&quot;p&quot;);n=g.dom.getParent(e,&quot;dl&quot;);r=g.dom.getParent(e,&quot;div&quot;);tinyMCEPopup.execCommand(&quot;mceBeginUndoLevel&quot;);if(v.width.value!=e.width||v.height.value!=e.height){k=k.replace(/size-[^ &quot;']+/,&quot;&quot;)}g.dom.setAttribs(e,{src:v.img_src.value,title:v.img_title.value,alt:v.img_alt.value,width:v.width.value,height:v.height.value,style:v.img_style.value,&quot;class&quot;:k});if(v.link_href.value){if(p==null){if(!v.link_href.value.match(/https?:\/\//i)){v.link_href.value=tinyMCEPopup.editor.documentBaseURI.toAbsolute(v.link_href.value)}g.getDoc(
 ).execCommand(&quot;unlink&quot;,false,null);tinyMCEPopup.execCommand(&quot;mceInsertLink&quot;,false,&quot;#mce_temp_url#&quot;,{skip_undo:1});tinymce.each(g.dom.select(&quot;a&quot;),function(b){if(g.dom.getAttrib(b,&quot;href&quot;)==&quot;#mce_temp_url#&quot;){g.dom.setAttribs(b,{href:v.link_href.value,title:v.link_title.value,rel:v.link_rel.value,target:(v.link_target.checked==true)?&quot;_blank&quot;:&quot;&quot;,&quot;class&quot;:v.link_classes.value,style:v.link_style.value})}})}else{g.dom.setAttribs(p,{href:v.link_href.value,title:v.link_title.value,rel:v.link_rel.value,target:(v.link_target.checked==true)?&quot;_blank&quot;:&quot;&quot;,&quot;class&quot;:v.link_classes.value,style:v.link_style.value})}}if(o){a=10+parseInt(v.width.value);B=(m.align==&quot;aligncenter&quot;)?&quot;mceTemp mceIEcenter&quot;:&quot;mceTemp&quot;;w=v.img_cap_text.value;w=w.replace(/\r\n|\r/g,&quot;\n&quot;).replace(/&lt;[a-zA-Z0-9]+( [^&lt;&gt;]+)?&gt;/g,function(b){return b.replace(/[\r
 \n\t]+/,&quot; &quot;)});w=w.replace(/\s*\n\s*/g,&quot;&lt;br /&gt;&quot;);if(n){g.dom.setAttribs(n,{&quot;class&quot;:&quot;wp-caption &quot;+m.align,style:&quot;width: &quot;+a+&quot;px;&quot;});if(r){g.dom.setAttrib(r,&quot;class&quot;,B)}if((i=g.dom.getParent(e,&quot;dt&quot;))&amp;&amp;(s=i.nextSibling)&amp;&amp;g.dom.hasClass(s,&quot;wp-caption-dd&quot;)){g.dom.setHTML(s,w)}}else{if((q=v.img_classes.value.match(/wp-image-([0-9]{1,6})/))&amp;&amp;q[1]){u=&quot;attachment_&quot;+q[1]}if(v.link_href.value&amp;&amp;(x=g.dom.getParent(e,&quot;a&quot;))){if(x.childNodes.length==1){l=g.dom.getOuterHTML(x)}else{l=g.dom.getOuterHTML(x);l=l.match(/&lt;a [^&gt;]+&gt;/i);l=l+g.dom.getOuterHTML(e)+&quot;&lt;/a&gt;&quot;}}else{l=g.dom.getOuterHTML(e)}l='&lt;dl id=&quot;'+u+'&quot; class=&quot;wp-caption '+m.align+'&quot; style=&quot;width: '+a+'px&quot;&gt;&lt;dt class=&quot;wp-caption-dt&quot;&gt;'+l+'&lt;/dt&gt;&lt;dd class=&quot;wp-caption-dd&quot;&gt;'+w+&quot;&lt;/dd&gt;&lt;/dl
 &gt;&quot;;j=g.dom.create(&quot;div&quot;,{&quot;class&quot;:B},l);if(h){h.parentNode.insertBefore(j,h);if(h.childNodes.length==1){g.dom.remove(h)}else{if(x&amp;&amp;x.childNodes.length==1){g.dom.remove(x)}else{g.dom.remove(e)}}}else{if(c=g.dom.getParent(e,&quot;TD,TH,LI&quot;)){c.appendChild(j);if(x&amp;&amp;x.childNodes.length==1){g.dom.remove(x)}else{g.dom.remove(e)}}}}}else{if(n&amp;&amp;r){if(v.link_href.value&amp;&amp;(z=g.dom.getParent(e,&quot;a&quot;))){l=g.dom.getOuterHTML(z)}else{l=g.dom.getOuterHTML(e)}h=g.dom.create(&quot;p&quot;,{},l);r.parentNode.insertBefore(h,r);g.dom.remove(r)}}if(v.img_classes.value.indexOf(&quot;aligncenter&quot;)!=-1){if(h&amp;&amp;(!h.style||h.style.textAlign!=&quot;center&quot;)){g.dom.setStyle(h,&quot;textAlign&quot;,&quot;center&quot;)}}else{if(h&amp;&amp;h.style&amp;&amp;h.style.textAlign==&quot;center&quot;){g.dom.setStyle(h,&quot;textAlign&quot;,&quot;&quot;)}}if(!v.link_href.value&amp;&amp;p){y=g.selection.getBookmark();g.dom.remo
 ve(p,1);g.selection.moveToBookmark(y)}tinyMCEPopup.execCommand(&quot;mceEndUndoLevel&quot;);g.execCommand(&quot;mceRepaint&quot;);tinyMCEPopup.close()},updateStyle:function(a){var e=tinyMCEPopup.dom,c,d=document.forms[0],b=e.create(&quot;img&quot;,{style:d.img_style.value});if(tinyMCEPopup.editor.settings.inline_styles){if(a==&quot;align&quot;){e.setStyle(b,&quot;float&quot;,&quot;&quot;);e.setStyle(b,&quot;vertical-align&quot;,&quot;&quot;);c=d.align.value;if(c){if(c==&quot;left&quot;||c==&quot;right&quot;){e.setStyle(b,&quot;float&quot;,c)}else{b.style.verticalAlign=c}}}if(a==&quot;border&quot;){e.setStyle(b,&quot;border&quot;,&quot;&quot;);c=d.border.value;if(c||c==&quot;0&quot;){if(c==&quot;0&quot;){b.style.border=&quot;0&quot;}else{b.style.border=c+&quot;px solid black&quot;}}}if(a==&quot;hspace&quot;){e.setStyle(b,&quot;marginLeft&quot;,&quot;&quot;);e.setStyle(b,&quot;marginRight&quot;,&quot;&quot;);c=d.hspace.value;if(c){b.style.marginLeft=c+&quot;px&quot;;b.style.ma
 rginRight=c+&quot;px&quot;}}if(a==&quot;vspace&quot;){e.setStyle(b,&quot;marginTop&quot;,&quot;&quot;);e.setStyle(b,&quot;marginBottom&quot;,&quot;&quot;);c=d.vspace.value;if(c){b.style.marginTop=c+&quot;px&quot;;b.style.marginBottom=c+&quot;px&quot;}}d.img_style.value=e.serializeStyle(e.parseStyle(b.style.cssText));this.demoSetStyle()}},checkVal:function(a){if(a.value==&quot;&quot;){if(a.id==&quot;img_src&quot;){a.value=this.I(&quot;img_demo&quot;).src||this.preloadImg.src}}},resetImageData:function(){var a=document.forms[0];a.width.value=a.height.value=&quot;&quot;},updateImageData:function(){var d=document.forms[0],b=wpImage,a=d.width.value,c=d.height.value;if(!a&amp;&amp;c){a=d.width.value=b.width=Math.round(b.preloadImg.width/(b.preloadImg.height/c))}else{if(a&amp;&amp;!c){c=d.height.value=b.height=Math.round(b.preloadImg.height/(b.preloadImg.width/a))}}if(!a){d.width.value=b.width=b.preloadImg.width}if(!c){d.height.value=b.height=b.preloadImg.height}b.showSizeSet();b.d
 emoSetSize();if(d.img_style.value){b.demoSetStyle()}},getImageData:function(){var a=wpImage,b=document.forms[0];a.preloadImg=new Image();a.preloadImg.onload=a.updateImageData;a.preloadImg.onerror=a.resetImageData;a.preloadImg.src=tinyMCEPopup.editor.documentBaseURI.toAbsolute(b.img_src.value)}};window.onload=function(){wpImage.init()};wpImage.preInit();
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewptinymcejsgz"></a>
<div class="binary"><h4>Modified: trunk/wp-includes/js/tinymce/wp-tinymce.js.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (20680 => 20681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php        2012-05-02 01:41:15 UTC (rev 20680)
+++ trunk/wp-includes/version.php        2012-05-02 01:58:25 UTC (rev 20681)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @global string $wp_version
</span><span class="cx">  */
</span><del>-$wp_version = '3.4-beta3-20678';
</del><ins>+$wp_version = '3.4-beta3-20681';
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @global string $tinymce_version
</span><span class="cx">  */
</span><del>-$tinymce_version = '349-20592';
</del><ins>+$tinymce_version = '349-20681';
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Holds the cache manifest version
</span></span></pre>
</div>
</div>

</body>
</html>