Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Prevent 'Enter menu name here' menus, and offer some feedback. props koopersmith, fixes #13703.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-06-03 03:33:54 +00:00
parent bb6570a47a
commit dacccec2f7
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

8
wp-admin/css/nav-menu.dev.css
View File

@ -529,6 +529,14 @@ body.js .item-order {
color: #fff; color: #fff;
} }
.major-publishing-actions .form-invalid {
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
padding-left: 4px;
margin-left: -4px;
}
/* Clearfix */ /* Clearfix */
#menu-item-name-wrap:after, #menu-item-name-wrap:after,

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

@ -806,7 +806,14 @@ var wpNavMenu;
}, },
eventOnClickMenuSave : function(clickedEl) { eventOnClickMenuSave : function(clickedEl) {
var locs = ''; var locs = '',
menuName = $('#menu-name'),
menuNameVal = menuName.val();
// Cancel and warn if invalid menu name
if( !menuNameVal || menuNameVal == menuName.attr('title') || !menuNameVal.replace(/\s+/, '') ) {
menuName.parent().addClass('form-invalid');
return false;
}
// Copy menu theme locations // Copy menu theme locations
$('#nav-menu-theme-locations select').each(function() { $('#nav-menu-theme-locations select').each(function() {
locs += '<input type="hidden" name="' + this.name + '" value="' + $(this).val() + '" />'; locs += '<input type="hidden" name="' + this.name + '" value="' + $(this).val() + '" />';

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

File diff suppressed because one or more lines are too long

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

@ -385,7 +385,7 @@ function wp_default_scripts( &$scripts ) {
) ); ) );
// Custom Navigation // Custom Navigation
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100529' ); $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100603' );
$scripts->localize( 'nav-menu', 'navMenuL10n', array( $scripts->localize( 'nav-menu', 'navMenuL10n', array(
'custom' => _x('Custom', 'menu nav item type'), 'custom' => _x('Custom', 'menu nav item type'),
'thickbox' => _x('Edit Menu Item', 'Thickbox Title'), 'thickbox' => _x('Edit Menu Item', 'Thickbox Title'),
@ -463,7 +463,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100602' ); $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100603' );
foreach ( $rtl_styles as $rtl_style ) { foreach ( $rtl_styles as $rtl_style ) {
$styles->add_data( $rtl_style, 'rtl', true ); $styles->add_data( $rtl_style, 'rtl', true );