WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

First pass at fixing search for add menu item boxes. props koopersmith, see #13283. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14686 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-16 05:39:53 +00:00
parent 4ef2ae30fd
commit 6c01265794
5 changed files with 83 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/nav-menu.php
View File

@ -406,7 +406,7 @@ function wp_nav_menu_locations_meta_box() {
$mods = get_nav_menu_locations();
$menus = wp_get_nav_menus();
$menu_locations = get_nav_menu_locations();
//var_dump( $menus );
foreach ( $locations as $location => $description ) {
?>
<p>
@ -619,8 +619,9 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
}
?>
<p class="quick-search-wrap">
<input type="text" class="quick-search regular-text" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
<input type="submit" class="quick-search-submit button-secondary" value="<?php esc_attr_e('Search'); ?>" />
<input type="text" class="quick-search regular-text input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<input type="submit" class="quick-search-submit button-secondary hide-if-js" value="<?php esc_attr_e('Search'); ?>" />
</p>
<ul id="<?php echo $post_type_name; ?>-search-checklist" class="list:<?php echo $post_type_name?> categorychecklist form-no-clear">
@ -794,8 +795,9 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
}
?>
<p class="quick-search-wrap">
<input type="text" class="quick-search regular-text" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
<input type="submit" class="quick-search-submit button-secondary" value="<?php esc_attr_e('Search'); ?>" />
<input type="text" class="quick-search regular-text input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<input type="submit" class="quick-search-submit button-secondary hide-if-js" value="<?php esc_attr_e('Search'); ?>" />
</p>
<ul id="<?php echo $taxonomy_name; ?>-search-checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">

206
wp-admin/js/nav-menu.dev.js
View File

