<!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>[22223] trunk: Compress scripts/styles: 3.5-beta1-22223.</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/22223">22223</a></dd>
<dt>Author</dt> <dd>bumpbot</dd>
<dt>Date</dt> <dd>2012-10-12 22:58:48 +0000 (Fri, 12 Oct 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Compress scripts/styles: 3.5-beta1-22223. TinyMCE updated.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsmediauploadminjs">trunk/wp-admin/js/media-upload.min.js</a></li>
<li><a href="#trunkwpincludesjsmceviewminjs">trunk/wp-includes/js/mce-view.min.js</a></li>
<li><a href="#trunkwpincludesjsmediamodelsminjs">trunk/wp-includes/js/media-models.min.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpvieweditor_pluginjs">trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin.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="trunkwpadminjsmediauploadminjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.min.js (22222 => 22223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.min.js        2012-10-12 22:05:02 UTC (rev 22222)
+++ trunk/wp-admin/js/media-upload.min.js        2012-10-12 22:58:48 UTC (rev 22223)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var wpActiveEditor;function send_to_editor(c){var b,a=typeof(tinymce)!=&quot;undefined&quot;,f=typeof(QTags)!=&quot;undefined&quot;;if(!wpActiveEditor){if(a&amp;&amp;tinymce.activeEditor){b=tinymce.activeEditor;wpActiveEditor=b.id}else{if(!f){return false}}}else{if(a){if(tinymce.activeEditor&amp;&amp;(tinymce.activeEditor.id==&quot;mce_fullscreen&quot;||tinymce.activeEditor.id==&quot;wp_mce_fullscreen&quot;)){b=tinymce.activeEditor}else{b=tinymce.get(wpActiveEditor)}}}if(b&amp;&amp;!b.isHidden()){if(tinymce.isIE&amp;&amp;b.windowManager.insertimagebookmark){b.selection.moveToBookmark(b.windowManager.insertimagebookmark)}if(c.indexOf(&quot;[caption&quot;)===0){if(b.wpSetImgCaption){c=b.wpSetImgCaption(c)}}else{if(c.indexOf(&quot;[gallery&quot;)===0){if(b.plugins.wpgallery){c=b.plugins.wpgallery._do_gallery(c)}}else{if(c.indexOf(&quot;[embed&quot;)===0){if(b.plugins.wordpress){c=b.plugins.wordpress._setEmbed(c)}}}}b.execCommand(&quot;mceInsertContent&quot;,false,c)
 }else{if(f){QTags.insertContent(c)}else{document.getElementById(wpActiveEditor).value+=c}}try{tb_remove()}catch(d){}}var tb_position;(function(a){tb_position=function(){var f=a(&quot;#TB_window&quot;),e=a(window).width(),d=a(window).height(),c=(720&lt;e)?720:e,b=0;if(a(&quot;body.admin-bar&quot;).length){b=28}if(f.size()){f.width(c-50).height(d-45-b);a(&quot;#TB_iframeContent&quot;).width(c-50).height(d-75-b);f.css({&quot;margin-left&quot;:&quot;-&quot;+parseInt(((c-50)/2),10)+&quot;px&quot;});if(typeof document.body.style.maxWidth!=&quot;undefined&quot;){f.css({top:20+b+&quot;px&quot;,&quot;margin-top&quot;:&quot;0&quot;})}}return a(&quot;a.thickbox&quot;).each(function(){var g=a(this).attr(&quot;href&quot;);if(!g){return}g=g.replace(/&amp;width=[0-9]+/g,&quot;&quot;);g=g.replace(/&amp;height=[0-9]+/g,&quot;&quot;);a(this).attr(&quot;href&quot;,g+&quot;&amp;width=&quot;+(c-80)+&quot;&amp;height=&quot;+(d-85-b))})};a(window).resize(function(){tb_position()});a(document).read
 y(function(b){b(&quot;a.thickbox&quot;).click(function(){var c;if(typeof(tinymce)!=&quot;undefined&quot;&amp;&amp;tinymce.isIE&amp;&amp;(c=tinymce.get(wpActiveEditor))&amp;&amp;!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}})})})(jQuery);(function(b){var a={};wp.mce.media={insert:send_to_editor,add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{title:wp.media.view.l10n.insertMedia,multiple:true,describe:true}));d.on(&quot;update:insert&quot;,function(f){this.insert(f.map(function(g){if(&quot;image&quot;===g.get(&quot;type&quot;)){return&quot;\n&quot;+wp.media.string.image(g)+&quot;\n&quot;}else{return wp.media.string.link(g)+&quot; &quot;}}).join(&quot;&quot;))},this);d.on(&quot;update:gallery&quot;,function(g){var f=wp.mce.view.get(&quot;gallery&quot;),h;if(!f){return}h=f.gallery.shortcode(g);this.insert(h.string());d.render(&quot;library&quot;)},this);return d},get:function(c){return a[c]},remove:fu
 nction(c){delete a[c]},init:function(){b(&quot;.insert-media&quot;).on(&quot;click&quot;,function(d){var c=b(this).data(&quot;editor&quot;),e;d.preventDefault();if(!c){return}e=wp.mce.media.get(c);if(e){e.open();return}wp.mce.media.add(c)})}};b(wp.mce.media.init)}(jQuery));
</del><span class="cx">\ No newline at end of file
</span><ins>+var wpActiveEditor;function send_to_editor(c){var b,a=typeof(tinymce)!=&quot;undefined&quot;,f=typeof(QTags)!=&quot;undefined&quot;;if(!wpActiveEditor){if(a&amp;&amp;tinymce.activeEditor){b=tinymce.activeEditor;wpActiveEditor=b.id}else{if(!f){return false}}}else{if(a){if(tinymce.activeEditor&amp;&amp;(tinymce.activeEditor.id==&quot;mce_fullscreen&quot;||tinymce.activeEditor.id==&quot;wp_mce_fullscreen&quot;)){b=tinymce.activeEditor}else{b=tinymce.get(wpActiveEditor)}}}if(b&amp;&amp;!b.isHidden()){if(tinymce.isIE&amp;&amp;b.windowManager.insertimagebookmark){b.selection.moveToBookmark(b.windowManager.insertimagebookmark)}if(c.indexOf(&quot;[caption&quot;)===0){if(b.wpSetImgCaption){c=b.wpSetImgCaption(c)}}else{if(c.indexOf(&quot;[gallery&quot;)===0){if(b.plugins.wpgallery){c=b.plugins.wpgallery._do_gallery(c)}}else{if(c.indexOf(&quot;[embed&quot;)===0){if(b.plugins.wordpress){c=b.plugins.wordpress._setEmbed(c)}}}}b.execCommand(&quot;mceInsertContent&quot;,false,c)
 }else{if(f){QTags.insertContent(c)}else{document.getElementById(wpActiveEditor).value+=c}}try{tb_remove()}catch(d){}}var tb_position;(function(a){tb_position=function(){var f=a(&quot;#TB_window&quot;),e=a(window).width(),d=a(window).height(),c=(720&lt;e)?720:e,b=0;if(a(&quot;body.admin-bar&quot;).length){b=28}if(f.size()){f.width(c-50).height(d-45-b);a(&quot;#TB_iframeContent&quot;).width(c-50).height(d-75-b);f.css({&quot;margin-left&quot;:&quot;-&quot;+parseInt(((c-50)/2),10)+&quot;px&quot;});if(typeof document.body.style.maxWidth!=&quot;undefined&quot;){f.css({top:20+b+&quot;px&quot;,&quot;margin-top&quot;:&quot;0&quot;})}}return a(&quot;a.thickbox&quot;).each(function(){var g=a(this).attr(&quot;href&quot;);if(!g){return}g=g.replace(/&amp;width=[0-9]+/g,&quot;&quot;);g=g.replace(/&amp;height=[0-9]+/g,&quot;&quot;);a(this).attr(&quot;href&quot;,g+&quot;&amp;width=&quot;+(c-80)+&quot;&amp;height=&quot;+(d-85-b))})};a(window).resize(function(){tb_position()});a(document).read
 y(function(b){b(&quot;a.thickbox&quot;).click(function(){var c;if(typeof(tinymce)!=&quot;undefined&quot;&amp;&amp;tinymce.isIE&amp;&amp;(c=tinymce.get(wpActiveEditor))&amp;&amp;!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}})})})(jQuery);(function(b){var a={};wp.mce.media={insert:send_to_editor,add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{title:wp.media.view.l10n.insertMedia,multiple:true,describe:true}));d.on(&quot;update:insert&quot;,function(f){this.insert(f.map(function(g){if(&quot;image&quot;===g.get(&quot;type&quot;)){return wp.media.string.image(g)+&quot; &quot;}else{return wp.media.string.link(g)+&quot; &quot;}}).join(&quot;&quot;))},this);d.on(&quot;update:gallery&quot;,function(g){var f=wp.mce.view.get(&quot;gallery&quot;),h;if(!f){return}h=f.gallery.shortcode(g);this.insert(h.string());d.render(&quot;library&quot;)},this);return d},get:function(c){return a[c]},remove:function(c){delet
 e a[c]},init:function(){b(&quot;.insert-media&quot;).on(&quot;click&quot;,function(d){var c=b(this).data(&quot;editor&quot;),e;d.preventDefault();if(!c){return}e=wp.mce.media.get(c);if(e){e.open();return}wp.mce.media.add(c)})}};b(wp.mce.media.init)}(jQuery));
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsmceviewminjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.min.js (22222 => 22223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.min.js        2012-10-12 22:05:02 UTC (rev 22222)
+++ trunk/wp-includes/js/mce-view.min.js        2012-10-12 22:58:48 UTC (rev 22223)
</span><span class="lines">@@ -1 +1 @@
</span><del>-window.wp=window.wp||{};(function(){wp.html=_.extend(wp.html||{},{attrs:function(c){var a,b;if(&quot;/&quot;===c[c.length-1]){c=c.slice(0,-1)}a=wp.shortcode.attrs(c);b=a.named;_.each(a.numeric,function(d){if(/\s/.test(d)){return}b[d]=&quot;&quot;});return b},string:function(a){var c=&quot;&lt;&quot;+a.tag,b=a.content||&quot;&quot;;_.each(a.attrs,function(e,d){c+=&quot; &quot;+d;if(&quot;&quot;===e){return}if(_.isBoolean(e)){e=e?&quot;true&quot;:&quot;false&quot;}c+='=&quot;'+e+'&quot;'});if(a.single){return c+&quot; /&gt;&quot;}c+=&quot;&gt;&quot;;c+=_.isObject(b)?wp.html.string(b):b;return c+&quot;&lt;/&quot;+a.tag+&quot;&gt;&quot;}})}());(function(b){var a={},c={};wp.mce=wp.mce||{};wp.mce.view={defaults:{pattern:{view:Backbone.View,text:function(d){return d.options.original},toView:function(e){if(!this.pattern){return}this.pattern.lastIndex=0;var d=this.pattern.exec(e);if(!d){return}return{index:d.index,content:d[0],options:{original:d[0],results:d}}}},shortcod
 e:{view:Backbone.View,text:function(d){return d.options.shortcode.string()},toView:function(e){var d=wp.shortcode.next(this.shortcode,e);if(!d){return}return{index:d.index,content:d.content,options:{shortcode:d.shortcode}}}}},add:function(i,e){var g,d,h,f;if(e.extend){g=wp.mce.view.get(e.extend)}else{if(e.shortcode){g=wp.mce.view.defaults.shortcode}else{g=wp.mce.view.defaults.pattern}}_.defaults(e,g);e.id=i;f={remove:function(){delete c[this.el.id];this.$el.parent().remove();if(d){d.apply(this,arguments)}return this}};if(_.isFunction(e.view)){h=e.view}else{h=g.view;d=e.view.remove;_.defaults(f,e.view)}if(!d&amp;&amp;!h._mceview){d=h.prototype.remove}e.view=h.extend(f,{_mceview:true});a[i]=e},get:function(d){return a[d]},remove:function(d){delete a[d]},toViews:function(e){var d=[{content:e}],f;_.each(a,function(h,g){f=d.slice();d=[];_.each(f,function(k){var j=k.content,i;if(k.processed){d.push(k);return}while(j&amp;&amp;(i=h.toView(j))){if(i.index){d.push({content:j.substring
 (0,i.index)})}d.push({content:wp.mce.view.toView(g,i.options),processed:true});j=j.slice(i.index+i.content.length)}if(j){d.push({content:j})}})});return _.pluck(d,&quot;content&quot;).join(&quot;&quot;)},toView:function(f,h){var g=wp.mce.view.get(f),e,i,d;if(!g){return&quot;&quot;}e=new g.view(_.extend(h||{},{viewType:f}));i=e.el.id=e.el.id||_.uniqueId(&quot;__wpmce-&quot;);c[i]=e;d=&quot;span&quot;===e.tagName?&quot;span&quot;:&quot;div&quot;;return&quot;&lt;&quot;+d+' class=&quot;wp-view-wrap&quot; data-wp-view=&quot;'+i+'&quot; contenteditable=&quot;false&quot;&gt;&lt;/'+d+&quot;&gt;&quot;},render:function(d){b(&quot;.wp-view-wrap&quot;,d).each(function(){var g=b(this),f=g.data(&quot;wp-view&quot;),e=c[f];if(!e){return}e.render();e.$el.detach();g.empty().append(e.el).append('&lt;span data-wp-view-end class=&quot;wp-view-end&quot;&gt;&lt;/span&gt;')})},toText:function(d){return d.replace(/&lt;(?:div|span)[^&gt;]+data-wp-view=&quot;([^&quot;]+)&quot;[^&gt;]*&gt;.*?&lt;span[
 ^&gt;]+data-wp-view-end[^&gt;]*&gt;&lt;\/span&gt;&lt;\/(?:div|span)&gt;/g,function(g,h){var e=c[h],f;if(e){f=wp.mce.view.get(e.options.viewType)}return e&amp;&amp;f?f.text(e):&quot;&quot;})},removeInternalAttrs:function(e){var d={};_.each(e,function(g,f){if(-1===f.indexOf(&quot;data-mce&quot;)){d[f]=g}});return d},attrs:function(d){return wp.mce.view.removeInternalAttrs(wp.html.attrs(d))},l10n:_.isUndefined(_wpMceViewL10n)?{}:_wpMceViewL10n}}(jQuery));(function(b){var a=wp.mce.view;wp.media.string={};wp.media.string.link=function(e){var d=getUserSetting(&quot;urlbutton&quot;,&quot;post&quot;),c={tag:&quot;a&quot;,content:e.get(&quot;title&quot;)||e.get(&quot;filename&quot;),attrs:{rel:&quot;attachment wp-att-&quot;+e.id}};c.attrs.href=(d===&quot;file&quot;)?e.get(&quot;url&quot;):e.get(&quot;link&quot;);return wp.html.string(c)};wp.media.string.image=function(h,g){var f,c,d,e;h=h.toJSON();g=_.defaults(g||{},{img:{},align:getUserSetting(&quot;align&quot;,&quot;none&quot;),siz
 e:getUserSetting(&quot;imgsize&quot;,&quot;medium&quot;),link:getUserSetting(&quot;urlbutton&quot;,&quot;post&quot;)});c=_.clone(g.img);f=c[&quot;class&quot;]?c[&quot;class&quot;].split(/\s+/):[];e=h.sizes?h.sizes[g.size]:{};if(!e){delete g.size;e=h}c.width=e.width;c.height=e.height;c.src=e.url;if(g.align){f.push(&quot;align&quot;+g.align)}if(g.size){f.push(&quot;size-&quot;+g.size)}f.push(&quot;wp-image-&quot;+h.id);c[&quot;class&quot;]=_.compact(f).join(&quot; &quot;);d={tag:&quot;img&quot;,attrs:c,single:true};if(g.anchor){d={tag:&quot;a&quot;,attrs:g.anchor,content:d}}return wp.html.string(d)};a.add(&quot;attachment&quot;,{pattern:new RegExp(&quot;(?:&lt;a([^&gt;]*)&gt;)?&lt;img([^&gt;]*class=(?:\&quot;[^\&quot;]*|'[^']*)\\bwp-image-(\\d+)[^&gt;]*)&gt;(?:&lt;/a&gt;)?&quot;),text:function(c){var d=_.pick(c,&quot;align&quot;,&quot;size&quot;,&quot;link&quot;,&quot;img&quot;,&quot;anchor&quot;);return wp.media.string.image(c.model,d)},view:{className:&quot;editor-attachment
 &quot;,template:media.template(&quot;editor-attachment&quot;),events:{&quot;click .close&quot;:&quot;remove&quot;},initialize:function(){var c=this,d=this.options.results,f=d[3],e;this.model=wp.media.model.Attachment.get(f);if(d[1]){this.anchor=a.attrs(d[1])}this.img=a.attrs(d[2]);e=this.img[&quot;class&quot;];e=e.replace(/(?:^|\s)wp-image-\d+/,&quot;&quot;);e=e.replace(/(?:^|\s)size-(\S+)/,function(g,h){c.size=h;return&quot;&quot;});e=e.replace(/(?:^|\s)align(left|center|right|none)(?:\s|$)/,function(g,h){c.align=h;return&quot;&quot;});this.img[&quot;class&quot;]=e;this.$el.addClass(&quot;spinner&quot;);this.model.fetch().done(_.bind(this.render,this))},render:function(){var d=this.model.toJSON(),c;if(!d.url){return}c={url:&quot;image&quot;===d.type?d.url:d.icon,uploading:d.uploading};_.extend(c,wp.media.fit({width:d.width,height:d.height,maxWidth:a.l10n.contentWidth}));if(this.size&amp;&amp;d.sizes&amp;&amp;d.sizes[this.size]){_.extend(c,_.pick(d.sizes[this.size],&quot;url
 &quot;,&quot;width&quot;,&quot;height&quot;))}this.$el.html(this.template(c))}}});a.add(&quot;gallery&quot;,{shortcode:&quot;gallery&quot;,gallery:(function(){var c={};return{attachments:function(h,g){var i=h.string(),d=c[i],f,e;delete c[i];if(d){return d}f=h.attrs.named;e=_.pick(f,&quot;orderby&quot;,&quot;order&quot;);e.type=&quot;image&quot;;e.perPage=-1;if(f.ids){e.post__in=f.ids.split(&quot;,&quot;);e.orderby=&quot;post__in&quot;}else{if(f.include){e.post__in=f.include.split(&quot;,&quot;)}}if(f.exclude){e.post__not_in=f.exclude.split(&quot;,&quot;)}if(!e.post__in){e.parent=f.id||g}return media.query(e)},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,&quot;include&quot;,&quot;exclude&quot;,&quot;orderby&quot;,&quot;order&quot;),g;e.ids=d.pluck(&quot;id&quot;);g=new wp.shortcode({tag:&quot;gallery&quot;,attrs:e,type:&quot;single&quot;});c[g.string()]=new wp.media.model.Attachments(d.models,{props:f});return g}}}()),view:{className:&quot;editor-gallery&quot;,temp
 late:media.template(&quot;editor-gallery&quot;),parent:b(&quot;#post_ID&quot;).val(),events:{&quot;click .close&quot;:&quot;remove&quot;,&quot;click .edit&quot;:&quot;edit&quot;},initialize:function(){this.update()},update:function(){var c=a.get(&quot;gallery&quot;);this.attachments=c.gallery.attachments(this.options.shortcode,this.parent);this.attachments.more().done(_.bind(this.render,this))},render:function(){var c,e,d;if(!this.attachments.length){return}e=this.attachments.first().toJSON();d=e.sizes&amp;&amp;e.sizes.thumbnail?e.sizes.thumbnail:e;c={url:d.url,orientation:d.orientation,count:this.attachments.length};this.$el.html(this.template(c))},edit:function(){if(!wp.media.view||this.workflow){return}this.workflow=wp.media({view:&quot;gallery&quot;,selection:this.attachments.models,title:a.l10n.editGallery,editing:true,multiple:true,describe:true});this.workflow.on(&quot;close&quot;,function(){this.workflow.detach();delete this.workflow},this);this.workflow.on(&quot;upd
 ate:gallery&quot;,function(d){var c=a.get(&quot;gallery&quot;);this.options.shortcode=c.gallery.shortcode(d);this.update()},this)}}})}(jQuery));
</del><span class="cx">\ No newline at end of file
</span><ins>+window.wp=window.wp||{};(function(){wp.html=_.extend(wp.html||{},{attrs:function(c){var a,b;if(&quot;/&quot;===c[c.length-1]){c=c.slice(0,-1)}a=wp.shortcode.attrs(c);b=a.named;_.each(a.numeric,function(d){if(/\s/.test(d)){return}b[d]=&quot;&quot;});return b},string:function(a){var c=&quot;&lt;&quot;+a.tag,b=a.content||&quot;&quot;;_.each(a.attrs,function(e,d){c+=&quot; &quot;+d;if(&quot;&quot;===e){return}if(_.isBoolean(e)){e=e?&quot;true&quot;:&quot;false&quot;}c+='=&quot;'+e+'&quot;'});if(a.single){return c+&quot; /&gt;&quot;}c+=&quot;&gt;&quot;;c+=_.isObject(b)?wp.html.string(b):b;return c+&quot;&lt;/&quot;+a.tag+&quot;&gt;&quot;}})}());(function(b){var a={},c={};wp.mce=wp.mce||{};wp.mce.view={defaults:{pattern:{view:Backbone.View,text:function(d){return d.options.original},toView:function(e){if(!this.pattern){return}this.pattern.lastIndex=0;var d=this.pattern.exec(e);if(!d){return}return{index:d.index,content:d[0],options:{original:d[0],results:d}}}},shortcod
 e:{view:Backbone.View,text:function(d){return d.options.shortcode.string()},toView:function(e){var d=wp.shortcode.next(this.shortcode,e);if(!d){return}return{index:d.index,content:d.content,options:{shortcode:d.shortcode}}}}},add:function(i,e){var g,d,h,f;if(e.extend){g=wp.mce.view.get(e.extend)}else{if(e.shortcode){g=wp.mce.view.defaults.shortcode}else{g=wp.mce.view.defaults.pattern}}_.defaults(e,g);e.id=i;f={remove:function(){delete c[this.el.id];this.$el.parent().remove();if(d){d.apply(this,arguments)}return this}};if(_.isFunction(e.view)){h=e.view}else{h=g.view;d=e.view.remove;_.defaults(f,e.view)}if(!d&amp;&amp;!h._mceview){d=h.prototype.remove}e.view=h.extend(f,{_mceview:true});a[i]=e},get:function(d){return a[d]},remove:function(d){delete a[d]},toViews:function(e){var d=[{content:e}],f;_.each(a,function(h,g){f=d.slice();d=[];_.each(f,function(k){var j=k.content,i;if(k.processed){d.push(k);return}while(j&amp;&amp;(i=h.toView(j))){if(i.index){d.push({content:j.substring
 (0,i.index)})}d.push({content:wp.mce.view.toView(g,i.options),processed:true});j=j.slice(i.index+i.content.length)}if(j){d.push({content:j})}})});return _.pluck(d,&quot;content&quot;).join(&quot;&quot;)},toView:function(e,g){var f=wp.mce.view.get(e),d,h;if(!f){return&quot;&quot;}d=new f.view(_.extend(g||{},{viewType:e}));h=d.el.id=d.el.id||_.uniqueId(&quot;__wpmce-&quot;);c[h]=d;d.$wrapper=b();return wp.html.string({tag:&quot;span&quot;===d.tagName?&quot;span&quot;:&quot;div&quot;,attrs:{&quot;class&quot;:&quot;wp-view-wrap wp-view-type-&quot;+e,&quot;data-wp-view&quot;:h,contenteditable:false}})},render:function(d){b(&quot;.wp-view-wrap&quot;,d).each(function(){var f=b(this),e=wp.mce.view.instance(this);if(!e){return}e.$wrapper=f;e.render();e.$el.detach();f.empty().append(e.el).append('&lt;span data-wp-view-end class=&quot;wp-view-end&quot;&gt;&lt;/span&gt;')})},toText:function(d){return d.replace(/&lt;(?:div|span)[^&gt;]+data-wp-view=&quot;([^&quot;]+)&quot;[^&gt;]*&gt;.*?
 &lt;span[^&gt;]+data-wp-view-end[^&gt;]*&gt;&lt;\/span&gt;&lt;\/(?:div|span)&gt;/g,function(g,h){var e=c[h],f;if(e){f=wp.mce.view.get(e.options.viewType)}return e&amp;&amp;f?f.text(e):&quot;&quot;})},removeInternalAttrs:function(e){var d={};_.each(e,function(g,f){if(-1===f.indexOf(&quot;data-mce&quot;)){d[f]=g}});return d},attrs:function(d){return wp.mce.view.removeInternalAttrs(wp.html.attrs(d))},instance:function(d){var e=b(d).data(&quot;wp-view&quot;);if(e){return c[e]}},select:function(e){var d=b(e);if(d.hasClass(&quot;selected&quot;)){return}d.addClass(&quot;selected&quot;);b(e.firstChild).trigger(&quot;select&quot;)},deselect:function(e){var d=b(e);if(!d.hasClass(&quot;selected&quot;)){return}d.removeClass(&quot;selected&quot;);b(e.firstChild).trigger(&quot;deselect&quot;)},l10n:_.isUndefined(_wpMceViewL10n)?{}:_wpMceViewL10n}}(jQuery));(function(b){var a=wp.mce.view;wp.media.string={};wp.media.string.link=function(e){var d=getUserSetting(&quot;urlbutton&quot;,&quot;po
 st&quot;),c={tag:&quot;a&quot;,content:e.get(&quot;title&quot;)||e.get(&quot;filename&quot;),attrs:{rel:&quot;attachment wp-att-&quot;+e.id}};c.attrs.href=(d===&quot;file&quot;)?e.get(&quot;url&quot;):e.get(&quot;link&quot;);return wp.html.string(c)};wp.media.string.image=function(h,g){var f,c,d,e;h=h.toJSON();g=_.defaults(g||{},{img:{},align:getUserSetting(&quot;align&quot;,&quot;none&quot;),size:getUserSetting(&quot;imgsize&quot;,&quot;medium&quot;),link:getUserSetting(&quot;urlbutton&quot;,&quot;post&quot;)});c=_.clone(g.img);f=c[&quot;class&quot;]?c[&quot;class&quot;].split(/\s+/):[];e=h.sizes?h.sizes[g.size]:{};if(!e){delete g.size;e=h}c.width=e.width;c.height=e.height;c.src=e.url;if(g.align){f.push(&quot;align&quot;+g.align)}if(g.size){f.push(&quot;size-&quot;+g.size)}f.push(&quot;wp-image-&quot;+h.id);c[&quot;class&quot;]=_.compact(f).join(&quot; &quot;);d={tag:&quot;img&quot;,attrs:c,single:true};if(g.anchor){d={tag:&quot;a&quot;,attrs:g.anchor,content:d}}return wp.h
 tml.string(d)};a.add(&quot;attachment&quot;,{pattern:new RegExp(&quot;(?:&lt;a([^&gt;]*)&gt;)?&lt;img([^&gt;]*class=(?:\&quot;[^\&quot;]*|'[^']*)\\bwp-image-(\\d+)[^&gt;]*)&gt;(?:&lt;/a&gt;)?&quot;),text:function(c){var d=_.pick(c,&quot;align&quot;,&quot;size&quot;,&quot;link&quot;,&quot;img&quot;,&quot;anchor&quot;);return wp.media.string.image(c.model,d)},view:{className:&quot;editor-attachment&quot;,template:media.template(&quot;editor-attachment&quot;),events:{&quot;click .close&quot;:&quot;remove&quot;},initialize:function(){var c=this,d=this.options.results,f=d[3],e;this.model=wp.media.model.Attachment.get(f);if(d[1]){this.anchor=a.attrs(d[1])}this.img=a.attrs(d[2]);e=this.img[&quot;class&quot;];e=e.replace(/(?:^|\s)wp-image-\d+/,&quot;&quot;);e=e.replace(/(?:^|\s)size-(\S+)/,function(g,h){c.size=h;return&quot;&quot;});e=e.replace(/(?:^|\s)align(left|center|right|none)(?:\s|$)/,function(g,h){c.align=h;return&quot;&quot;});this.img[&quot;class&quot;]=e;this.$el.addClass
 (&quot;spinner&quot;);this.model.fetch().done(_.bind(this.render,this))},render:function(){var d=this.model.toJSON(),c;if(!d.url){return}if(this.align){this.$wrapper.addClass(&quot;align&quot;+this.align)}c={url:&quot;image&quot;===d.type?d.url:d.icon,uploading:d.uploading};_.extend(c,wp.media.fit({width:d.width,height:d.height,maxWidth:a.l10n.contentWidth}));if(this.size&amp;&amp;d.sizes&amp;&amp;d.sizes[this.size]){_.extend(c,_.pick(d.sizes[this.size],&quot;url&quot;,&quot;width&quot;,&quot;height&quot;))}this.$el.html(this.template(c))}}});a.add(&quot;gallery&quot;,{shortcode:&quot;gallery&quot;,gallery:(function(){var c={};return{attachments:function(h,g){var i=h.string(),d=c[i],f,e;delete c[i];if(d){return d}f=h.attrs.named;e=_.pick(f,&quot;orderby&quot;,&quot;order&quot;);e.type=&quot;image&quot;;e.perPage=-1;if(f.ids){e.post__in=f.ids.split(&quot;,&quot;);e.orderby=&quot;post__in&quot;}else{if(f.include){e.post__in=f.include.split(&quot;,&quot;)}}if(f.exclude){e.post_
 _not_in=f.exclude.split(&quot;,&quot;)}if(!e.post__in){e.parent=f.id||g}return media.query(e)},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,&quot;include&quot;,&quot;exclude&quot;,&quot;orderby&quot;,&quot;order&quot;),g;e.ids=d.pluck(&quot;id&quot;);g=new wp.shortcode({tag:&quot;gallery&quot;,attrs:e,type:&quot;single&quot;});c[g.string()]=new wp.media.model.Attachments(d.models,{props:f});return g}}}()),view:{className:&quot;editor-gallery&quot;,template:media.template(&quot;editor-gallery&quot;),parent:b(&quot;#post_ID&quot;).val(),events:{&quot;click .close&quot;:&quot;remove&quot;,&quot;click .edit&quot;:&quot;edit&quot;},initialize:function(){this.update()},update:function(){var c=a.get(&quot;gallery&quot;);this.attachments=c.gallery.attachments(this.options.shortcode,this.parent);this.attachments.more().done(_.bind(this.render,this))},render:function(){var c,e,d;if(!this.attachments.length){return}e=this.attachments.first().toJSON();d=e.sizes&amp;&amp;e.siz
 es.thumbnail?e.sizes.thumbnail:e;c={url:d.url,orientation:d.orientation,count:this.attachments.length};this.$el.html(this.template(c))},edit:function(){if(!wp.media.view||this.workflow){return}this.workflow=wp.media({view:&quot;gallery&quot;,selection:this.attachments.models,title:a.l10n.editGallery,editing:true,multiple:true,describe:true});this.workflow.on(&quot;close&quot;,function(){this.workflow.detach();delete this.workflow},this);this.workflow.on(&quot;update:gallery&quot;,function(d){var c=a.get(&quot;gallery&quot;);this.options.shortcode=c.gallery.shortcode(d);this.update()},this)}}})}(jQuery));
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsmediamodelsminjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.min.js (22222 => 22223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.min.js        2012-10-12 22:05:02 UTC (rev 22222)
+++ trunk/wp-includes/js/media-models.min.js        2012-10-12 22:58:48 UTC (rev 22223)
</span><span class="lines">@@ -1 +1 @@
</span><del>-window.wp=window.wp||{};(function(e){var c,b,a,d;media=wp.media=function(f){if(media.controller.Workflow){return new media.controller.Workflow(f).attach().render()}};_.extend(media,{model:{},view:{},controller:{}});d=function(g,f,h,i){if(_.isEqual(g,f)){return h===i?0:(h&gt;i?-1:1)}else{return g&gt;f?-1:1}};_.extend(media,{template:_.memoize(function(g){var f;return function(h){f=f||_.template(e(&quot;#tmpl-&quot;+g).html());return f(h)}}),post:function(g,f){return media.ajax({data:_.isObject(g)?g:_.extend(f||{},{action:g})})},ajax:function(g,f){if(_.isObject(g)){f=g}else{f=f||{};f.data=_.extend(f.data||{},{action:g})}f=_.defaults(f||{},{type:&quot;POST&quot;,url:ajaxurl,context:this});return e.Deferred(function(h){if(f.success){h.done(f.success)}if(f.error){h.fail(f.error)}delete f.success;delete f.error;e.ajax(f).done(function(i){if(_.isObject(i)&amp;&amp;!_.isUndefined(i.success)){h[i.success?&quot;resolveWith&quot;:&quot;rejectWith&quot;](this,[i.data])}else{
 h.rejectWith(this,[i])}}).fail(function(){h.rejectWith(this,arguments)})}).promise()},fit:function(j){var g=j.width,f=j.height,i=j.maxWidth,h=j.maxHeight,k;if(!_.isUndefined(i)&amp;&amp;!_.isUndefined(h)){k=(g/f&gt;i/h)?&quot;width&quot;:&quot;height&quot;}else{if(_.isUndefined(h)){k=&quot;width&quot;}else{if(_.isUndefined(i)&amp;&amp;f&gt;h){k=&quot;height&quot;}}}if(&quot;width&quot;===k&amp;&amp;g&gt;i){return{width:i,height:Math.round(i*f/g)}}else{if(&quot;height&quot;===k&amp;&amp;f&gt;h){return{width:Math.round(h*g/f),height:h}}else{return{width:g,height:f}}}}});c=media.model.Attachment=Backbone.Model.extend({sync:function(h,g,f){if(&quot;read&quot;===h){f=f||{};f.context=this;f.data=_.extend(f.data||{},{action:&quot;get-attachment&quot;,id:this.id});return media.ajax(f)}else{if(&quot;update&quot;===h){f=f||{};f.context=this;f.data=_.extend(f.data||{},{action:&quot;save-attachment&quot;,id:this.id});if(f.changes){_.each(f.changes,function(j,i){f.changes[i]=this.get(i)}
 ,this);f.data.changes=f.changes;delete f.changes}return media.ajax(f)}}},parse:function(g,f){if(!g){return g}g.date=new Date(g.date);g.modified=new Date(g.modified);return g}},{create:function(f){return b.all.push(f)},get:_.memoize(function(g,f){return b.all.push(f||{id:g})})});b=media.model.Attachments=Backbone.Collection.extend({model:c,initialize:function(g,f){f=f||{};this.props=new Backbone.Model();this.filters=f.filters||{};this.props.on(&quot;change:order&quot;,this._changeOrder,this);this.props.on(&quot;change:orderby&quot;,this._changeOrderby,this);this.props.on(&quot;change:query&quot;,this._changeQuery,this);this.props.on(&quot;change:search&quot;,this._changeSearch,this);this.props.on(&quot;change:type&quot;,this._changeType,this);this.props.set(_.defaults(f.props||{}));if(f.observe){this.observe(f.observe)}},_changeOrder:function(g,f){if(this.comparator){this.sort()}},_changeOrderby:function(f,g){if(this.comparator&amp;&amp;this.comparator!==b.comparator){return}
 if(g&amp;&amp;&quot;post__in&quot;!==g){this.comparator=b.comparator}else{delete this.comparator}},_changeQuery:function(f,g){if(g){this.props.on(&quot;change&quot;,this._requery,this);this._requery()}else{this.props.off(&quot;change&quot;,this._requery,this)}},_changeFilteredProp:function(h,f,g){if(this.props.get(h)===g){return}if(g&amp;&amp;!this.filters[h]){this.filters[h]=b.filters[h]}else{if(!g&amp;&amp;this.filters[h]===b.filters[h]){delete this.filters[h]}}if(!this.props.get(&quot;source&quot;)){this.props.set(&quot;source&quot;,new b(this.models))}this.reset(this.props.get(&quot;source&quot;).filter(this.validator))},_changeSearch:function(f,g){return this._changeFilteredProp(&quot;search&quot;,f,g)},_changeType:function(f,g){return this._changeFilteredProp(&quot;type&quot;,f,g)},validator:function(f){return _.all(this.filters,function(h,g){return !!h.call(this,f)},this)},validate:function(g,f){return this[this.validator(g)?&quot;add&quot;:&quot;remove&quot;](g,f)},o
 bserve:function(f){f.on(&quot;add change&quot;,this.validate,this)},unobserve:function(f){f.off(&quot;add change&quot;,this.validate,this)},mirror:function(f){if(this.mirroring&amp;&amp;this.mirroring===f){return}this.unmirror();this.mirroring=f;this.reset(f.models);f.on(&quot;add&quot;,this._mirrorAdd,this);f.on(&quot;remove&quot;,this._mirrorRemove,this);f.on(&quot;reset&quot;,this._mirrorReset,this)},unmirror:function(){if(!this.mirroring){return}this.mirroring.off(&quot;add&quot;,this._mirrorAdd,this);this.mirroring.off(&quot;remove&quot;,this._mirrorRemove,this);this.mirroring.off(&quot;reset&quot;,this._mirrorReset,this);delete this.mirroring},_mirrorAdd:function(h,f,g){this.add(h,{at:g.index})},_mirrorRemove:function(f){this.remove(f)},_mirrorReset:function(f){this.reset(f.models)},more:function(f){if(this.mirroring&amp;&amp;this.mirroring.more){return this.mirroring.more(f)}return e.Deferred().resolve().promise()},parse:function(g,f){return _.map(g,function(h){var i=
 c.get(h.id);return i.set(i.parse(h,f))})},_requery:function(){if(this.props.get(&quot;query&quot;)){this.mirror(a.get(this.props.toJSON()))}}},{comparator:function(h,g){var i=this.props.get(&quot;orderby&quot;),f=this.props.get(&quot;order&quot;)||&quot;DESC&quot;,j=h.cid,k=g.cid;h=h.get(i);g=g.get(i);if(&quot;date&quot;===i||&quot;modified&quot;===i){h=h||new Date();g=g||new Date()}return(&quot;DESC&quot;===f)?d(h,g,j,k):d(g,h,k,j)},filters:{search:function(f){if(!this.props.get(&quot;search&quot;)){return true}return _.any([&quot;title&quot;,&quot;filename&quot;,&quot;description&quot;,&quot;caption&quot;,&quot;name&quot;],function(g){var h=f.get(g);return h&amp;&amp;-1!==h.search(this.props.get(&quot;search&quot;))},this)},type:function(g){var f=this.props.get(&quot;type&quot;);if(!f){return true}return -1!==f.indexOf(g.get(&quot;type&quot;))}}});b.all=new b();media.query=function(f){return new b(null,{props:_.extend(_.defaults(f||{},{orderby:&quot;date&quot;}),{query:tru
 e})})};a=media.model.Query=b.extend({initialize:function(h,f){var g;f=f||{};b.prototype.initialize.apply(this,arguments);this.args=f.args;this.hasMore=true;this.created=new Date();this.filters.order=function(i){if(!this.comparator){return true}if(this.length){return 1!==this.comparator(i,this.last())}else{if(&quot;DESC&quot;===this.args.order&amp;&amp;(&quot;date&quot;===this.args.orderby||&quot;modified&quot;===this.args.orderby)){return i.get(this.args.orderby)&gt;=this.created}}return false};g=[&quot;s&quot;,&quot;order&quot;,&quot;orderby&quot;,&quot;posts_per_page&quot;,&quot;post_mime_type&quot;];if(_(this.args).chain().keys().difference(g).isEmpty().value()){this.observe(b.all)}},more:function(f){var g=this;if(!this.hasMore){return e.Deferred().resolve().promise()}f=f||{};f.add=true;return this.fetch(f).done(function(h){if(_.isEmpty(h)||-1===this.args.posts_per_page||h.length&lt;this.args.posts_per_page){g.hasMore=false}})},sync:function(i,g,f){var h;if(&quot;read&quo
 t;===i){f=f||{};f.context=this;f.data=_.extend(f.data||{},{action:&quot;query-attachments&quot;});args=_.clone(this.args);if(-1!==args.posts_per_page){args.paged=Math.floor(this.length/args.posts_per_page)+1}f.data.query=args;return media.ajax(f)}else{h=b.prototype.sync?b.prototype:Backbone;return h.sync.apply(this,arguments)}}},{defaultProps:{orderby:&quot;date&quot;,order:&quot;DESC&quot;},defaultArgs:{posts_per_page:40},orderby:{allowed:[&quot;name&quot;,&quot;author&quot;,&quot;date&quot;,&quot;title&quot;,&quot;modified&quot;,&quot;uploadedTo&quot;,&quot;id&quot;,&quot;post__in&quot;],valuemap:{id:&quot;ID&quot;,uploadedTo:&quot;parent&quot;}},propmap:{search:&quot;s&quot;,type:&quot;post_mime_type&quot;,parent:&quot;post_parent&quot;,perPage:&quot;posts_per_page&quot;},get:(function(){var f=[];return function(i,h){var g={},k=a.orderby,l=a.defaultProps,j;delete i.query;_.defaults(i,l);i.order=i.order.toUpperCase();if(&quot;DESC&quot;!==i.order&amp;&amp;&quot;ASC&quot;!=
 =i.order){i.order=l.order.toUpperCase()}if(!_.contains(k.allowed,i.orderby)){i.orderby=l.orderby}_.each(i,function(m,n){g[a.propmap[n]||n]=m});_.defaults(g,a.defaultArgs);g.orderby=k.valuemap[i.orderby]||i.orderby;j=_.find(f,function(m){return _.isEqual(m.args,g)});if(!j){j=new a([],_.extend(h||{},{props:i,args:g}));f.push(j)}return j}}())})}(jQuery));
