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

Remove AYS for deleting a menu item. fixes #13330. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-20 14:55:11 +00:00
parent 966841f103
commit 337df6e337
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,8 +692,6 @@ var wpNavMenu;
matchedSection, matchedSection,
that = this; that = this;
// Delete warning AYS
if ( confirm( navMenuL10n.warnDeleteMenuItem ) ) {
matchedSection = /_wpnonce=([a-zA-Z0-9]*)$/.exec(clickedEl.href); matchedSection = /_wpnonce=([a-zA-Z0-9]*)$/.exec(clickedEl.href);
if ( matchedSection && matchedSection[1] ) { if ( matchedSection && matchedSection[1] ) {
itemID = parseInt(clickedEl.id.replace('delete-', ''), 10); itemID = parseInt(clickedEl.id.replace('delete-', ''), 10);
@ -712,9 +710,6 @@ var wpNavMenu;
return false; return false;
} }
return true; return true;
} else {
return false;
}
}, },
/** /**

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

File diff suppressed because one or more lines are too long

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

@ -384,7 +384,7 @@ function wp_default_scripts( &$scripts ) {
) ); ) );
// Custom Navigation // Custom Navigation
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100519' ); $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100520' );
$scripts->localize( 'nav-menu', 'navMenuL10n', array( $scripts->localize( 'nav-menu', 'navMenuL10n', array(
'home' => _x('Home', 'nav menu home label'), 'home' => _x('Home', 'nav menu home label'),
'homeurl' => home_url('/'), 'homeurl' => home_url('/'),
@ -393,7 +393,6 @@ function wp_default_scripts( &$scripts ) {
'edit' => _x('Edit', 'menu item edit text'), 'edit' => _x('Edit', 'menu item edit text'),
'noResultsFound' => _x('No results found.', 'search results'), 'noResultsFound' => _x('No results found.', 'search results'),
'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
'warnDeleteMenuItem' => __( "You are about to permanently delete this menu item. \n 'Cancel' to stop, 'OK' to delete." ),
'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'), 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
) ); ) );