<!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>[13266] trunk: Make js noConflict compat.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13266">13266</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-20 23:58:00 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make js noConflict compat. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
<li><a href="#trunkwpadminjscustomnavigationdefaultitemsdevjs">trunk/wp-admin/js/custom-navigation-default-items.dev.js</a></li>
<li><a href="#trunkwpadminjscustomnavigationdefaultitemsjs">trunk/wp-admin/js/custom-navigation-default-items.js</a></li>
<li><a href="#trunkwpadminjscustomnavigationdynamicfunctionsdevjs">trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js</a></li>
<li><a href="#trunkwpadminjscustomnavigationdynamicfunctionsjs">trunk/wp-admin/js/custom-navigation-dynamic-functions.js</a></li>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.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="trunkwpadmincustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-navigation.php (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-admin/custom-navigation.php 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -45,22 +45,22 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><del>- <div id="no-js"><h3>You do not have JavaScript enabled in your browser. Please enabled it to access the Custom Menu functionality.</h3></div>
</del><ins>+ <div id="no-js"><h3>You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.</h3></div>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $messagesdiv = '';
</span><span class="cx"> $menu_id_in_edit = 0;
</span><span class="cx">
</span><del>- //Get the theme name
</del><ins>+ // Get the theme name
</ins><span class="cx"> $themename = get_current_theme();
</span><span class="cx">
</span><del>- //CHECK which menu is selected and if menu is in edit already
</del><ins>+ // Check which menu is selected and if menu is in edit already
</ins><span class="cx"> if ( isset( $_POST['switch_menu'] ) )
</span><span class="cx"> $menu_selected_id = $_POST['menu_select'];
</span><span class="cx"> elseif ( isset( $_POST['menu_id_in_edit'] ) )
</span><span class="cx"> $menu_selected_id = $_POST['menu_id_in_edit'];
</span><span class="cx">
</span><del>- //Default Menu to show
</del><ins>+ // Default Menu to show
</ins><span class="cx"> $custom_menus = get_terms( 'menu', array( 'hide_empty' => false ) );
</span><span class="cx"> if ( !empty( $custom_menus ) )
</span><span class="cx"> $menu_selected_id = $custom_menus[0]->term_id;
</span><span class="lines">@@ -84,7 +84,8 @@
</span><span class="cx"> $postCounter = $_POST['licount'];
</span><span class="cx"> else
</span><span class="cx"> $postCounter = 0;
</span><del>-
</del><ins>+
+ // Create a new menu. Menus are stored as terms in the 'menu' taxonomy.
</ins><span class="cx"> if ( isset( $_POST['add_menu'] ) ) {
</span><span class="cx"> $insert_menu_name = $_POST['add_menu_name'];
</span><span class="cx">
</span><span class="lines">@@ -106,21 +107,19 @@
</span><span class="cx"> } else {
</span><span class="cx"> $messagesdiv = '<div id="message" class="error fade below-h2"><p>Please enter a valid Menu name</p></div>';
</span><span class="cx"> }
</span><del>-
-
</del><span class="cx"> }
</span><span class="cx">
</span><del>- if (isset($_POST['reset_wp_menu'])) {
</del><ins>+ if ( isset($_POST['reset_wp_menu']) ) {
</ins><span class="cx"> $success = wp_custom_nav_reset();
</span><span class="cx"> if ($success) {
</span><del>- //DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename.'s Custom Menu has been RESET!</p></div>';
- //GET reset menu id
- $custom_menus = array();
- $menu_selected_id = 0;
</del><ins>+ // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename.'s Custom Menu has been RESET!</p></div>';
+ // GET reset menu id
+ $custom_menus = array();
+ $menu_selected_id = 0;
</ins><span class="cx"> } else {
</span><del>- //DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
- $messagesdiv = '<div id="message" class="error fade below-h2"><p>'.$themename.'s Custom Menu could not be RESET. Please try again.</p></div>';
</del><ins>+ // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>'.$themename.'s Custom Menu could not be RESET. Please try again.</p></div>';
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( $postCounter > 0 && $menu_selected_id > 0 ) {
</span><span class="cx"> $menu_objects = get_objects_in_term( $menu_selected_id, 'menu' );
</span><span class="lines">@@ -285,7 +284,7 @@
</span><span class="cx"> //DISPLAY SELECT OPTIONS
</span><span class="cx"> foreach( $custom_menus as $menu ) {
</span><span class="cx"> $menu_term = get_term( $menu, 'menu' );
</span><del>- if ( ( $menu_id_in_edit == $menu ) || ( $menu_selected_id == $menu ) )
</del><ins>+ if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) )
</ins><span class="cx"> $selected_option = 'selected="selected"';
</span><span class="cx"> else
</span><span class="cx"> $selected_option = '';
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationdefaultitemsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-default-items.dev.js (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-default-items.dev.js 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-admin/js/custom-navigation-default-items.dev.js 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Init Functions
</span><span class="cx"> */
</span><del>-$(function()
</del><ins>+jQuery(function($)
</ins><span class="cx"> {
</span><span class="cx"> //Makes dialog box
</span><span class="cx"> $("#dialog-confirm").dialog({
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationdefaultitemsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-default-items.js (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-default-items.js 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-admin/js/custom-navigation-default-items.js 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -1 +1 @@
</span><del>-$(function(){$("#dialog-confirm").dialog({autoOpen:false,resizable:false,height:210,width:400,modal:true,buttons:{Save:function(){titletosave=$("#edittitle").attr("value");linktosave=$("#editlink").attr("value");anchortitletosave=$("#editanchortitle").attr("value");newwindowtosave=$("#editnewwindow").attr("value");desctosave=$("#editdescription").attr("value");$("#title"+$(this).dialog("option","itemID")).attr("value",titletosave);$("#linkurl"+$(this).dialog("option","itemID")).attr("value",linktosave);$("#anchortitle"+$(this).dialog("option","itemID")).attr("value",anchortitletosave);$("#newwindow"+$(this).dialog("option","itemID")).attr("value",newwindowtosave);$("#description"+$(this).dialog("option","itemID")).attr("value",desctosave);$("#menu-"+$(this).dialog("option","itemID")+" > dl > dt > span.title").text(titletosave);$("#view"+ +$(this).dialog("option","itemID")).attr("href",linktosave);$(this).dialog("close")},Cancel:function(){$(this).dialog("close")}}});$("#message").animate({opacity:1},2000).fadeOut(300,function(){$(this).remove()});$("#custom-nav li").prepend('<div class="dropzone"></div>');$("#custom-nav li").draggable({handle:" > dl",opacity:0.8,addClasses:false,helper:"clone",zIndex:100});$("#custom-nav dl, #custom-nav .dropzone").droppable({accept:"#custom-nav li",tolerance:"pointer",drop:function(f,d){var a=$(this).parent();var g=!$(this).hasClass("dropzone");if(g&&a.children("ul").length==0){a.append('<ul id="sub-menu" />')}if(g){a.children("ul").append(d.draggable)}else{a.before(d.draggable)}a.find("dl,.dropzone").css({backgroundColor:"",borderColor:""});var c=d.draggable.attr("value");var b=a.attr("value");a.find("#menu-"+c).find("#parent"+c).val(b);$(this).parent().find("dt").removeAttr("style");$(this).parent().find("div:first").removeAttr("style")},over:function(){if($(this).attr("class")=="dropzone ui-droppable"){$(this).parent().find("div:first").css("background","none").css("height","50px")}else{if($(this).attr("class")=="ui-droppable"){$(this).parent().find("dt:first").css("background","#d8d8d8")}else{}}var a=$(this).parent().attr("id")},out:function(){$(this).parent().find("dt").removeAttr("style");$(this).parent().find("div:first").removeAttr("style");$(this).filter(".dropzone").css({borderColor:""})},deactivate:function(){}});$("#save_top").click(function(){updatepostdata()});$("#save_bottom").click(function(){updatepostdata()})});
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(function(a){a("#dialog-confirm").dialog({autoOpen:false,resizable:false,height:210,width:400,modal:true,buttons:{Save:function(){titletosave=a("#edittitle").attr("value");linktosave=a("#editlink").attr("value");anchortitletosave=a("#editanchortitle").attr("value");newwindowtosave=a("#editnewwindow").attr("value");desctosave=a("#editdescription").attr("value");a("#title"+a(this).dialog("option","itemID")).attr("value",titletosave);a("#linkurl"+a(this).dialog("option","itemID")).attr("value",linktosave);a("#anchortitle"+a(this).dialog("option","itemID")).attr("value",anchortitletosave);a("#newwindow"+a(this).dialog("option","itemID")).attr("value",newwindowtosave);a("#description"+a(this).dialog("option","itemID")).attr("value",desctosave);a("#menu-"+a(this).dialog("option","itemID")+" > dl > dt > span.title").text(titletosave);a("#view"+ +a(this).dialog("option","itemID")).attr("href",linktosave);a(this).dialog("close")},Cancel:function(){a(this).dialog("close")}}});a("#message").animate({opacity:1},2000).fadeOut(300,function(){a(this).remove()});a("#custom-nav li").prepend('<div class="dropzone"></div>');a("#custom-nav li").draggable({handle:" > dl",opacity:0.8,addClasses:false,helper:"clone",zIndex:100});a("#custom-nav dl, #custom-nav .dropzone").droppable({accept:"#custom-nav li",tolerance:"pointer",drop:function(g,f){var b=a(this).parent();var h=!a(this).hasClass("dropzone");if(h&&b.children("ul").length==0){b.append('<ul id="sub-menu" />')}if(h){b.children("ul").append(f.draggable)}else{b.before(f.draggable)}b.find("dl,.dropzone").css({backgroundColor:"",borderColor:""});var d=f.draggable.attr("value");var c=b.attr("value");b.find("#menu-"+d).find("#parent"+d).val(c);a(this).parent().find("dt").removeAttr("style");a(this).parent().find("div:first").removeAttr("style")},over:function(){if(a(this).attr("class")=="dropzone ui-droppable"){a(this).parent().find("div:first").css("background","none").css("height","50px")}else{if(a(this).attr("class")=="ui-droppable"){a(this).parent().find("dt:first").css("background","#d8d8d8")}else{}}var b=a(this).parent().attr("id")},out:function(){a(this).parent().find("dt").removeAttr("style");a(this).parent().find("div:first").removeAttr("style");a(this).filter(".dropzone").css({borderColor:""})},deactivate:function(){}});a("#save_top").click(function(){updatepostdata()});a("#save_bottom").click(function(){updatepostdata()})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationdynamicfunctionsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -34,21 +34,21 @@
</span><span class="cx"> function edititem(o)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- itemTitle = $('#title' + o).attr('value');
- itemURL = $('#linkurl' + o).attr('value');
- itemAnchorTitle = $('#anchortitle' + o).attr('value');
- itemNewWindow = $('#newwindow' + o).attr('value');
- itemDesc = $('#description' + o).attr('value');
</del><ins>+ itemTitle = jQuery('#title' + o).attr('value');
+ itemURL = jQuery('#linkurl' + o).attr('value');
+ itemAnchorTitle = jQuery('#anchortitle' + o).attr('value');
+ itemNewWindow = jQuery('#newwindow' + o).attr('value');
+ itemDesc = jQuery('#description' + o).attr('value');
</ins><span class="cx">
</span><del>- $('#dialog-confirm').dialog( 'option' , 'itemID' , o )
</del><ins>+ jQuery('#dialog-confirm').dialog( 'option' , 'itemID' , o )
</ins><span class="cx">
</span><del>- $('#dialog-confirm').dialog('open');
</del><ins>+ jQuery('#dialog-confirm').dialog('open');
</ins><span class="cx">
</span><del>- $('#edittitle').attr('value', itemTitle);
- $('#editlink').attr('value', itemURL);
- $('#editanchortitle').attr('value', itemAnchorTitle);
- $("#editnewwindow option[value='" + itemNewWindow + "']").attr('selected', 'selected');
- $('#editdescription').attr('value', itemDesc);
</del><ins>+ jQuery('#edittitle').attr('value', itemTitle);
+ jQuery('#editlink').attr('value', itemURL);
+ jQuery('#editanchortitle').attr('value', itemAnchorTitle);
+ jQuery("#editnewwindow option[value='" + itemNewWindow + "']").attr('selected', 'selected');
+ jQuery('#editdescription').attr('value', itemDesc);
</ins><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -59,24 +59,24 @@
</span><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> var i = 0;
</span><del>- $("#custom-nav").find("li").each(function(i) {
</del><ins>+ jQuery("#custom-nav").find("li").each(function(i) {
</ins><span class="cx"> i = i + 1;
</span><del>- var j = $(this).attr('value');
</del><ins>+ var j = jQuery(this).attr('value');
</ins><span class="cx">
</span><del>- $(this).find('#position' + j).attr('value', i);
- $(this).attr('id','menu-' + i);
- $(this).attr('value', i);
</del><ins>+ jQuery(this).find('#position' + j).attr('value', i);
+ jQuery(this).attr('id','menu-' + i);
+ jQuery(this).attr('value', i);
</ins><span class="cx">
</span><del>- $(this).find('#dbid' + j).attr('name','dbid' + i);
- $(this).find('#dbid' + j).attr('id','dbid' + i);
</del><ins>+ jQuery(this).find('#dbid' + j).attr('name','dbid' + i);
+ jQuery(this).find('#dbid' + j).attr('id','dbid' + i);
</ins><span class="cx">
</span><del>- $(this).find('#postmenu' + j).attr('name','postmenu' + i);
- $(this).find('#postmenu' + j).attr('id','postmenu' + i);
</del><ins>+ jQuery(this).find('#postmenu' + j).attr('name','postmenu' + i);
+ jQuery(this).find('#postmenu' + j).attr('id','postmenu' + i);
</ins><span class="cx">
</span><del>- var p = $(this).find('#parent' + j).parent().parent().parent().attr('value');
</del><ins>+ var p = jQuery(this).find('#parent' + j).parent().parent().parent().attr('value');
</ins><span class="cx">
</span><del>- $(this).find('#parent' + j).attr('name','parent' + i);
- $(this).find('#parent' + j).attr('id','parent' + i);
</del><ins>+ jQuery(this).find('#parent' + j).attr('name','parent' + i);
+ jQuery(this).find('#parent' + j).attr('id','parent' + i);
</ins><span class="cx"> if (p) {
</span><span class="cx"> //Do nothing
</span><span class="cx"> }
</span><span class="lines">@@ -85,37 +85,37 @@
</span><span class="cx"> p = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $(this).find('#parent' + j).attr('value', p);
</del><ins>+ jQuery(this).find('#parent' + j).attr('value', p);
</ins><span class="cx">
</span><del>- $(this).find('#title' + j).attr('name','title' + i);
- $(this).find('#title' + j).attr('id','title' + i);
</del><ins>+ jQuery(this).find('#title' + j).attr('name','title' + i);
+ jQuery(this).find('#title' + j).attr('id','title' + i);
</ins><span class="cx">
</span><del>- $(this).find('#linkurl' + j).attr('name','linkurl' + i);
- $(this).find('#linkurl' + j).attr('id','linkurl' + i);
</del><ins>+ jQuery(this).find('#linkurl' + j).attr('name','linkurl' + i);
+ jQuery(this).find('#linkurl' + j).attr('id','linkurl' + i);
</ins><span class="cx">
</span><del>- $(this).find('#description' + j).attr('name','description' + i);
- $(this).find('#description' + j).attr('id','description' + i);
</del><ins>+ jQuery(this).find('#description' + j).attr('name','description' + i);
+ jQuery(this).find('#description' + j).attr('id','description' + i);
</ins><span class="cx">
</span><del>- $(this).find('#icon' + j).attr('name','icon' + i);
- $(this).find('#icon' + j).attr('id','icon' + i);
</del><ins>+ jQuery(this).find('#icon' + j).attr('name','icon' + i);
+ jQuery(this).find('#icon' + j).attr('id','icon' + i);
</ins><span class="cx">
</span><del>- $(this).find('#position' + j).attr('name','position' + i);
- $(this).find('#position' + j).attr('id','position' + i);
</del><ins>+ jQuery(this).find('#position' + j).attr('name','position' + i);
+ jQuery(this).find('#position' + j).attr('id','position' + i);
</ins><span class="cx">
</span><del>- $(this).find('#linktype' + j).attr('name','linktype' + i);
- $(this).find('#linktype' + j).attr('id','linktype' + i);
</del><ins>+ jQuery(this).find('#linktype' + j).attr('name','linktype' + i);
+ jQuery(this).find('#linktype' + j).attr('id','linktype' + i);
</ins><span class="cx">
</span><del>- $(this).find('#anchortitle' + j).attr('name','anchortitle' + i);
- $(this).find('#anchortitle' + j).attr('id','anchortitle' + i);
</del><ins>+ jQuery(this).find('#anchortitle' + j).attr('name','anchortitle' + i);
+ jQuery(this).find('#anchortitle' + j).attr('id','anchortitle' + i);
</ins><span class="cx">
</span><del>- $(this).find('#newwindow' + j).attr('name','newwindow' + i);
- $(this).find('#newwindow' + j).attr('id','newwindow' + i);
</del><ins>+ jQuery(this).find('#newwindow' + j).attr('name','newwindow' + i);
+ jQuery(this).find('#newwindow' + j).attr('id','newwindow' + i);
</ins><span class="cx">
</span><del>- $(this).find('dl > dt > span > #remove' + j).attr('value', i);
- $(this).find('dl > dt > span > #remove' + j).attr('onClick', 'removeitem(' + i + ')');
- $(this).find('dl > dt > span > #remove' + j).attr('id','remove' + i);
</del><ins>+ jQuery(this).find('dl > dt > span > #remove' + j).attr('value', i);
+ jQuery(this).find('dl > dt > span > #remove' + j).attr('onClick', 'removeitem(' + i + ')');
+ jQuery(this).find('dl > dt > span > #remove' + j).attr('id','remove' + i);
</ins><span class="cx">
</span><del>- $('#licount').attr('value',i);
</del><ins>+ jQuery('#licount').attr('value',i);
</ins><span class="cx">
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -210,14 +210,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //Notification Message
</span><del>- $('.maintitle').after('<div id="message" class="updated fade below-h2"><p>Menu Item added!</p></div>');
- $('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ $(this).remove();});
</del><ins>+ jQuery('.maintitle').after('<div id="message" class="updated fade below-h2"><p>Menu Item added!</p></div>');
+ jQuery('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ jQuery(this).remove();});
</ins><span class="cx">
</span><span class="cx"> //Appends HTML to the menu
</span><del>- $('#custom-nav').append('<li id="menu-' + randomnumber + '" value="' + randomnumber + '"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="title">' + inputvaluevarname + '</span><span class="controls"><span class="type">' + additemtype + '</span><a id="edit' + randomnumber + '" onclick="edititem(' + randomnumber + ')" value="' + randomnumber +'"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="' + templatedir + '/wp-admin/images/ico-edit.png" /></a> <a id="remove' + randomnumber + '" onclick="removeitem(' + randomnumber + ')" value="' + randomnumber +'"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="' + templatedir + '/wp-admin/images/ico-close.png" /></a> <a href="' + inputvaluevarurl + '" target="_blank"><img alt="View Custom Link" title="View Custom Link" src="' + templatedir + '/wp-admin/images/ico-viewpage.png" /></a></span></dt></dl><a class="hide" href="' + inputvaluevarurl + '">' + inputvaluevarname + '</a><input type="hidden" name="postmenu' + randomnumber + '" id="postmenu' + randomnumber + '" value="' + inputitemid + '" /><input type="hidden" name="parent' + randomnumber + '" id="parent' + randomnumber + '" value="' + inputparentid + '" /><input type="hidden" name="title' + randomnumber + '" id="title' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="linkurl' + randomnumber + '" id="linkurl' + randomnumber + '" value="' + inputvaluevarurl + '" /><input type="hidden" name="description' + randomnumber + '" id="description' + randomnumber + '" value="' + inputdescription + '" /><input type="hidden" name="icon' + randomnumber + '" id="icon' + randomnumber + '" value="' + inputicon + '" /><input type="hidden" name="position' + randomnumber + '" id="position' + randomnumber + '" value="' + randomnumber + '" /><input type="hidden" name="linktype' + randomnumber + '" id="linktype' + randomnumber + '" value="' + inputlinktype + '" /><input type="hidden" name="anchortitle' + randomnumber + '" id="anchortitle' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="newwindow' + randomnumber + '" id="newwindow' + randomnumber + '" value="0" /></li>');
</del><ins>+ jQuery('#custom-nav').append('<li id="menu-' + randomnumber + '" value="' + randomnumber + '"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="title">' + inputvaluevarname + '</span><span class="controls"><span class="type">' + additemtype + '</span><a id="edit' + randomnumber + '" onclick="edititem(' + randomnumber + ')" value="' + randomnumber +'"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="' + templatedir + '/wp-admin/images/ico-edit.png" /></a> <a id="remove' + randomnumber + '" onclick="removeitem(' + randomnumber + ')" value="' + randomnumber +'"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="' + templatedir + '/wp-admin/images/ico-close.png" /></a> <a href="' + inputvaluevarurl + '" target="_blank"><img alt="View Custom Link" title="View Custom Link" src="' + templatedir + '/wp-admin/images/ico-viewpage.png" /></a></span></dt></dl><a class="hide" href="' + inputvaluevarurl + '">' + inputvaluevarname + '</a><input type="hidden" name="postmenu' + randomnumber + '" id="postmenu' + randomnumber + '" value="' + inputitemid + '" /><input type="hidden" name="parent' + randomnumber + '" id="parent' + randomnumber + '" value="' + inputparentid + '" /><input type="hidden" name="title' + randomnumber + '" id="title' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="linkurl' + randomnumber + '" id="linkurl' + randomnumber + '" value="' + inputvaluevarurl + '" /><input type="hidden" name="description' + randomnumber + '" id="description' + randomnumber + '" value="' + inputdescription + '" /><input type="hidden" name="icon' + randomnumber + '" id="icon' + randomnumber + '" value="' + inputicon + '" /><input type="hidden" name="position' + randomnumber + '" id="position' + randomnumber + '" value="' + randomnumber + '" /><input type="hidden" name="linktype' + randomnumber + '" id="linktype' + randomnumber + '" value="' + inputlinktype + '" /><input type="hidden" name="anchortitle' + randomnumber + '" id="anchortitle' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="newwindow' + randomnumber + '" id="newwindow' + randomnumber + '" value="0" /></li>');
</ins><span class="cx">
</span><span class="cx"> //make menu item draggable
</span><del>- $('#menu-' + randomnumber + '').draggable(
</del><ins>+ jQuery('#menu-' + randomnumber + '').draggable(
</ins><span class="cx"> {
</span><span class="cx"> handle: ' > dl',
</span><span class="cx"> opacity: .8,
</span><span class="lines">@@ -227,13 +227,13 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> //make menu item droppable
</span><del>- $('#menu-' + randomnumber + ' dl, #menu-' + randomnumber + ' .dropzone').droppable({
</del><ins>+ jQuery('#menu-' + randomnumber + ' dl, #menu-' + randomnumber + ' .dropzone').droppable({
</ins><span class="cx"> accept: '#' + randomnumber + ', #custom-nav li',
</span><span class="cx"> tolerance: 'pointer',
</span><span class="cx"> drop: function(e, ui)
</span><span class="cx"> {
</span><del>- var li = $(this).parent();
- var child = !$(this).hasClass('dropzone');
</del><ins>+ var li = jQuery(this).parent();
+ var child = !jQuery(this).hasClass('dropzone');
</ins><span class="cx"> //Append UL to first child
</span><span class="cx"> if (child && li.children('ul').length == 0)
</span><span class="cx"> {
</span><span class="lines">@@ -254,34 +254,34 @@
</span><span class="cx"> var draggablevalue = ui.draggable.attr('value');
</span><span class="cx"> var droppablevalue = li.attr('value');
</span><span class="cx"> li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
</span><del>- $(this).parent().find("dt").removeAttr('style');
- $(this).parent().find("div:first").removeAttr('style');
</del><ins>+ jQuery(this).parent().find("dt").removeAttr('style');
+ jQuery(this).parent().find("div:first").removeAttr('style');
</ins><span class="cx">
</span><span class="cx"> },
</span><span class="cx"> over: function()
</span><span class="cx"> {
</span><span class="cx"> //Add child
</span><del>- if ($(this).attr('class') == 'dropzone ui-droppable')
</del><ins>+ if (jQuery(this).attr('class') == 'dropzone ui-droppable')
</ins><span class="cx"> {
</span><del>- $(this).parent().find("div:first").css('background', 'none').css('height', '50px');
</del><ins>+ jQuery(this).parent().find("div:first").css('background', 'none').css('height', '50px');
</ins><span class="cx"> }
</span><span class="cx"> //Add above
</span><del>- else if ($(this).attr('class') == 'ui-droppable')
</del><ins>+ else if (jQuery(this).attr('class') == 'ui-droppable')
</ins><span class="cx"> {
</span><del>- $(this).parent().find("dt:first").css('background', '#d8d8d8');
</del><ins>+ jQuery(this).parent().find("dt:first").css('background', '#d8d8d8');
</ins><span class="cx"> }
</span><span class="cx"> //do nothing
</span><span class="cx"> else {
</span><span class="cx">
</span><span class="cx"> }
</span><del>- var parentid = $(this).parent().attr('id');
</del><ins>+ var parentid = jQuery(this).parent().attr('id');
</ins><span class="cx">
</span><span class="cx"> },
</span><span class="cx"> out: function()
</span><span class="cx"> {
</span><del>- $(this).parent().find("dt").removeAttr('style');
- $(this).parent().find("div:first").removeAttr('style');
- $(this).filter('.dropzone').css({ borderColor: '' });
</del><ins>+ jQuery(this).parent().find("dt").removeAttr('style');
+ jQuery(this).parent().find("div:first").removeAttr('style');
+ jQuery(this).filter('.dropzone').css({ borderColor: '' });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationdynamicfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-dynamic-functions.js (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-dynamic-functions.js 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-admin/js/custom-navigation-dynamic-functions.js 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -1 +1 @@
</span><del>-function removeitem(c){var b=document.getElementById("menu-"+c);if(b){var a=document.getElementById("menu-"+c).parentNode;throwaway_node=a.removeChild(b)}updatepostdata()}function edititem(a){itemTitle=$("#title"+a).attr("value");itemURL=$("#linkurl"+a).attr("value");itemAnchorTitle=$("#anchortitle"+a).attr("value");itemNewWindow=$("#newwindow"+a).attr("value");itemDesc=$("#description"+a).attr("value");$("#dialog-confirm").dialog("option","itemID",a);$("#dialog-confirm").dialog("open");$("#edittitle").attr("value",itemTitle);$("#editlink").attr("value",itemURL);$("#editanchortitle").attr("value",itemAnchorTitle);$("#editnewwindow option[value='"+itemNewWindow+"']").attr("selected","selected");$("#editdescription").attr("value",itemDesc)}function updatepostdata(){var a=0;$("#custom-nav").find("li").each(function(c){c=c+1;var b=$(this).attr("value");$(this).find("#position"+b).attr("value",c);$(this).attr("id","menu-"+c);$(this).attr("value",c);$(this).find("#dbid"+b).attr("name","dbid"+c);$(this).find("#dbid"+b).attr("id","dbid"+c);$(this).find("#postmenu"+b).attr("name","postmenu"+c);$(this).find("#postmenu"+b).attr("id","postmenu"+c);var d=$(this).find("#parent"+b).parent().parent().parent().attr("value");$(this).find("#parent"+b).attr("name","parent"+c);$(this).find("#parent"+b).attr("id","parent"+c);if(d){}else{d=0}$(this).find("#parent"+b).attr("value",d);$(this).find("#title"+b).attr("name","title"+c);$(this).find("#title"+b).attr("id","title"+c);$(this).find("#linkurl"+b).attr("name","linkurl"+c);$(this).find("#linkurl"+b).attr("id","linkurl"+c);$(this).find("#description"+b).attr("name","description"+c);$(this).find("#description"+b).attr("id","description"+c);$(this).find("#icon"+b).attr("name","icon"+c);$(this).find("#icon"+b).attr("id","icon"+c);$(this).find("#position"+b).attr("name","position"+c);$(this).find("#position"+b).attr("id","position"+c);$(this).find("#linktype"+b).attr("name","linktype"+c);$(this).find("#linktype"+b).attr("id","linktype"+c);$(this).find("#anchortitle"+b).attr("name","anchortitle"+c);$(this).find("#anchortitle"+b).attr("id","anchortitle"+c);$(this).find("#newwindow"+b).attr("name","newwindow"+c);$(this).find("#newwindow"+b).attr("id","newwindow"+c);$(this).find("dl > dt > span > #remove"+b).attr("value",c);$(this).find("dl > dt > span > #remove"+b).attr("onClick","removeitem("+c+")");$(this).find("dl > dt > span > #remove"+b).attr("id","remove"+c);$("#licount").attr("value",c)})}function appendToList(b,s,d,n,h,l,e){var k="";var c="";var r="";var o="";var i="";var a="";if(s=="Custom"){k=document.getElementById("custom_menu_item_name").value;c=document.getElementById("custom_menu_item_url").value;r="";o="";inputlinktype="custom";i=document.getElementById("custom_menu_item_description").value}else{if(s=="Page"){k=htmlentities(d.toString());c=n.toString();r=h.toString();o="0";inputlinktype="page";i=htmlentities(e.toString())}else{if(s=="Category"){k=htmlentities(d.toString());c=n.toString();r=h.toString();o="0";inputlinktype="category";i=htmlentities(e.toString())}else{k="";k="";r="";o="";inputlinktype="custom";i=""}}}var g=document.getElementById("custom-nav").getElementsByTagName("li").length;var p=g;var m=0;try{var q=document.getElementById("menu-"+p.toString()).value}catch(f){m=1}while(m==0){p=p+1;try{var j=document.getElementById("menu-"+p.toString()).value}catch(f){m=1}}$(".maintitle").after('<div id="message" class="updated fade below-h2"><p>Menu Item added!</p></div>');$("#message").animate({opacity:1},2000).fadeOut(300,function(){$(this).remove()});$("#custom-nav").append('<li id="menu-'+p+'" value="'+p+'"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="title">'+k+'</span><span class="controls"><span class="type">'+s+'</span><a id="edit'+p+'" onclick="edititem('+p+')" value="'+p+'"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="'+b+'/wp-admin/images/ico-edit.png" /></a> <a id="remove'+p+'" onclick="removeitem('+p+')" value="'+p+'"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="'+b+'/wp-admin/images/ico-close.png" /></a> <a href="'+c+'" target="_blank"><img alt="View Custom Link" title="View Custom Link" src="'+b+'/wp-admin/images/ico-viewpage.png" /></a></span></dt></dl><a class="hide" href="'+c+'">'+k+'</a><input type="hidden" name="postmenu'+p+'" id="postmenu'+p+'" value="'+r+'" /><input type="hidden" name="parent'+p+'" id="parent'+p+'" value="'+o+'" /><input type="hidden" name="title'+p+'" id="title'+p+'" value="'+k+'" /><input type="hidden" name="linkurl'+p+'" id="linkurl'+p+'" value="'+c+'" /><input type="hidden" name="description'+p+'" id="description'+p+'" value="'+i+'" /><input type="hidden" name="icon'+p+'" id="icon'+p+'" value="'+a+'" /><input type="hidden" name="position'+p+'" id="position'+p+'" value="'+p+'" /><input type="hidden" name="linktype'+p+'" id="linktype'+p+'" value="'+inputlinktype+'" /><input type="hidden" name="anchortitle'+p+'" id="anchortitle'+p+'" value="'+k+'" /><input type="hidden" name="newwindow'+p+'" id="newwindow'+p+'" value="0" /></li>');$("#menu-"+p+"").draggable({handle:" > dl",opacity:0.8,addClasses:false,helper:"clone",zIndex:100});$("#menu-"+p+" dl, #menu-"+p+" .dropzone").droppable({accept:"#"+p+", #custom-nav li",tolerance:"pointer",drop:function(x,w){var t=$(this).parent();var y=!$(this).hasClass("dropzone");if(y&&t.children("ul").length==0){t.append("<ul/>")}if(y){t.children("ul").append(w.draggable)}else{t.before(w.draggable)}t.find("dl,.dropzone").css({backgroundColor:"",borderColor:""});var v=w.draggable.attr("value");var u=t.attr("value");t.find("#menu-"+v).find("#parent"+v).val(u);$(this).parent().find("dt").removeAttr("style");$(this).parent().find("div:first").removeAttr("style")},over:function(){if($(this).attr("class")=="dropzone ui-droppable"){$(this).parent().find("div:first").css("background","none").css("height","50px")}else{if($(this).attr("class")=="ui-droppable"){$(this).parent().find("dt:first").css("background","#d8d8d8")}else{}}var t=$(this).parent().attr("id")},out:function(){$(this).parent().find("dt").removeAttr("style");$(this).parent().find("div:first").removeAttr("style");$(this).filter(".dropzone").css({borderColor:""})}});updatepostdata()};
</del><span class="cx">\ No newline at end of file
</span><ins>+function removeitem(c){var b=document.getElementById("menu-"+c);if(b){var a=document.getElementById("menu-"+c).parentNode;throwaway_node=a.removeChild(b)}updatepostdata()}function edititem(a){itemTitle=jQuery("#title"+a).attr("value");itemURL=jQuery("#linkurl"+a).attr("value");itemAnchorTitle=jQuery("#anchortitle"+a).attr("value");itemNewWindow=jQuery("#newwindow"+a).attr("value");itemDesc=jQuery("#description"+a).attr("value");jQuery("#dialog-confirm").dialog("option","itemID",a);jQuery("#dialog-confirm").dialog("open");jQuery("#edittitle").attr("value",itemTitle);jQuery("#editlink").attr("value",itemURL);jQuery("#editanchortitle").attr("value",itemAnchorTitle);jQuery("#editnewwindow option[value='"+itemNewWindow+"']").attr("selected","selected");jQuery("#editdescription").attr("value",itemDesc)}function updatepostdata(){var a=0;jQuery("#custom-nav").find("li").each(function(c){c=c+1;var b=jQuery(this).attr("value");jQuery(this).find("#position"+b).attr("value",c);jQuery(this).attr("id","menu-"+c);jQuery(this).attr("value",c);jQuery(this).find("#dbid"+b).attr("name","dbid"+c);jQuery(this).find("#dbid"+b).attr("id","dbid"+c);jQuery(this).find("#postmenu"+b).attr("name","postmenu"+c);jQuery(this).find("#postmenu"+b).attr("id","postmenu"+c);var d=jQuery(this).find("#parent"+b).parent().parent().parent().attr("value");jQuery(this).find("#parent"+b).attr("name","parent"+c);jQuery(this).find("#parent"+b).attr("id","parent"+c);if(d){}else{d=0}jQuery(this).find("#parent"+b).attr("value",d);jQuery(this).find("#title"+b).attr("name","title"+c);jQuery(this).find("#title"+b).attr("id","title"+c);jQuery(this).find("#linkurl"+b).attr("name","linkurl"+c);jQuery(this).find("#linkurl"+b).attr("id","linkurl"+c);jQuery(this).find("#description"+b).attr("name","description"+c);jQuery(this).find("#description"+b).attr("id","description"+c);jQuery(this).find("#icon"+b).attr("name","icon"+c);jQuery(this).find("#icon"+b).attr("id","icon"+c);jQuery(this).find("#position"+b).attr("name","position"+c);jQuery(this).find("#position"+b).attr("id","position"+c);jQuery(this).find("#linktype"+b).attr("name","linktype"+c);jQuery(this).find("#linktype"+b).attr("id","linktype"+c);jQuery(this).find("#anchortitle"+b).attr("name","anchortitle"+c);jQuery(this).find("#anchortitle"+b).attr("id","anchortitle"+c);jQuery(this).find("#newwindow"+b).attr("name","newwindow"+c);jQuery(this).find("#newwindow"+b).attr("id","newwindow"+c);jQuery(this).find("dl > dt > span > #remove"+b).attr("value",c);jQuery(this).find("dl > dt > span > #remove"+b).attr("onClick","removeitem("+c+")");jQuery(this).find("dl > dt > span > #remove"+b).attr("id","remove"+c);jQuery("#licount").attr("value",c)})}function appendToList(b,s,d,n,h,l,e){var k="";var c="";var r="";var o="";var i="";var a="";if(s=="Custom"){k=document.getElementById("custom_menu_item_name").value;c=document.getElementById("custom_menu_item_url").value;r="";o="";inputlinktype="custom";i=document.getElementById("custom_menu_item_description").value}else{if(s=="Page"){k=htmlentities(d.toString());c=n.toString();r=h.toString();o="0";inputlinktype="page";i=htmlentities(e.toString())}else{if(s=="Category"){k=htmlentities(d.toString());c=n.toString();r=h.toString();o="0";inputlinktype="category";i=htmlentities(e.toString())}else{k="";k="";r="";o="";inputlinktype="custom";i=""}}}var g=document.getElementById("custom-nav").getElementsByTagName("li").length;var p=g;var m=0;try{var q=document.getElementById("menu-"+p.toString()).value}catch(f){m=1}while(m==0){p=p+1;try{var j=document.getElementById("menu-"+p.toString()).value}catch(f){m=1}}jQuery(".maintitle").after('<div id="message" class="updated fade below-h2"><p>Menu Item added!</p></div>');jQuery("#message").animate({opacity:1},2000).fadeOut(300,function(){jQuery(this).remove()});jQuery("#custom-nav").append('<li id="menu-'+p+'" value="'+p+'"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="title">'+k+'</span><span class="controls"><span class="type">'+s+'</span><a id="edit'+p+'" onclick="edititem('+p+')" value="'+p+'"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="'+b+'/wp-admin/images/ico-edit.png" /></a> <a id="remove'+p+'" onclick="removeitem('+p+')" value="'+p+'"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="'+b+'/wp-admin/images/ico-close.png" /></a> <a href="'+c+'" target="_blank"><img alt="View Custom Link" title="View Custom Link" src="'+b+'/wp-admin/images/ico-viewpage.png" /></a></span></dt></dl><a class="hide" href="'+c+'">'+k+'</a><input type="hidden" name="postmenu'+p+'" id="postmenu'+p+'" value="'+r+'" /><input type="hidden" name="parent'+p+'" id="parent'+p+'" value="'+o+'" /><input type="hidden" name="title'+p+'" id="title'+p+'" value="'+k+'" /><input type="hidden" name="linkurl'+p+'" id="linkurl'+p+'" value="'+c+'" /><input type="hidden" name="description'+p+'" id="description'+p+'" value="'+i+'" /><input type="hidden" name="icon'+p+'" id="icon'+p+'" value="'+a+'" /><input type="hidden" name="position'+p+'" id="position'+p+'" value="'+p+'" /><input type="hidden" name="linktype'+p+'" id="linktype'+p+'" value="'+inputlinktype+'" /><input type="hidden" name="anchortitle'+p+'" id="anchortitle'+p+'" value="'+k+'" /><input type="hidden" name="newwindow'+p+'" id="newwindow'+p+'" value="0" /></li>');jQuery("#menu-"+p+"").draggable({handle:" > dl",opacity:0.8,addClasses:false,helper:"clone",zIndex:100});jQuery("#menu-"+p+" dl, #menu-"+p+" .dropzone").droppable({accept:"#"+p+", #custom-nav li",tolerance:"pointer",drop:function(x,w){var t=jQuery(this).parent();var y=!jQuery(this).hasClass("dropzone");if(y&&t.children("ul").length==0){t.append("<ul/>")}if(y){t.children("ul").append(w.draggable)}else{t.before(w.draggable)}t.find("dl,.dropzone").css({backgroundColor:"",borderColor:""});var v=w.draggable.attr("value");var u=t.attr("value");t.find("#menu-"+v).find("#parent"+v).val(u);jQuery(this).parent().find("dt").removeAttr("style");jQuery(this).parent().find("div:first").removeAttr("style")},over:function(){if(jQuery(this).attr("class")=="dropzone ui-droppable"){jQuery(this).parent().find("div:first").css("background","none").css("height","50px")}else{if(jQuery(this).attr("class")=="ui-droppable"){jQuery(this).parent().find("dt:first").css("background","#d8d8d8")}else{}}var t=jQuery(this).parent().attr("id")},out:function(){jQuery(this).parent().find("dt").removeAttr("style");jQuery(this).parent().find("div:first").removeAttr("style");jQuery(this).filter(".dropzone").css({borderColor:""})}});updatepostdata()};
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-includes/custom-navigation.php 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -13,14 +13,14 @@
</span><span class="cx"> function wp_custom_navigation_get_menu_items( $menu_objects, $key = 'ID' ) {
</span><span class="cx"> $menu_items = array();
</span><span class="cx"> if ( !empty( $menu_objects ) && !empty( $key ) ) {
</span><del>- $args = array( 'orderby' => 'menu_order', 'post_type' => 'menu_item', 'post_status' => 'menu-category,menu-page,menu-custom' );
</del><ins>+ $args = array( 'orderby' => 'menu_order', 'post_type' => 'menu_item', 'post_status' => 'publish' );
</ins><span class="cx"> if ( count( $menu_objects ) > 1 )
</span><span class="cx"> $args['include'] = implode( ',', $menu_objects );
</span><span class="cx"> else
</span><span class="cx"> $args['include'] = $menu_objects[0];
</span><del>- $posts = new WP_Query( $args );
- if ( ! empty( $posts->posts ) ) {
- foreach( $posts->posts as $post ) {
</del><ins>+ $posts = get_posts( $args );
+ if ( ! empty( $posts ) ) {
+ foreach ( $posts as $post ) {
</ins><span class="cx"> $menu_items[ $post->$key ] = $post;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $menu_items;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> function wp_custom_navigation_setup($override = false) {
</span><span class="cx">
</span><span class="cx"> $nav_version = '1.1.0';
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (13265 => 13266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-02-20 23:41:47 UTC (rev 13265)
+++ trunk/wp-includes/script-loader.php 2010-02-20 23:58:00 UTC (rev 13266)
</span><span class="lines">@@ -403,9 +403,9 @@
</span><span class="cx"> $scripts->add( 'custom-navigation-ui-custom', '/wp-admin/js/custom-navigation-custom-jquery-ui-1.7.2.js', array('jquery'), '1.7.2' );
</span><span class="cx"> $scripts->add_data( 'custom-navigation-ui-custom', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'custom-navigation-default-items', '/wp-admin/js/custom-navigation-default-items.js', false, '1.0.0' );
- $scripts->add( 'custom-navigation-dynamic-functions', '/wp-admin/js/custom-navigation-dynamic-functions.js', false, '1.0.0' );
- $scripts->add( 'custom-navigation-php-functions', '/wp-admin/js/custom-navigation-php-functions.js', false, '1.0.0' );
</del><ins>+ $scripts->add( 'custom-navigation-default-items', "/wp-admin/js/custom-navigation-default-items$suffix.js", false, '20100220' );
+ $scripts->add( 'custom-navigation-dynamic-functions', "/wp-admin/js/custom-navigation-dynamic-functions$suffix.js", false, '20100220' );
+ $scripts->add( 'custom-navigation-php-functions', "/wp-admin/js/custom-navigation-php-functions$suffix.js", false, '20100220' );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>