</del><span class="cx">\ No newline at end of file
</span><ins>+window.wp=window.wp||{};(function(f){var d,c,a,e,b;media=wp.media=function(g){if(media.controller.Workflow){return new media.controller.Workflow(g).attach().render()}};_.extend(media,{model:{},view:{},controller:{}});b=media.model.l10n=_.isUndefined(_wpMediaModelsL10n)?{}:_wpMediaModelsL10n;e=function(h,g,i,j){if(_.isEqual(h,g)){return i===j?0:(i&gt;j?-1:1)}else{return h&gt;g?-1:1}};_.extend(media,{template:_.memoize(function(h){var g;return function(i){g=g||_.template(f(&quot;#tmpl-&quot;+h).html());return g(i)}}),post:function(h,g){return media.ajax({data:_.isObject(h)?h:_.extend(g||{},{action:h})})},ajax:function(h,g){if(_.isObject(h)){g=h}else{g=g||{};g.data=_.extend(g.data||{},{action:h})}g=_.defaults(g||{},{type:&quot;POST&quot;,url:ajaxurl,context:this});return f.Deferred(function(i){if(g.success){i.done(g.success)}if(g.error){i.fail(g.error)}delete g.success;delete g.error;f.ajax(g).done(function(j){if(_.isObject(j)&amp;&amp;!_.isUndefined(j.success)){i[j
 .success?&quot;resolveWith&quot;:&quot;rejectWith&quot;](this,[j.data])}else{i.rejectWith(this,[j])}}).fail(function(){i.rejectWith(this,arguments)})}).promise()},fit:function(k){var h=k.width,g=k.height,j=k.maxWidth,i=k.maxHeight,l;if(!_.isUndefined(j)&amp;&amp;!_.isUndefined(i)){l=(h/g&gt;j/i)?&quot;width&quot;:&quot;height&quot;}else{if(_.isUndefined(i)){l=&quot;width&quot;}else{if(_.isUndefined(j)&amp;&amp;g&gt;i){l=&quot;height&quot;}}}if(&quot;width&quot;===l&amp;&amp;h&gt;j){return{width:j,height:Math.round(j*g/h)}}else{if(&quot;height&quot;===l&amp;&amp;g&gt;i){return{width:Math.round(i*h/g),height:i}}else{return{width:h,height:g}}}}});d=media.model.Attachment=Backbone.Model.extend({sync:function(i,h,g){if(&quot;read&quot;===i){g=g||{};g.context=this;g.data=_.extend(g.data||{},{action:&quot;get-attachment&quot;,id:this.id});return media.ajax(g)}else{if(&quot;update&quot;===i){g=g||{};g.context=this;g.data=_.extend(g.data||{},{action:&quot;save-attachment&quot;,id:thi
 s.id,nonce:b.saveAttachmentNonce});if(g.changes){_.each(g.changes,function(k,j){g.changes[j]=this.get(j)},this);g.data.changes=g.changes;delete g.changes}return media.ajax(g)}}},parse:function(h,g){if(!h){return h}h.date=new Date(h.date);h.modified=new Date(h.modified);return h}},{create:function(g){return c.all.push(g)},get:_.memoize(function(h,g){return c.all.push(g||{id:h})})});c=media.model.Attachments=Backbone.Collection.extend({model:d,initialize:function(h,g){g=g||{};this.props=new Backbone.Model();this.filters=g.filters||{};this.props.on(&quot;change:order&quot;,this._changeOrder,this);this.props.on(&quot;change:orderby&quot;,this._changeOrderby,this);this.props.on(&quot;change:query&quot;,this._changeQuery,this);this.props.on(&quot;change:search&quot;,this._changeSearch,this);this.props.on(&quot;change:type&quot;,this._changeType,this);this.props.set(_.defaults(g.props||{}));if(g.observe){this.observe(g.observe)}},_changeOrder:function(h,g){if(this.comparator){this.
 sort()}},_changeOrderby:function(g,h){if(this.comparator&amp;&amp;this.comparator!==c.comparator){return}if(h&amp;&amp;&quot;post__in&quot;!==h){this.comparator=c.comparator}else{delete this.comparator}},_changeQuery:function(g,h){if(h){this.props.on(&quot;change&quot;,this._requery,this);this._requery()}else{this.props.off(&quot;change&quot;,this._requery,this)}},_changeFilteredProp:function(i,g,h){if(this.props.get(i)===h){return}if(h&amp;&amp;!this.filters[i]){this.filters[i]=c.filters[i]}else{if(!h&amp;&amp;this.filters[i]===c.filters[i]){delete this.filters[i]}}if(!this.props.get(&quot;source&quot;)){this.props.set(&quot;source&quot;,new c(this.models))}this.reset(this.props.get(&quot;source&quot;).filter(this.validator))},_changeSearch:function(g,h){return this._changeFilteredProp(&quot;search&quot;,g,h)},_changeType:function(g,h){return this._changeFilteredProp(&quot;type&quot;,g,h)},validator:function(g){return _.all(this.filters,function(i,h){return !!i.call(this,g)
 },this)},validate:function(h,g){return this[this.validator(h)?&quot;add&quot;:&quot;remove&quot;](h,g)},observe:function(g){g.on(&quot;add change&quot;,this.validate,this)},unobserve:function(g){g.off(&quot;add change&quot;,this.validate,this)},mirror:function(g){if(this.mirroring&amp;&amp;this.mirroring===g){return}this.unmirror();this.mirroring=g;this.reset(g.models);g.on(&quot;add&quot;,this._mirrorAdd,this);g.on(&quot;remove&quot;,this._mirrorRemove,this);g.on(&quot;reset&quot;,this._mirrorReset,this)},unmirror:function(){if(!this.mirroring){return}this.mirroring.off(&quot;add&quot;,this._mirrorAdd,this);this.mirroring.off(&quot;remove&quot;,this._mirrorRemove,this);this.mirroring.off(&quot;reset&quot;,this._mirrorReset,this);delete this.mirroring},_mirrorAdd:function(i,g,h){this.add(i,{at:h.index})},_mirrorRemove:function(g){this.remove(g)},_mirrorReset:function(g){this.reset(g.models)},more:function(g){if(this.mirroring&amp;&amp;this.mirroring.more){return this.mirrori
 ng.more(g)}return f.Deferred().resolve().promise()},parse:function(h,g){return _.map(h,function(i){var j=d.get(i.id);return j.set(j.parse(i,g))})},_requery:function(){if(this.props.get(&quot;query&quot;)){this.mirror(a.get(this.props.toJSON()))}}},{comparator:function(i,h){var j=this.props.get(&quot;orderby&quot;),g=this.props.get(&quot;order&quot;)||&quot;DESC&quot;,k=i.cid,l=h.cid;i=i.get(j);h=h.get(j);if(&quot;date&quot;===j||&quot;modified&quot;===j){i=i||new Date();h=h||new Date()}return(&quot;DESC&quot;===g)?e(i,h,k,l):e(h,i,l,k)},filters:{search:function(g){if(!this.props.get(&quot;search&quot;)){return true}return _.any([&quot;title&quot;,&quot;filename&quot;,&quot;description&quot;,&quot;caption&quot;,&quot;name&quot;],function(h){var i=g.get(h);return i&amp;&amp;-1!==i.search(this.props.get(&quot;search&quot;))},this)},type:function(h){var g=this.props.get(&quot;type&quot;);if(!g){return true}return -1!==g.indexOf(h.get(&quot;type&quot;))}}});c.all=new c();media.qu
 ery=function(g){return new c(null,{props:_.extend(_.defaults(g||{},{orderby:&quot;date&quot;}),{query:true})})};a=media.model.Query=c.extend({initialize:function(i,g){var h;g=g||{};c.prototype.initialize.apply(this,arguments);this.args=g.args;this.hasMore=true;this.created=new Date();this.filters.order=function(j){if(!this.comparator){return true}if(this.length){return 1!==this.comparator(j,this.last())}else{if(&quot;DESC&quot;===this.args.order&amp;&amp;(&quot;date&quot;===this.args.orderby||&quot;modified&quot;===this.args.orderby)){return j.get(this.args.orderby)&gt;=this.created}}return false};h=[&quot;s&quot;,&quot;order&quot;,&quot;orderby&quot;,&quot;posts_per_page&quot;,&quot;post_mime_type&quot;];if(_(this.args).chain().keys().difference(h).isEmpty().value()){this.observe(c.all)}},more:function(g){var h=this;if(!this.hasMore){return f.Deferred().resolve().promise()}g=g||{};g.add=true;return this.fetch(g).done(function(i){if(_.isEmpty(i)||-1===this.args.posts_per_pag
 e||i.length&lt;this.args.posts_per_page){h.hasMore=false}})},sync:function(j,h,g){var i;if(&quot;read&quot;===j){g=g||{};g.context=this;g.data=_.extend(g.data||{},{action:&quot;query-attachments&quot;});args=_.clone(this.args);if(-1!==args.posts_per_page){args.paged=Math.floor(this.length/args.posts_per_page)+1}g.data.query=args;return media.ajax(g)}else{i=c.prototype.sync?c.prototype:Backbone;return i.sync.apply(this,arguments)}}},{defaultProps:{orderby:&quot;date&quot;,order:&quot;DESC&quot;},defaultArgs:{posts_per_page:40},orderby:{allowed:[&quot;name&quot;,&quot;author&quot;,&quot;date&quot;,&quot;title&quot;,&quot;modified&quot;,&quot;uploadedTo&quot;,&quot;id&quot;,&quot;post__in&quot;],valuemap:{id:&quot;ID&quot;,uploadedTo:&quot;parent&quot;}},propmap:{search:&quot;s&quot;,type:&quot;post_mime_type&quot;,parent:&quot;post_parent&quot;,perPage:&quot;posts_per_page&quot;},get:(function(){var g=[];return function(j,i){var h={},l=a.orderby,m=a.defaultProps,k;delete j.que
 ry;_.defaults(j,m);j.order=j.order.toUpperCase();if(&quot;DESC&quot;!==j.order&amp;&amp;&quot;ASC&quot;!==j.order){j.order=m.order.toUpperCase()}if(!_.contains(l.allowed,j.orderby)){j.orderby=m.orderby}_.each(j,function(n,o){h[a.propmap[o]||o]=n});_.defaults(h,a.defaultArgs);h.orderby=l.valuemap[j.orderby]||j.orderby;k=_.find(g,function(n){return _.isEqual(n.args,h)});if(!k){k=new a([],_.extend(i||{},{props:j,args:h}));g.push(k)}return k}}())})}(jQuery));
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpvieweditor_pluginjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin.js (22222 => 22223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin.js        2012-10-12 22:05:02 UTC (rev 22222)
+++ trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin.js        2012-10-12 22:58:48 UTC (rev 22223)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(function(){tinymce.create(&quot;tinymce.plugins.wpView&quot;,{init:function(c,b){var a=this;if(typeof wp===&quot;undefined&quot;||!wp.mce){return}c.onPreInit.add(function(d){d.schema.addValidElements(&quot;div[*],span[*]&quot;)});c.onBeforeSetContent.add(function(d,e){if(!e.content){return}e.content=wp.mce.view.toViews(e.content)});c.onSetContent.add(function(d,e){wp.mce.view.render(d.getDoc())});c.onInit.add(function(d){d.selection.onSetContent.add(function(e,g){if(!g.context){return}var f=e.getNode();if(!f.innerHTML){return}f.innerHTML=wp.mce.view.toViews(f.innerHTML);wp.mce.view.render(f)})});c.onPostProcess.add(function(d,e){if((!e.get&amp;&amp;!e.save)||!e.content){return}e.content=wp.mce.view.toText(e.content)})},getInfo:function(){return{longname:&quot;WordPress Views&quot;,author:&quot;WordPress&quot;,authorurl:&quot;http://wordpress.org&quot;,infourl:&quot;http://wordpress.org&quot;,version:&quot;1.0&quot;}}});tinymce.PluginManager.add(&quot;wpview&quot
 ;,tinymce.plugins.wpView)})();
</del><span class="cx">\ No newline at end of file
</span><ins>+(function(){var c=tinymce.VK,a=tinymce.dom.TreeWalker,b;tinymce.create(&quot;tinymce.plugins.wpView&quot;,{init:function(f,e){var d=this;if(typeof wp===&quot;undefined&quot;||!wp.mce){return}f.onPreInit.add(function(g){g.schema.addValidElements(&quot;div[*],span[*]&quot;)});f.onBeforeSetContent.add(function(g,h){if(!h.content){return}h.content=wp.mce.view.toViews(h.content)});f.onSetContent.add(function(g,h){wp.mce.view.render(g.getDoc())});f.onInit.add(function(g){g.selection.onBeforeSetContent.add(function(i,l){var h=d.getParentView(i.getNode()),k,j;if(!h){return}if(!h.nextSibling||d.isView(h.nextSibling)){j=g.getDoc().createTextNode(&quot;&quot;);g.dom.insertAfter(j,h)}else{k=new a(h.nextSibling,h.nextSibling);j=k.next()}i.select(j);i.collapse(true)});g.selection.onSetContent.add(function(h,j){if(!j.context){return}var i=h.getNode();if(!i.innerHTML){return}i.innerHTML=wp.mce.view.toViews(i.innerHTML);wp.mce.view.render(i)})});f.onPostProcess.add(function(g,h){
 if((!h.get&amp;&amp;!h.save)||!h.content){return}h.content=wp.mce.view.toText(h.content)});f.onNodeChange.addToTop(function(i,g,j,l,k){var h=d.getParentView(j);if(h){d.select(h);return false}else{d.deselect()}});f.onKeyDown.addToTop(function(i,j){var k=j.keyCode,h,g;if(!b){return}h=d.getParentView(i.selection.getNode());if(h!==b){d.deselect();return}if(k===c.DELETE||k===c.BACKSPACE){if((g=wp.mce.view.instance(b))){g.remove();d.deselect()}}if(j.metaKey||j.ctrlKey||(k&gt;=112&amp;&amp;k&lt;=123)){return}j.preventDefault()})},getParentView:function(d){while(d){if(this.isView(d)){return d}d=d.parentNode}},isView:function(d){return(/(?:^|\s)wp-view-wrap(?:\s|$)/).test(d.className)},select:function(d){if(d===b){return}this.deselect();b=d;wp.mce.view.select(b)},deselect:function(){if(b){wp.mce.view.deselect(b)}b=null},getInfo:function(){return{longname:&quot;WordPress Views&quot;,author:&quot;WordPress&quot;,authorurl:&quot;http://wordpress.org&quot;,infourl:&quot;http://wordpress.
 org&quot;,version:&quot;1.0&quot;}}});tinymce.PluginManager.add(&quot;wpview&quot;,tinymce.plugins.wpView)})();
</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 (22222 => 22223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php        2012-10-12 22:05:02 UTC (rev 22222)
+++ trunk/wp-includes/version.php        2012-10-12 22:58:48 UTC (rev 22223)
</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.5-beta1-22204';
</del><ins>+$wp_version = '3.5-beta1-22223';
</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 = '356-21964';
</del><ins>+$tinymce_version = '356-22223';
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Holds the required PHP version
</span></span></pre>
</div>
</div>

</body>
</html>