@ -22,8 +22,6 @@ var wpNavMenu;
menuList : undefined, // Set in init.
targetList : undefined, // Set in init.
autoCompleteData : {},
// Functions that run on init.
init : function() {
api.menuList = $('#menu-to-edit');
@ -346,44 +344,45 @@ var wpNavMenu;
},
attachQuickSearchListeners : function() {
var that = this,
form = $('#nav-menu-meta');
var searchTimer;
// auto-suggest for the quick-search boxes
$('input.quick-search').each(function(i, el) {
that.setupQuickSearchEventListeners(el);
});
form.find('.quick-search-submit').click(function() {
$(this).trigger('wp-quick-search');
$('.quick-search').keypress(function(e){
var t = $(this);
if( 13 == e.which ) {
api.updateQuickSearchResults( t );
return false;
});
form.find('.inside').children().bind('wp-quick-search', function() {
that.quickSearch( $(this).attr('id') );
});
}
if( searchTimer ) clearTimeout(searchTimer);
searchTimer = setTimeout(function(){
api.updateQuickSearchResults( t );
}, 400);
}).attr('autocomplete','off');
},
quickSearch : function(id) {
var type = $('#' + id + ' .quick-search').attr('name'),
q = $('#' + id + ' .quick-search').val(),
menu = $('#menu').val(),
nonce = $('#menu-settings-column-nonce').val(),
params = {},
that = this,
processMethod = function(){};
updateQuickSearchResults : function(input) {
var panel, params,
minSearchLength = 2,
q = input.val();
processMethod = that.processQuickSearchQueryResponse;
if( q.length < minSearchLength ) return;
panel = input.parents('.tabs-panel');
params = {
'action': 'menu-quick-search',
'response-format': 'markup',
'menu': menu,
'menu-settings-column-nonce': nonce,
'menu': $('#menu').val(),
'menu-settings-column-nonce': $('#menu-settings-column-nonce').val(),
'q': q,
'type': type
'type': input.attr('name')
};
$('img.waiting', panel).show();
$.post( ajaxurl, params, function(menuMarkup) {
processMethod.call(that, menuMarkup, params);
api.processQuickSearchQueryResponse(menuMarkup, params, panel);
});
},
@ -463,38 +462,32 @@ var wpNavMenu;
attachTabsPanelListeners : function() {
$('#menu-settings-column').bind('click', function(e) {
var selectAreaMatch, activePanel, panelIdMatch, wrapper, inputs, i, items;
var selectAreaMatch, activePanel, panelId, wrapper, items,
target = $(e.target);
if ( e.target && e.target.className && -1 != e.target.className.indexOf('nav-tab-link') ) {
panelIdMatch = /#(.*)$/.exec(e.target.href);
wrapper = $(e.target).parents('.inside').first()[0];
inputs = wrapper ? wrapper.getElementsByTagName('input') : [];
i = inputs.length;
if ( target.hasClass('nav-tab-link') ) {
panelId = /#(.*)$/.exec(e.target.href);
if ( panelId && panelId[1] )
panelId = panelId[1]
else
return false;
wrapper = target.parents('.inside').first();
// upon changing tabs, we want to uncheck all checkboxes
while( i-- )
inputs[i].checked = false;
$('input', wrapper).removeAttr('checked');
$('.tabs-panel', wrapper).each(function() {
if ( this.className )
this.className = this.className.replace('tabs-panel-active', 'tabs-panel-inactive');
});
$('.tabs-panel-active', wrapper).removeClass('tabs-panel-active').addClass('tabs-panel-inactive');
$('#' + panelId, wrapper).removeClass('tabs-panel-inactive').addClass('tabs-panel-active');
$('.tabs', wrapper).each(function() {
this.className = this.className.replace('tabs', '');
});
$('.tabs', wrapper).removeClass('tabs');
target.parent().addClass('tabs');
e.target.parentNode.className += ' tabs';
if ( panelIdMatch && panelIdMatch[1] ) {
activePanel = document.getElementById(panelIdMatch[1]);
if ( activePanel ) {
activePanel.className = activePanel.className.replace('tabs-panel-inactive', 'tabs-panel-active');
}
}
// select the search bar
$('.quick-search', wrapper).focus();
return false;
} else if ( e.target && e.target.className && -1 != e.target.className.indexOf('select-all') ) {
} else if ( target.hasClass('select-all') ) {
selectAreaMatch = /#(.*)$/.exec(e.target.href);
if ( selectAreaMatch && selectAreaMatch[1] ) {
items = $('#' + selectAreaMatch[1] + ' .tabs-panel-active .menu-item-title input');
@ -611,37 +604,6 @@ var wpNavMenu;
});
},
/**
* Set up quick-search input fields' events.
*
* @param object el The input element.
*/
setupQuickSearchEventListeners : function(el) {
var that = this;
$(el).autocomplete( ajaxurl + '?action=menu-quick-search&type=' + el.name,
{
delay: 500,
formatItem: api.formatAutocompleteResponse,
formatResult: api.formatAutocompleteResult,
minchars: 2,
multiple: false
}
).bind('blur', function(e) {
var changedData = api.autoCompleteData[this.value],
inputEl = this;
if ( changedData ) {
$.post(
ajaxurl + '?action=menu-quick-search&type=get-post-item&response-format=markup',
changedData,
function(r) {
that.processQuickSearchQueryResponse.call(that, r, changedData);
api.autoCompleteData[inputEl.value] = false;
}
);
}
});
},
eventOnClickEditLink : function(clickedEl) {
var activeEdit,
matchedSection = /#(.*)$/.exec(clickedEl.href);
@ -718,59 +680,40 @@ var wpNavMenu;
*
* @param string resp The server response to the query.
* @param object req The request arguments.
* @param jQuery panel The tabs panel we're searching in.
*/
processQuickSearchQueryResponse : function(resp, req) {
if ( ! req )
req = {};
var wrap = document.createElement('ul'),
processQuickSearchQueryResponse : function(resp, req, panel) {
var i, matched, newID,
takenIDs = {},
form = document.getElementById('nav-menu-meta'),
i,
items,
matched,
message,
newID,
pattern = new RegExp('menu-item\\[(\[^\\]\]*)'),
resultList;
pattern = new RegExp('menu-item\\[(\[^\\]\]*)', 'g'),
items = resp.match(/<li>.*<\/li>/g);
if( ! items ) {
$('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
$('img.waiting', panel).hide();
return;
}
i = items.length;
while( i-- ) {
// make a unique DB ID number
matched = pattern.exec(resp);
matched = pattern.exec(items[i]);
if ( matched && matched[1] ) {
newID = matched[1];
while( form.elements['menu-item[' + newID + '][menu-item-type]'] ) {
while( form.elements['menu-item[' + newID + '][menu-item-type]'] || takenIDs[ newID ] ) {
newID--;
}
takenIDs[newID] = true;
if ( newID != matched[1] ) {
resp = resp.replace(new RegExp('menu-item\\[' + matched[1] + '\\]', 'g'), 'menu-item[' + newID + ']');
items[i] = items[i].replace(new RegExp('menu-item\\[' + matched[1] + '\\]', 'g'), 'menu-item[' + newID + ']');
}
}
}
wrap.innerHTML = resp;
items = wrap.getElementsByTagName('li');
if ( items[0] && req.object_type ) {
resultList = document.getElementById(req.object_type + '-search-checklist');
if ( resultList ) {
resultList.appendChild(items[0]);
}
} else if ( req.type ) {
matched = /quick-search-(posttype|taxonomy)-([a-zA-Z_-]*)/.exec(req.type);
if ( matched && matched[2] ) {
resultList = document.getElementById(matched[2] + '-search-checklist');
if ( resultList ) {
i = items.length;
if ( ! i ) {
message = document.createElement('li');
message.appendChild(document.createTextNode(navMenuL10n.noResultsFound));
resultList.appendChild(message);
}
while( i-- ) {
resultList.appendChild(items[i]);
}
}
}
}
$('.categorychecklist', panel).html( items.join('') );
$('img.waiting', panel).hide();
},
removeMenuItem : function(el) {
@ -784,25 +727,6 @@ var wpNavMenu;
});
},
formatAutocompleteResponse : function( resultRow, pos, total, queryTerm ) {
if ( resultRow && resultRow[0] ) {
var data = $.parseJSON(resultRow[0]);
if ( data.post_title ) {
if ( data.ID && data.post_type )
api.autoCompleteData[data.post_title] = {ID: data.ID, object_type: data.post_type};
return data.post_title;
}
}
},
formatAutocompleteResult : function( resultRow, pos, total, queryTerm ) {
if ( resultRow && resultRow[0] ) {
var data = $.parseJSON(resultRow[0]);
if ( data.post_title )
return data.post_title;
}
},
getListDataFromID : function(menuItemID, parentEl) {
if ( ! menuItemID )
return false;

2
wp-admin/js/nav-menu.js
View File

File diff suppressed because one or more lines are too long

1
wp-admin/nav-menus.php
View File

@ -27,7 +27,6 @@ wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'jquery-ui-draggable' );
wp_enqueue_script( 'jquery-ui-droppable' );
wp_enqueue_script( 'jquery-ui-sortable' );
wp_enqueue_script( 'jquery-autocomplete' );
// Nav Menu functions
wp_enqueue_script( 'nav-menu' );

2
wp-includes/script-loader.php
View File

@ -393,7 +393,7 @@ function wp_default_scripts( &$scripts ) {
) );
// Custom Navigation
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100513' );
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100515' );
$scripts->localize( 'nav-menu', 'navMenuL10n', array(
'home' => _x('Home', 'nav menu home label'),
'homeurl' => home_url('/'),