<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14831] trunk: Menu tweaks.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14831">14831</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-24 09:23:56 +0000 (Mon, 24 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Menu tweaks. Save menu locations when saving the menu. Also, centralize theme support checks and add them to menu.php. Improve some branching. Remove some old JS vars, add a missing semicolon, etc. props koopersmith. see <a href="http://trac.wordpress.org/ticket/13378">#13378</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</a></li>
<li><a href="#trunkwpadminjsnavmenujs">trunk/wp-admin/js/nav-menu.js</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsnavmenudevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.dev.js (14830 => 14831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js        2010-05-24 08:40:02 UTC (rev 14830)
+++ trunk/wp-admin/js/nav-menu.dev.js        2010-05-24 09:23:56 UTC (rev 14831)
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> 
</span><span class="cx">                 attachTabsPanelListeners : function() {
</span><span class="cx">                         $('#menu-settings-column').bind('click', function(e) {
</span><del>-                                var selectAreaMatch, activePanel, panelId, wrapper, items,
</del><ins>+                                var selectAreaMatch, panelId, wrapper, items,
</ins><span class="cx">                                         target = $(e.target);
</span><span class="cx"> 
</span><span class="cx">                                 if ( target.hasClass('nav-tab-link') ) {
</span><span class="lines">@@ -679,6 +679,12 @@
</span><span class="cx">                 },
</span><span class="cx"> 
</span><span class="cx">                 eventOnClickMenuSave : function(clickedEl) {
</span><ins>+                        var locs = '';
+                        // Copy menu theme locations
+                        $('#nav-menu-theme-locations select').each(function() {
+                                locs += '&lt;input type=&quot;hidden&quot; name=&quot;' + this.name + '&quot; value=&quot;' + $(this).val() + '&quot; /&gt;';
+                        });
+                        $('#update-nav-menu').append( locs );
</ins><span class="cx">                         // Update menu item position data
</span><span class="cx">                         api.menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );
</span><span class="cx">                         return true;
</span><span class="lines">@@ -759,9 +765,8 @@
</span><span class="cx">                 },
</span><span class="cx"> 
</span><span class="cx">                 removeMenuItem : function(el) {
</span><del>-                        el = $(el)
-                        var children = el.childMenuItems(),
-                                that = this;
</del><ins>+                        el = $(el);
+                        var children = el.childMenuItems();
</ins><span class="cx"> 
</span><span class="cx">                         el.addClass('deleting').fadeOut( 350 , function() {
</span><span class="cx">                                 el.remove();
</span></span></pre></div>
<a id="trunkwpadminjsnavmenujs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.js (14830 => 14831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.js        2010-05-24 08:40:02 UTC (rev 14830)
+++ trunk/wp-admin/js/nav-menu.js        2010-05-24 09:23:56 UTC (rev 14831)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var wpNavMenu;(function(b){var a=wpNavMenu={options:{menuItemDepthPerLevel:30,globalMaxDepth:11},menuList:undefined,targetList:undefined,menusChanged:false,init:function(){a.menuList=b(&quot;#menu-to-edit&quot;);a.targetList=a.menuList;this.jQueryExtensions();this.attachMenuEditListeners();this.setupInputWithDefaultTitle();this.attachAddMenuItemListeners();this.attachQuickSearchListeners();this.attachThemeLocationsListeners();this.attachTabsPanelListeners();this.attachHomeLinkListener();this.attachUnsavedChangesListener();if(a.menuList.length){this.initSortables()}this.initToggles();this.initTabManager()},jQueryExtensions:function(){b.fn.extend({menuItemDepth:function(){var c=this.eq(0).css(&quot;margin-left&quot;);return a.pxToDepth(c&amp;&amp;-1!=c.indexOf(&quot;px&quot;)?c.slice(0,-2):0)},updateDepthClass:function(d,c){return this.each(function(){var e=b(this);c=c||e.menuItemDepth();b(this).removeClass(&quot;menu-item-depth-&quot;+c).addClass(&quot;menu-item-depth-&quot;+d)})},shiftDepthClass:function(c){return this.each(function(){var d=b(this),e=d.menuItemDepth();b(this).removeClass(&quot;menu-item-depth-&quot;+e).addClass(&quot;menu-item-depth-&quot;+(e+c))})},childMenuItems:function(){var c=b();this.each(function(){var d=b(this),f=d.menuItemDepth(),e=d.next();while(e.length&amp;&amp;e.menuItemDepth()&gt;f){c=c.add(e);e=e.next()}});return c},updateParentMenuItemDBId:function(){return this.each(function(){var e=b(this),c=e.find(&quot;.menu-item-data-parent-id&quot;),f=e.menuItemDepth(),d=e.prev();if(f==0){c.val(0)}else{while(d.menuItemDepth()!=f-1){d=d.prev()}c.val(d.find(&quot;.menu-item-data-db-id&quot;).val())}})},hideAdvancedMenuItemFields:function(){return this.each(function(){var c=b(this);b(&quot;.hide-column-tog&quot;).not(&quot;:checked&quot;).each(function(){c.find(&quot;.field-&quot;+b(this).val()).addClass(&quot;hidden-field&quot;)})})},addSelectedToMenu:function(c){return this.each(function(){var e=b(this),d={},g=e.find(&quot;.tabs-panel-active .categorychecklist li input:checked&quot;),f=new RegExp(&quot;menu-item\\[([^\\]]*)&quot;);c=c||a.addMenuItemToBottom;if(!g.length){return false}e.find(&quot;img.waiting&quot;).show();b(g).each(function(){var h=f.exec(b(this).attr(&quot;name&quot;)),i=&quot;undefined&quot;==typeof h[1]?0:parseInt(h[1],10);d[i]=a.getListDataFromID(i)});a.addItemToMenu(d,c,function(){g.removeAttr(&quot;checked&quot;);e.find(&quot;img.waiting&quot;).hide()})})}})},initToggles:function(){postboxes.add_postbox_toggles(&quot;nav-menus&quot;);columns.useCheckboxesForHidden();columns.checked=function(c){b(&quot;.field-&quot;+c).removeClass(&quot;hidden-field&quot;)};columns.unchecked=function(c){b(&quot;.field-&quot;+c).addClass(&quot;hidden-field&quot;)};a.menuList.hideAdvancedMenuItemFields()},initSortables:function(){var m=0,l,j,e,h,n,k,o,d,g,i=a.menuList.offset().left;a.menuList.sortable({handle:&quot;.menu-item-handle&quot;,placeholder:&quot;sortable-placeholder&quot;,start:function(w,v){var p,t,s,q,r,u;g=v.item.children(&quot;.menu-item-transport&quot;);l=v.item.menuItemDepth();f(v,l);s=(v.item.next()[0]==v.placeholder[0])?v.item.next():v.item;q=s.childMenuItems();g.append(q);p=g.outerHeight();p+=(p&gt;0)?(v.placeholder.css(&quot;margin-top&quot;).slice(0,-2)*1):0;p+=v.helper.outerHeight();d=p;p-=2;v.placeholder.height(p);r=l;q.each(function(){var x=b(this).menuItemDepth();r=(x&gt;r)?x:r});t=v.helper.find(&quot;.menu-item-handle&quot;).outerWidth();t+=a.depthToPx(r-l);t-=2;v.placeholder.width(t);u=v.placeholder.next();u.css(&quot;margin-top&quot;,d+&quot;px&quot;);v.placeholder.detach();b(this).sortable(&quot;refresh&quot;);v.item.after(v.placeholder);u.css(&quot;margin-top&quot;,0);c(v)},stop:function(s,r){var q,p=m-l;q=g.children().insertAfter(r.item);if(p!=0){r.item.updateDepthClass(m);q.shiftDepthClass(p);a.registerChange()}r.item.updateParentMenuItemDBId();r.item[0].style.top=0},change:function(q,p){if(!p.placeholder.parent().hasClass(&quot;menu&quot;)){(h.length)?h.after(p.placeholder):a.menuList.prepend(p.placeholder)}c(p)},sort:function(q,p){var s=p.helper.offset(),r=a.pxToDepth(s.left-i);if(r&gt;e||s.top&lt;k){r=e}else{if(r&lt;j){r=j}}if(r!=m){f(p,r)}if(o&amp;&amp;s.top+d&gt;o){n.after(p.placeholder);c(p);b(this).sortable(&quot;refreshPositions&quot;)}},update:function(q,p){a.registerChange()}});function c(p){var q;h=p.placeholder.prev();n=p.placeholder.next();if(h[0]==p.item[0]){h=h.prev()}if(n[0]==p.item[0]){n=n.next()}k=(h.length)?h.offset().top+h.height():0;o=(n.length)?n.offset().top+n.height()/3:0;j=(n.length)?n.menuItemDepth():0;if(h.length){e=((q=h.menuItemDepth()+1)&gt;a.options.globalMaxDepth)?a.options.globalMaxDepth:q}else{e=0}}function f(p,q){p.placeholder.updateDepthClass(q,m);m=q}},attachMenuEditListeners:function(){var c=this;b(&quot;#update-nav-menu&quot;).bind(&quot;click&quot;,function(d){if(d.target&amp;&amp;d.target.className){if(-1!=d.target.className.indexOf(&quot;item-edit&quot;)){return c.eventOnClickEditLink(d.target)}else{if(-1!=d.target.className.indexOf(&quot;menu-save&quot;)){return c.eventOnClickMenuSave(d.target)}else{if(-1!=d.target.className.indexOf(&quot;menu-delete&quot;)){return c.eventOnClickMenuDelete(d.target)}else{if(-1!=d.target.className.indexOf(&quot;item-delete&quot;)){return c.eventOnClickMenuItemDelete(d.target)}else{if(-1!=d.target.className.indexOf(&quot;item-close&quot;)){return c.eventOnClickCloseLink(d.target)}}}}}}})},setupInputWithDefaultTitle:function(){var c=&quot;input-with-default-title&quot;;b(&quot;.&quot;+c).each(function(){var f=b(this),e=f.attr(&quot;title&quot;),d=f.val();f.data(c,e);if(&quot;&quot;==d){f.val(e)}else{if(e==d){return}else{f.removeClass(c)}}}).focus(function(){var d=b(this);if(d.val()==d.data(c)){d.val(&quot;&quot;).removeClass(c)}}).blur(function(){var d=b(this);if(&quot;&quot;==d.val()){d.addClass(c).val(d.data(c))}})},attachAddMenuItemListeners:function(){var c=b(&quot;#nav-menu-meta&quot;);c.find(&quot;.add-to-menu input&quot;).click(function(){a.registerChange();b(this).trigger(&quot;wp-add-menu-item&quot;,[a.addMenuItemToBottom]);return false});c.find(&quot;.customlinkdiv&quot;).bind(&quot;wp-add-menu-item&quot;,function(f,d){a.addCustomLink(d)});c.find(&quot;.posttypediv, .taxonomydiv&quot;).bind(&quot;wp-add-menu-item&quot;,function(f,d){b(this).addSelectedToMenu(d)})},attachThemeLocationsListeners:function(){var d=b(&quot;#nav-menu-theme-locations&quot;),c={};c.action=&quot;menu-locations-save&quot;;c[&quot;menu-settings-column-nonce&quot;]=b(&quot;#menu-settings-column-nonce&quot;).val();d.find(&quot;input[type=submit]&quot;).click(function(){d.find(&quot;select&quot;).each(function(){c[this.name]=b(this).val()});d.find(&quot;.waiting&quot;).show();b.post(ajaxurl,c,function(e){d.find(&quot;.waiting&quot;).hide()});return false})},attachQuickSearchListeners:function(){var c;b(&quot;.quick-search&quot;).keypress(function(f){var d=b(this);if(13==f.which){a.updateQuickSearchResults(d);return false}if(c){clearTimeout(c)}c=setTimeout(function(){a.updateQuickSearchResults(d)},400)}).attr(&quot;autocomplete&quot;,&quot;off&quot;)},updateQuickSearchResults:function(d){var c,g,e=2,f=d.val();if(f.length&lt;e){return}c=d.parents(&quot;.tabs-panel&quot;);g={action:&quot;menu-quick-search&quot;,&quot;response-format&quot;:&quot;markup&quot;,menu:b(&quot;#menu&quot;).val(),&quot;menu-settings-column-nonce&quot;:b(&quot;#menu-settings-column-nonce&quot;).val(),q:f,type:d.attr(&quot;name&quot;)};b(&quot;img.waiting&quot;,c).show();b.post(ajaxurl,g,function(h){a.processQuickSearchQueryResponse(h,g,c)})},addCustomLink:function(c){var e=b(&quot;#custom-menu-item-url&quot;).val(),d=b(&quot;#custom-menu-item-name&quot;).val();c=c||a.addMenuItemToBottom;if(&quot;&quot;==e||&quot;http://&quot;==e){return false}b(&quot;.customlinkdiv img.waiting&quot;).show();this.addLinkToMenu(e,d,c,function(){b(&quot;.customlinkdiv img.waiting&quot;).hide();b(&quot;#custom-menu-item-name&quot;).val(&quot;&quot;).blur();b(&quot;#custom-menu-item-url&quot;).val(&quot;http://&quot;)})},addLinkToMenu:function(e,d,c,f){c=c||a.addMenuItemToBottom;f=f||function(){};a.addItemToMenu({&quot;-1&quot;:{&quot;menu-item-type&quot;:&quot;custom&quot;,&quot;menu-item-url&quot;:e,&quot;menu-item-title&quot;:d}},c,f)},addItemToMenu:function(e,c,g){var f=b(&quot;#menu&quot;).val(),d=b(&quot;#menu-settings-column-nonce&quot;).val();c=c||function(){};g=g||function(){};params={action:&quot;add-menu-item&quot;,menu:f,&quot;menu-settings-column-nonce&quot;:d,&quot;menu-item&quot;:e};b.post(ajaxurl,params,function(h){c(h,params);g()})},addMenuItemToBottom:function(c,d){b(c).hideAdvancedMenuItemFields().appendTo(a.targetList)},addMenuItemToTop:function(c,d){b(c).hideAdvancedMenuItemFields().prependTo(a.targetList)},attachHomeLinkListener:function(){b(&quot;.add-home-link&quot;,&quot;.customlinkdiv&quot;).click(function(c){a.addLinkToMenu(navMenuL10n.homeurl,navMenuL10n.home,a.addMenuItemToTop);return false})},attachUnsavedChangesListener:function(){b(&quot;#menu-management input, #menu-management select, #menu-management, #menu-management textarea&quot;).change(function(){a.registerChange()});window.onbeforeunload=function(){if(a.menusChanged){return navMenuL10n.saveAlert}};b(&quot;input.menu-save, input.save-menu-item&quot;).click(function(){window.onbeforeunload=null})},registerChange:function(){a.menusChanged=true},attachTabsPanelListeners:function(){b(&quot;#menu-settings-column&quot;).bind(&quot;click&quot;,function(h){var f,i,d,j,c,g=b(h.target);if(g.hasClass(&quot;nav-tab-link&quot;)){d=/#(.*)$/.exec(h.target.href);if(d&amp;&amp;d[1]){d=d[1]}else{return false}j=g.parents(&quot;.inside&quot;).first();b(&quot;input&quot;,j).removeAttr(&quot;checked&quot;);b(&quot;.tabs-panel-active&quot;,j).removeClass(&quot;tabs-panel-active&quot;).addClass(&quot;tabs-panel-inactive&quot;);b(&quot;#&quot;+d,j).removeClass(&quot;tabs-panel-inactive&quot;).addClass(&quot;tabs-panel-active&quot;);b(&quot;.tabs&quot;,j).removeClass(&quot;tabs&quot;);g.parent().addClass(&quot;tabs&quot;);b(&quot;.quick-search&quot;,j).focus();return false}else{if(g.hasClass(&quot;select-all&quot;)){f=/#(.*)$/.exec(h.target.href);if(f&amp;&amp;f[1]){c=b(&quot;#&quot;+f[1]+&quot; .tabs-panel-active .menu-item-title input&quot;);if(c.length===c.filter(&quot;:checked&quot;).length){c.removeAttr(&quot;checked&quot;)}else{c.attr(&quot;checked&quot;,&quot;checked&quot;)}return false}}}})},initTabManager:function(){var h=b(&quot;.nav-tabs-wrapper&quot;),i=h.children(&quot;.nav-tabs&quot;),g=i.children(&quot;.nav-tab-active&quot;),l=i.children(&quot;.nav-tab&quot;),e=0,m,f,k,d,j=false;function c(){f=h.offset().left;m=f+h.width();g.makeTabVisible()}b.fn.extend({makeTabVisible:function(){var o=this.eq(0),p,n;if(!o.length){return}p=o.offset().left;n=p+o.outerWidth();if(n&gt;m){i.animate({&quot;margin-left&quot;:&quot;+=&quot;+(m-n)+&quot;px&quot;},&quot;fast&quot;)}else{if(p&lt;f){i.animate({&quot;margin-left&quot;:&quot;-=&quot;+(p-f)+&quot;px&quot;},&quot;fast&quot;)}}return o},isTabVisible:function(){var o=this.eq(0),p=o.offset().left,n=p+o.outerWidth();return(n&lt;=m&amp;&amp;p&gt;=f)?true:false}});l.each(function(){e+=b(this).outerWidth(true)});if(e&lt;=h.width()-i.css(&quot;padding-left&quot;).slice(0,-2)-i.css(&quot;padding-right&quot;).slice(0,-2)){return}i.css({&quot;margin-right&quot;:(-1*e)+&quot;px&quot;,padding:0});k=b('&lt;div class=&quot;nav-tabs-arrow nav-tabs-arrow-left&quot;&gt;&lt;a&gt;&amp;laquo;&lt;/a&gt;&lt;/div&gt;');d=b('&lt;div class=&quot;nav-tabs-arrow nav-tabs-arrow-right&quot;&gt;&lt;a&gt;&amp;raquo;&lt;/a&gt;&lt;/div&gt;');h.wrap('&lt;div class=&quot;nav-tabs-nav&quot;/&gt;').parent().prepend(k).append(d);c();b(window).resize(function(){if(j){return}j=true;setTimeout(function(){c();j=false},1000)});b.each([{arrow:k,next:&quot;next&quot;,last:&quot;first&quot;,operator:&quot;+=&quot;},{arrow:d,next:&quot;prev&quot;,last:&quot;last&quot;,operator:&quot;-=&quot;}],function(){var n=this;this.arrow.mousedown(function(){var p=l[n.last](),o=function(){if(!p.isTabVisible()){i.animate({&quot;margin-left&quot;:n.operator+&quot;90px&quot;},300,&quot;linear&quot;,o)}};o()}).mouseup(function(){var p,o;i.stop(true);p=l[n.last]();while((o=p[n.next]())&amp;&amp;o.length&amp;&amp;!o.isTabVisible()){p=o}p.makeTabVisible()})})},eventOnClickEditLink:function(c){var e,d=/#(.*)$/.exec(c.href);if(d&amp;&amp;d[1]){e=b(&quot;#&quot;+d[1]);if(0!=e.length){if(e.hasClass(&quot;menu-item-edit-inactive&quot;)){e.slideDown(&quot;fast&quot;).siblings(&quot;dl&quot;).andSelf().removeClass(&quot;menu-item-edit-inactive&quot;).addClass(&quot;menu-item-edit-active&quot;)}else{e.slideUp(&quot;fast&quot;).siblings(&quot;dl&quot;).andSelf().removeClass(&quot;menu-item-edit-active&quot;).addClass(&quot;menu-item-edit-inactive&quot;)}return false}}},eventOnClickCloseLink:function(c){b(c).closest(&quot;.menu-item-settings&quot;).siblings(&quot;dl&quot;).find(&quot;.item-edit&quot;).click();return false},eventOnClickMenuSave:function(c){a.menuList.find(&quot;.menu-item-data-position&quot;).val(function(d){return d+1});return true},eventOnClickMenuDelete:function(c){if(confirm(navMenuL10n.warnDeleteMenu)){return true}else{return false}},eventOnClickMenuItemDelete:function(c){var f,e,d=this;e=/_wpnonce=([a-zA-Z0-9]*)$/.exec(c.href);if(e&amp;&amp;e[1]){f=parseInt(c.id.replace(&quot;delete-&quot;,&quot;&quot;),10);b.post(ajaxurl,{action:&quot;delete-menu-item&quot;,&quot;menu-item&quot;:f,_wpnonce:e[1]},function(g){if(&quot;1&quot;==g){d.removeMenuItem(document.getElementById(&quot;menu-item-&quot;+f))}});return false}return true},processQuickSearchQueryResponse:function(g,m,c){var h,e,j,f={},d=document.getElementById(&quot;nav-menu-meta&quot;),l=new RegExp(&quot;menu-item\\[([^\\]]*)&quot;,&quot;g&quot;),k=g.match(/&lt;li&gt;.*&lt;\/li&gt;/g);if(!k){b(&quot;.categorychecklist&quot;,c).html(&quot;&lt;li&gt;&lt;p&gt;&quot;+navMenuL10n.noResultsFound+&quot;&lt;/p&gt;&lt;/li&gt;&quot;);b(&quot;img.waiting&quot;,c).hide();return}h=k.length;while(h--){e=l.exec(k[h]);if(e&amp;&amp;e[1]){j=e[1];while(d.elements[&quot;menu-item[&quot;+j+&quot;][menu-item-type]&quot;]||f[j]){j--}f[j]=true;if(j!=e[1]){k[h]=k[h].replace(new RegExp(&quot;menu-item\\[&quot;+e[1]+&quot;\\]&quot;,&quot;g&quot;),&quot;menu-item[&quot;+j+&quot;]&quot;)}}}b(&quot;.categorychecklist&quot;,c).html(k.join(&quot;&quot;));b(&quot;img.waiting&quot;,c).hide()},removeMenuItem:function(d){d=b(d);var c=d.childMenuItems(),e=this;d.addClass(&quot;deleting&quot;).fadeOut(350,function(){d.remove();c.shiftDepthClass(-1).updateParentMenuItemDBId()})},getListDataFromID:function(k,h){if(!k){return false}h=h||document;var d=[&quot;menu-item-db-id&quot;,&quot;menu-item-object-id&quot;,&quot;menu-item-object&quot;,&quot;menu-item-parent-id&quot;,&quot;menu-item-position&quot;,&quot;menu-item-type&quot;,&quot;menu-item-title&quot;,&quot;menu-item-url&quot;,&quot;menu-item-description&quot;,&quot;menu-item-attr-title&quot;,&quot;menu-item-target&quot;,&quot;menu-item-classes&quot;,&quot;menu-item-xfn&quot;],c={},e=h.getElementsByTagName(&quot;input&quot;),g=e.length,f;while(g--){f=d.length;while(f--){if(e[g]&amp;&amp;e[g].name&amp;&amp;&quot;menu-item[&quot;+k+&quot;][&quot;+d[f]+&quot;]&quot;==e[g].name){c[d[f]]=e[g].value}}}return c},depthToPx:function(c){return c*a.options.menuItemDepthPerLevel},pxToDepth:function(c){return Math.floor(c/a.options.menuItemDepthPerLevel)}};b(document).ready(function(){wpNavMenu.init()})})(jQuery);
</del><span class="cx">\ No newline at end of file
</span><ins>+var wpNavMenu;(function(b){var a=wpNavMenu={options:{menuItemDepthPerLevel:30,globalMaxDepth:11},menuList:undefined,targetList:undefined,menusChanged:false,init:function(){a.menuList=b(&quot;#menu-to-edit&quot;);a.targetList=a.menuList;this.jQueryExtensions();this.attachMenuEditListeners();this.setupInputWithDefaultTitle();this.attachAddMenuItemListeners();this.attachQuickSearchListeners();this.attachThemeLocationsListeners();this.attachTabsPanelListeners();this.attachHomeLinkListener();this.attachUnsavedChangesListener();if(a.menuList.length){this.initSortables()}this.initToggles();this.initTabManager()},jQueryExtensions:function(){b.fn.extend({menuItemDepth:function(){var c=this.eq(0).css(&quot;margin-left&quot;);return a.pxToDepth(c&amp;&amp;-1!=c.indexOf(&quot;px&quot;)?c.slice(0,-2):0)},updateDepthClass:function(d,c){return this.each(function(){var e=b(this);c=c||e.menuItemDepth();b(this).removeClass(&quot;menu-item-depth-&quot;+c).addClass(&quot;menu-item-depth-&quot;+d)})},shiftDepthClass:function(c){return this.each(function(){var d=b(this),e=d.menuItemDepth();b(this).removeClass(&quot;menu-item-depth-&quot;+e).addClass(&quot;menu-item-depth-&quot;+(e+c))})},childMenuItems:function(){var c=b();this.each(function(){var d=b(this),f=d.menuItemDepth(),e=d.next();while(e.length&amp;&amp;e.menuItemDepth()&gt;f){c=c.add(e);e=e.next()}});return c},updateParentMenuItemDBId:function(){return this.each(function(){var e=b(this),c=e.find(&quot;.menu-item-data-parent-id&quot;),f=e.menuItemDepth(),d=e.prev();if(f==0){c.val(0)}else{while(d.menuItemDepth()!=f-1){d=d.prev()}c.val(d.find(&quot;.menu-item-data-db-id&quot;).val())}})},hideAdvancedMenuItemFields:function(){return this.each(function(){var c=b(this);b(&quot;.hide-column-tog&quot;).not(&quot;:checked&quot;).each(function(){c.find(&quot;.field-&quot;+b(this).val()).addClass(&quot;hidden-field&quot;)})})},addSelectedToMenu:function(c){return this.each(function(){var e=b(this),d={},g=e.find(&quot;.tabs-panel-active .categorychecklist li input:checked&quot;),f=new RegExp(&quot;menu-item\\[([^\\]]*)&quot;);c=c||a.addMenuItemToBottom;if(!g.length){return false}e.find(&quot;img.waiting&quot;).show();b(g).each(function(){var h=f.exec(b(this).attr(&quot;name&quot;)),i=&quot;undefined&quot;==typeof h[1]?0:parseInt(h[1],10);d[i]=a.getListDataFromID(i)});a.addItemToMenu(d,c,function(){g.removeAttr(&quot;checked&quot;);e.find(&quot;img.waiting&quot;).hide()})})}})},initToggles:function(){postboxes.add_postbox_toggles(&quot;nav-menus&quot;);columns.useCheckboxesForHidden();columns.checked=function(c){b(&quot;.field-&quot;+c).removeClass(&quot;hidden-field&quot;)};columns.unchecked=function(c){b(&quot;.field-&quot;+c).addClass(&quot;hidden-field&quot;)};a.menuList.hideAdvancedMenuItemFields()},initSortables:function(){var m=0,l,j,e,h,n,k,o,d,g,i=a.menuList.offset().left;a.menuList.sortable({handle:&quot;.menu-item-handle&quot;,placeholder:&quot;sortable-placeholder&quot;,start:function(w,v){var p,t,s,q,r,u;g=v.item.children(&quot;.menu-item-transport&quot;);l=v.item.menuItemDepth();f(v,l);s=(v.item.next()[0]==v.placeholder[0])?v.item.next():v.item;q=s.childMenuItems();g.append(q);p=g.outerHeight();p+=(p&gt;0)?(v.placeholder.css(&quot;margin-top&quot;).slice(0,-2)*1):0;p+=v.helper.outerHeight();d=p;p-=2;v.placeholder.height(p);r=l;q.each(function(){var x=b(this).menuItemDepth();r=(x&gt;r)?x:r});t=v.helper.find(&quot;.menu-item-handle&quot;).outerWidth();t+=a.depthToPx(r-l);t-=2;v.placeholder.width(t);u=v.placeholder.next();u.css(&quot;margin-top&quot;,d+&quot;px&quot;);v.placeholder.detach();b(this).sortable(&quot;refresh&quot;);v.item.after(v.placeholder);u.css(&quot;margin-top&quot;,0);c(v)},stop:function(s,r){var q,p=m-l;q=g.children().insertAfter(r.item);if(p!=0){r.item.updateDepthClass(m);q.shiftDepthClass(p);a.registerChange()}r.item.updateParentMenuItemDBId();r.item[0].style.top=0},change:function(q,p){if(!p.placeholder.parent().hasClass(&quot;menu&quot;)){(h.length)?h.after(p.placeholder):a.menuList.prepend(p.placeholder)}c(p)},sort:function(q,p){var s=p.helper.offset(),r=a.pxToDepth(s.left-i);if(r&gt;e||s.top&lt;k){r=e}else{if(r&lt;j){r=j}}if(r!=m){f(p,r)}if(o&amp;&amp;s.top+d&gt;o){n.after(p.placeholder);c(p);b(this).sortable(&quot;refreshPositions&quot;)}},update:function(q,p){a.registerChange()}});function c(p){var q;h=p.placeholder.prev();n=p.placeholder.next();if(h[0]==p.item[0]){h=h.prev()}if(n[0]==p.item[0]){n=n.next()}k=(h.length)?h.offset().top+h.height():0;o=(n.length)?n.offset().top+n.height()/3:0;j=(n.length)?n.menuItemDepth():0;if(h.length){e=((q=h.menuItemDepth()+1)&gt;a.options.globalMaxDepth)?a.options.globalMaxDepth:q}else{e=0}}function f(p,q){p.placeholder.updateDepthClass(q,m);m=q}},attachMenuEditListeners:function(){var c=this;b(&quot;#update-nav-menu&quot;).bind(&quot;click&quot;,function(d){if(d.target&amp;&amp;d.target.className){if(-1!=d.target.className.indexOf(&quot;item-edit&quot;)){return c.eventOnClickEditLink(d.target)}else{if(-1!=d.target.className.indexOf(&quot;menu-save&quot;)){return c.eventOnClickMenuSave(d.target)}else{if(-1!=d.target.className.indexOf(&quot;menu-delete&quot;)){return c.eventOnClickMenuDelete(d.target)}else{if(-1!=d.target.className.indexOf(&quot;item-delete&quot;)){return c.eventOnClickMenuItemDelete(d.target)}else{if(-1!=d.target.className.indexOf(&quot;item-close&quot;)){return c.eventOnClickCloseLink(d.target)}}}}}}})},setupInputWithDefaultTitle:function(){var c=&quot;input-with-default-title&quot;;b(&quot;.&quot;+c).each(function(){var f=b(this),e=f.attr(&quot;title&quot;),d=f.val();f.data(c,e);if(&quot;&quot;==d){f.val(e)}else{if(e==d){return}else{f.removeClass(c)}}}).focus(function(){var d=b(this);if(d.val()==d.data(c)){d.val(&quot;&quot;).removeClass(c)}}).blur(function(){var d=b(this);if(&quot;&quot;==d.val()){d.addClass(c).val(d.data(c))}})},attachAddMenuItemListeners:function(){var c=b(&quot;#nav-menu-meta&quot;);c.find(&quot;.add-to-menu input&quot;).click(function(){a.registerChange();b(this).trigger(&quot;wp-add-menu-item&quot;,[a.addMenuItemToBottom]);return false});c.find(&quot;.customlinkdiv&quot;).bind(&quot;wp-add-menu-item&quot;,function(f,d){a.addCustomLink(d)});c.find(&quot;.posttypediv, .taxonomydiv&quot;).bind(&quot;wp-add-menu-item&quot;,function(f,d){b(this).addSelectedToMenu(d)})},attachThemeLocationsListeners:function(){var d=b(&quot;#nav-menu-theme-locations&quot;),c={};c.action=&quot;menu-locations-save&quot;;c[&quot;menu-settings-column-nonce&quot;]=b(&quot;#menu-settings-column-nonce&quot;).val();d.find(&quot;input[type=submit]&quot;).click(function(){d.find(&quot;select&quot;).each(function(){c[this.name]=b(this).val()});d.find(&quot;.waiting&quot;).show();b.post(ajaxurl,c,function(e){d.find(&quot;.waiting&quot;).hide()});return false})},attachQuickSearchListeners:function(){var c;b(&quot;.quick-search&quot;).keypress(function(f){var d=b(this);if(13==f.which){a.updateQuickSearchResults(d);return false}if(c){clearTimeout(c)}c=setTimeout(function(){a.updateQuickSearchResults(d)},400)}).attr(&quot;autocomplete&quot;,&quot;off&quot;)},updateQuickSearchResults:function(d){var c,g,e=2,f=d.val();if(f.length&lt;e){return}c=d.parents(&quot;.tabs-panel&quot;);g={action:&quot;menu-quick-search&quot;,&quot;response-format&quot;:&quot;markup&quot;,menu:b(&quot;#menu&quot;).val(),&quot;menu-settings-column-nonce&quot;:b(&quot;#menu-settings-column-nonce&quot;).val(),q:f,type:d.attr(&quot;name&quot;)};b(&quot;img.waiting&quot;,c).show();b.post(ajaxurl,g,function(h){a.processQuickSearchQueryResponse(h,g,c)})},addCustomLink:function(c){var e=b(&quot;#custom-menu-item-url&quot;).val(),d=b(&quot;#custom-menu-item-name&quot;).val();c=c||a.addMenuItemToBottom;if(&quot;&quot;==e||&quot;http://&quot;==e){return false}b(&quot;.customlinkdiv img.waiting&quot;).show();this.addLinkToMenu(e,d,c,function(){b(&quot;.customlinkdiv img.waiting&quot;).hide();b(&quot;#custom-menu-item-name&quot;).val(&quot;&quot;).blur();b(&quot;#custom-menu-item-url&quot;).val(&quot;http://&quot;)})},addLinkToMenu:function(e,d,c,f){c=c||a.addMenuItemToBottom;f=f||function(){};a.addItemToMenu({&quot;-1&quot;:{&quot;menu-item-type&quot;:&quot;custom&quot;,&quot;menu-item-url&quot;:e,&quot;menu-item-title&quot;:d}},c,f)},addItemToMenu:function(e,c,g){var f=b(&quot;#menu&quot;).val(),d=b(&quot;#menu-settings-column-nonce&quot;).val();c=c||function(){};g=g||function(){};params={action:&quot;add-menu-item&quot;,menu:f,&quot;menu-settings-column-nonce&quot;:d,&quot;menu-item&quot;:e};b.post(ajaxurl,params,function(h){c(h,params);g()})},addMenuItemToBottom:function(c,d){b(c).hideAdvancedMenuItemFields().appendTo(a.targetList)},addMenuItemToTop:function(c,d){b(c).hideAdvancedMenuItemFields().prependTo(a.targetList)},attachHomeLinkListener:function(){b(&quot;.add-home-link&quot;,&quot;.customlinkdiv&quot;).click(function(c){a.addLinkToMenu(navMenuL10n.homeurl,navMenuL10n.home,a.addMenuItemToTop);return false})},attachUnsavedChangesListener:function(){b(&quot;#menu-management input, #menu-management select, #menu-management, #menu-management textarea&quot;).change(function(){a.registerChange()});window.onbeforeunload=function(){if(a.menusChanged){return navMenuL10n.saveAlert}};b(&quot;input.menu-save, input.save-menu-item&quot;).click(function(){window.onbeforeunload=null})},registerChange:function(){a.menusChanged=true},attachTabsPanelListeners:function(){b(&quot;#menu-settings-column&quot;).bind(&quot;click&quot;,function(h){var f,d,i,c,g=b(h.target);if(g.hasClass(&quot;nav-tab-link&quot;)){d=/#(.*)$/.exec(h.target.href);if(d&amp;&amp;d[1]){d=d[1]}else{return false}i=g.parents(&quot;.inside&quot;).first();b(&quot;input&quot;,i).removeAttr(&quot;checked&quot;);b(&quot;.tabs-panel-active&quot;,i).removeClass(&quot;tabs-panel-active&quot;).addClass(&quot;tabs-panel-inactive&quot;);b(&quot;#&quot;+d,i).removeClass(&quot;tabs-panel-inactive&quot;).addClass(&quot;tabs-panel-active&quot;);b(&quot;.tabs&quot;,i).removeClass(&quot;tabs&quot;);g.parent().addClass(&quot;tabs&quot;);b(&quot;.quick-search&quot;,i).focus();return false}else{if(g.hasClass(&quot;select-all&quot;)){f=/#(.*)$/.exec(h.target.href);if(f&amp;&amp;f[1]){c=b(&quot;#&quot;+f[1]+&quot; .tabs-panel-active .menu-item-title input&quot;);if(c.length===c.filter(&quot;:checked&quot;).length){c.removeAttr(&quot;checked&quot;)}else{c.attr(&quot;checked&quot;,&quot;checked&quot;)}return false}}}})},initTabManager:function(){var h=b(&quot;.nav-tabs-wrapper&quot;),i=h.children(&quot;.nav-tabs&quot;),g=i.children(&quot;.nav-tab-active&quot;),l=i.children(&quot;.nav-tab&quot;),e=0,m,f,k,d,j=false;function c(){f=h.offset().left;m=f+h.width();g.makeTabVisible()}b.fn.extend({makeTabVisible:function(){var o=this.eq(0),p,n;if(!o.length){return}p=o.offset().left;n=p+o.outerWidth();if(n&gt;m){i.animate({&quot;margin-left&quot;:&quot;+=&quot;+(m-n)+&quot;px&quot;},&quot;fast&quot;)}else{if(p&lt;f){i.animate({&quot;margin-left&quot;:&quot;-=&quot;+(p-f)+&quot;px&quot;},&quot;fast&quot;)}}return o},isTabVisible:function(){var o=this.eq(0),p=o.offset().left,n=p+o.outerWidth();return(n&lt;=m&amp;&amp;p&gt;=f)?true:false}});l.each(function(){e+=b(this).outerWidth(true)});if(e&lt;=h.width()-i.css(&quot;padding-left&quot;).slice(0,-2)-i.css(&quot;padding-right&quot;).slice(0,-2)){return}i.css({&quot;margin-right&quot;:(-1*e)+&quot;px&quot;,padding:0});k=b('&lt;div class=&quot;nav-tabs-arrow nav-tabs-arrow-left&quot;&gt;&lt;a&gt;&amp;laquo;&lt;/a&gt;&lt;/div&gt;');d=b('&lt;div class=&quot;nav-tabs-arrow nav-tabs-arrow-right&quot;&gt;&lt;a&gt;&amp;raquo;&lt;/a&gt;&lt;/div&gt;');h.wrap('&lt;div class=&quot;nav-tabs-nav&quot;/&gt;').parent().prepend(k).append(d);c();b(window).resize(function(){if(j){return}j=true;setTimeout(function(){c();j=false},1000)});b.each([{arrow:k,next:&quot;next&quot;,last:&quot;first&quot;,operator:&quot;+=&quot;},{arrow:d,next:&quot;prev&quot;,last:&quot;last&quot;,operator:&quot;-=&quot;}],function(){var n=this;this.arrow.mousedown(function(){var p=l[n.last](),o=function(){if(!p.isTabVisible()){i.animate({&quot;margin-left&quot;:n.operator+&quot;90px&quot;},300,&quot;linear&quot;,o)}};o()}).mouseup(function(){var p,o;i.stop(true);p=l[n.last]();while((o=p[n.next]())&amp;&amp;o.length&amp;&amp;!o.isTabVisible()){p=o}p.makeTabVisible()})})},eventOnClickEditLink:function(c){var e,d=/#(.*)$/.exec(c.href);if(d&amp;&amp;d[1]){e=b(&quot;#&quot;+d[1]);if(0!=e.length){if(e.hasClass(&quot;menu-item-edit-inactive&quot;)){e.slideDown(&quot;fast&quot;).siblings(&quot;dl&quot;).andSelf().removeClass(&quot;menu-item-edit-inactive&quot;).addClass(&quot;menu-item-edit-active&quot;)}else{e.slideUp(&quot;fast&quot;).siblings(&quot;dl&quot;).andSelf().removeClass(&quot;menu-item-edit-active&quot;).addClass(&quot;menu-item-edit-inactive&quot;)}return false}}},eventOnClickCloseLink:function(c){b(c).closest(&quot;.menu-item-settings&quot;).siblings(&quot;dl&quot;).find(&quot;.item-edit&quot;).click();return false},eventOnClickMenuSave:function(c){var d=&quot;&quot;;b(&quot;#nav-menu-theme-locations select&quot;).each(function(){d+='&lt;input type=&quot;hidden&quot; name=&quot;'+this.name+'&quot; value=&quot;'+b(this).val()+'&quot; /&gt;'});b(&quot;#update-nav-menu&quot;).append(d);a.menuList.find(&quot;.menu-item-data-position&quot;).val(function(e){return e+1});return true},eventOnClickMenuDelete:function(c){if(confirm(navMenuL10n.warnDeleteMenu)){return true}else{return false}},eventOnClickMenuItemDelete:function(c){var f,e,d=this;e=/_wpnonce=([a-zA-Z0-9]*)$/.exec(c.href);if(e&amp;&amp;e[1]){f=parseInt(c.id.replace(&quot;delete-&quot;,&quot;&quot;),10);b.post(ajaxurl,{action:&quot;delete-menu-item&quot;,&quot;menu-item&quot;:f,_wpnonce:e[1]},function(g){if(&quot;1&quot;==g){d.removeMenuItem(document.getElementById(&quot;menu-item-&quot;+f))}});return false}return true},processQuickSearchQueryResponse:function(g,m,c){var h,e,j,f={},d=document.getElementById(&quot;nav-menu-meta&quot;),l=new RegExp(&quot;menu-item\\[([^\\]]*)&quot;,&quot;g&quot;),k=g.match(/&lt;li&gt;.*&lt;\/li&gt;/g);if(!k){b(&quot;.categorychecklist&quot;,c).html(&quot;&lt;li&gt;&lt;p&gt;&quot;+navMenuL10n.noResultsFound+&quot;&lt;/p&gt;&lt;/li&gt;&quot;);b(&quot;img.waiting&quot;,c).hide();return}h=k.length;while(h--){e=l.exec(k[h]);if(e&amp;&amp;e[1]){j=e[1];while(d.elements[&quot;menu-item[&quot;+j+&quot;][menu-item-type]&quot;]||f[j]){j--}f[j]=true;if(j!=e[1]){k[h]=k[h].replace(new RegExp(&quot;menu-item\\[&quot;+e[1]+&quot;\\]&quot;,&quot;g&quot;),&quot;menu-item[&quot;+j+&quot;]&quot;)}}}b(&quot;.categorychecklist&quot;,c).html(k.join(&quot;&quot;));b(&quot;img.waiting&quot;,c).hide()},removeMenuItem:function(d){d=b(d);var c=d.childMenuItems();d.addClass(&quot;deleting&quot;).fadeOut(350,function(){d.remove();c.shiftDepthClass(-1).updateParentMenuItemDBId()})},getListDataFromID:function(k,h){if(!k){return false}h=h||document;var d=[&quot;menu-item-db-id&quot;,&quot;menu-item-object-id&quot;,&quot;menu-item-object&quot;,&quot;menu-item-parent-id&quot;,&quot;menu-item-position&quot;,&quot;menu-item-type&quot;,&quot;menu-item-title&quot;,&quot;menu-item-url&quot;,&quot;menu-item-description&quot;,&quot;menu-item-attr-title&quot;,&quot;menu-item-target&quot;,&quot;menu-item-classes&quot;,&quot;menu-item-xfn&quot;],c={},e=h.getElementsByTagName(&quot;input&quot;),g=e.length,f;while(g--){f=d.length;while(f--){if(e[g]&amp;&amp;e[g].name&amp;&amp;&quot;menu-item[&quot;+k+&quot;][&quot;+d[f]+&quot;]&quot;==e[g].name){c[d[f]]=e[g].value}}}return c},depthToPx:function(c){return c*a.options.menuItemDepthPerLevel},pxToDepth:function(c){return Math.floor(c/a.options.menuItemDepthPerLevel)}};b(document).ready(function(){wpNavMenu.init()})})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (14830 => 14831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php        2010-05-24 08:40:02 UTC (rev 14830)
+++ trunk/wp-admin/menu.php        2010-05-24 09:23:56 UTC (rev 14831)
</span><span class="lines">@@ -149,11 +149,13 @@
</span><span class="cx"> if ( current_user_can( 'switch_themes') ) {
</span><span class="cx">         $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</span><span class="cx">                 $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
</span><del>-                $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php');
</del><ins>+                if ( current_theme_supports( 'nav-menus' ) || current_theme_supports( 'widgets' ) )
+                        $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php');
</ins><span class="cx"> } else {
</span><span class="cx">         $menu[60] = array( __('Appearance'), 'edit_theme_options', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</span><span class="cx">                 $submenu['themes.php'][5]  = array(__('Themes'), 'edit_theme_options', 'themes.php');
</span><del>-                $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php' );
</del><ins>+                if ( current_theme_supports( 'nav-menus' ) || current_theme_supports( 'widgets' ) )
+                        $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php' );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Add 'Editor' to the bottom of the Appearence menu.
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14830 => 14831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php        2010-05-24 08:40:02 UTC (rev 14830)
+++ trunk/wp-admin/nav-menus.php        2010-05-24 09:23:56 UTC (rev 14831)
</span><span class="lines">@@ -15,6 +15,9 @@
</span><span class="cx"> // Load all the nav menu interface functions
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
</span><span class="cx"> 
</span><ins>+if ( ! current_theme_supports( 'nav-menus' ) &amp;&amp; ! current_theme_supports( 'widgets' ) )
+        wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+
</ins><span class="cx"> // Permissions Check
</span><span class="cx"> if ( ! current_user_can('edit_theme_options') )
</span><span class="cx">         wp_die( __( 'Cheatin&amp;#8217; uh?' ) );
</span><span class="lines">@@ -270,28 +273,29 @@
</span><span class="cx">         case 'update':
</span><span class="cx">                 check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
</span><span class="cx"> 
</span><ins>+                // Update menu theme locations
+                set_theme_mod( 'nav_menu_locations', $_POST['menu-locations'] );
+
</ins><span class="cx">                 // Add Menu
</span><span class="cx">                 if ( 0 == $nav_menu_selected_id ) {
</span><del>-                        if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) {
-                                $new_menu_title = esc_html( $_POST['menu-name'] );
</del><ins>+                        $new_menu_title = esc_html( $_POST['menu-name'] );
</ins><span class="cx"> 
</span><del>-                                if ( $new_menu_title ) {
-                                        $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' =&gt; $new_menu_title) );
</del><ins>+                        if ( $new_menu_title ) {
+                                $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' =&gt; $new_menu_title) );
</ins><span class="cx"> 
</span><del>-                                        if ( is_wp_error( $_nav_menu_selected_id ) ) {
-                                                $messages[] = '&lt;div id=&quot;message&quot; class=&quot;error&quot;&gt;&lt;p&gt;' . $_nav_menu_selected_id-&gt;get_error_message() . '&lt;/p&gt;&lt;/div&gt;';
-                                        } else {
-                                                if ( ( $_menu_locations = get_registered_nav_menus() ) &amp;&amp; 1 == count( wp_get_nav_menus() ) )
-                                                        set_theme_mod( 'nav_menu_locations', array( key( $_menu_locations ) =&gt; $_nav_menu_selected_id ) );
-                                                unset( $_menu_locations );
-                                                $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
-                                                $nav_menu_selected_id = $_nav_menu_selected_id;
-                                                $nav_menu_selected_title = $_menu_object-&gt;name;
-                                                $messages[] = '&lt;div id=&quot;message&quot; class=&quot;updated&quot;&gt;&lt;p&gt;' . sprintf( __('The &lt;strong&gt;%s&lt;/strong&gt; menu has been successfully created.'), $nav_menu_selected_title ) . '&lt;/p&gt;&lt;/div&gt;';
-                                        }
</del><ins>+                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
+                                        $messages[] = '&lt;div id=&quot;message&quot; class=&quot;error&quot;&gt;&lt;p&gt;' . $_nav_menu_selected_id-&gt;get_error_message() . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                                 } else {
</span><del>-                                        $messages[] = '&lt;div id=&quot;message&quot; class=&quot;error&quot;&gt;&lt;p&gt;' . __('Please enter a valid menu name.') . '&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                                        if ( ( $_menu_locations = get_registered_nav_menus() ) &amp;&amp; 1 == count( wp_get_nav_menus() ) )
+                                                set_theme_mod( 'nav_menu_locations', array( key( $_menu_locations ) =&gt; $_nav_menu_selected_id ) );
+                                        unset( $_menu_locations );
+                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+                                        $nav_menu_selected_id = $_nav_menu_selected_id;
+                                        $nav_menu_selected_title = $_menu_object-&gt;name;
+                                        $messages[] = '&lt;div id=&quot;message&quot; class=&quot;updated&quot;&gt;&lt;p&gt;' . sprintf( __('The &lt;strong&gt;%s&lt;/strong&gt; menu has been successfully created.'), $nav_menu_selected_title ) . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                                 }
</span><ins>+                        } else {
+                                $messages[] = '&lt;div id=&quot;message&quot; class=&quot;error&quot;&gt;&lt;p&gt;' . __('Please enter a valid menu name.') . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                 // update existing menu
</span><span class="lines">@@ -425,8 +429,6 @@
</span><span class="cx">                 echo $message . &quot;\n&quot;;
</span><span class="cx">         endforeach;
</span><span class="cx">         ?&gt;
</span><del>-
-        &lt;?php if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) : ?&gt;
</del><span class="cx">         &lt;div id=&quot;nav-menus-frame&quot;&gt;
</span><span class="cx">         &lt;div id=&quot;menu-settings-column&quot; class=&quot;metabox-holder&quot;&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -517,7 +519,7 @@
</span><span class="cx">                                         &lt;/div&gt;&lt;!--END #nav-menu-header--&gt;
</span><span class="cx">                                         &lt;div id=&quot;post-body&quot;&gt;
</span><span class="cx">                                                 &lt;div id=&quot;post-body-content&quot;&gt;
</span><del>-                                                        &lt;?php if ( is_nav_menu( $nav_menu_selected_id ) &amp;&amp; ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) ) : ?&gt;
</del><ins>+                                                        &lt;?php if ( is_nav_menu( $nav_menu_selected_id ) ) : ?&gt;
</ins><span class="cx">                                                                 &lt;ul class=&quot;menu&quot; id=&quot;menu-to-edit&quot;&gt;
</span><span class="cx">                                                                 &lt;?php
</span><span class="cx">                                                                 $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  );
</span><span class="lines">@@ -542,7 +544,6 @@
</span><span class="cx">                 &lt;/div&gt;&lt;!-- /#menu-management --&gt;
</span><span class="cx">         &lt;/div&gt;&lt;!-- /#menu-management-liquid --&gt;
</span><span class="cx">         &lt;/div&gt;&lt;!-- /#nav-menus-frame--&gt;
</span><del>-        &lt;?php endif; // if menus supported in current theme ?&gt;
</del><span class="cx"> &lt;/div&gt;&lt;!-- /.wrap--&gt;
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (14830 => 14831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2010-05-24 08:40:02 UTC (rev 14830)
+++ trunk/wp-includes/script-loader.php        2010-05-24 09:23:56 UTC (rev 14831)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">                 ) );
</span><span class="cx"> 
</span><span class="cx">                 // Custom Navigation
</span><del>-                $scripts-&gt;add( 'nav-menu', &quot;/wp-admin/js/nav-menu$suffix.js&quot;, false, '20100521' );
</del><ins>+                $scripts-&gt;add( 'nav-menu', &quot;/wp-admin/js/nav-menu$suffix.js&quot;, false, '20100524' );
</ins><span class="cx">                 $scripts-&gt;localize( 'nav-menu', 'navMenuL10n', array(
</span><span class="cx">                         'home' =&gt; _x('Home', 'nav menu home label'),
</span><span class="cx">                         'homeurl' =&gt; home_url('/'),
</span></span></pre>
</div>
</div>

</body>
</html>