enmi-conf.org: comparison wp/wp-admin/js/nav-menu.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-admin/js/nav-menu.js

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 	api = wpNavMenu = {
 		options : {
 			menuItemDepthPerLevel : 30, // Do not use directly. Use depthToPx and pxToDepth instead.
-			globalMaxDepth : 11
+			globalMaxDepth:  11,
+			sortableItems:   '> *',
+			targetTolerance: 0
 		},
 		menuList : undefined,	// Set in init.
 		targetList : undefined, // Set in init.
 		menusChanged : false,
 		isRTL: !! ( 'undefined' != typeof isRtl && isRtl ),
 		negateIfRTL: ( 'undefined' != typeof isRtl && isRtl ) ? -1 : 1,
+		lastSearch: '',
 		// Functions that run on init.
 		init : function() {
 			api.menuList = $('#menu-to-edit');
 			api.targetList = api.menuList;
 			this.jQueryExtensions();
 			this.attachMenuEditListeners();
-			this.setupInputWithDefaultTitle();
 			this.attachQuickSearchListeners();
 			this.attachThemeLocationsListeners();
+			this.attachMenuSaveSubmitListeners();
 			this.attachTabsPanelListeners();
 			this.attachUnsavedChangesListener();
 					});
 				},
 				shiftDepthClass : function(change) {
 					return this.each(function(){
 						var t = $(this),
-							depth = t.menuItemDepth();
+							depth = t.menuItemDepth(),
-						$(this).removeClass('menu-item-depth-'+ depth )
+							newDepth = depth + change;
-							.addClass('menu-item-depth-'+ (depth + change) );
+						t.removeClass( 'menu-item-depth-'+ depth )
+							.addClass( 'menu-item-depth-'+ ( newDepth ) );
+						if ( 0 === newDepth ) {
+							t.find( '.is-submenu' ).hide();
+						}
 					});
 				},
 				childMenuItems : function() {
 					var result = $();
 					this.each(function(){
-						var t = $(this), depth = t.menuItemDepth(), next = t.next();
+						var t = $(this), depth = t.menuItemDepth(), next = t.next( '.menu-item' );
 						while( next.length && next.menuItemDepth() > depth ) {
 							result = result.add( next );
-							next = next.next();
+							next = next.next( '.menu-item' );
 						}
 					});
 					return result;
 				},
 				shiftHorizontally : function( dir ) {
 						// If no items are checked, bail.
 						if ( !checkboxes.length )
 							return false;
 						// Show the ajax spinner
-						t.find( '.spinner' ).addClass( 'is-active' );
+						t.find( '.button-controls .spinner' ).addClass( 'is-active' );
 						// Retrieve menu item data
 						$(checkboxes).each(function(){
 							var t = $(this),
 								listItemDBIDMatch = re.exec( t.attr('name') ),
 						// Add the items
 						api.addItemToMenu(menuItems, processMethod, function(){
 							// Deselect the items and hide the ajax spinner
 							checkboxes.removeAttr('checked');
-							t.find( '.spinner' ).removeClass( 'is-active' );
+							t.find( '.button-controls .spinner' ).removeClass( 'is-active' );
 						});
 					});
 				},
 				getItemData : function( itemType, id ) {
 					itemType = itemType || 'menu-item';
 			api.refreshKeyboardAccessibility();
 			api.refreshAdvancedAccessibility();
 			// Refresh the accessibility when the user comes close to the item in any way
 			menu.on( 'mouseenter.refreshAccessibility focus.refreshAccessibility touchstart.refreshAccessibility' , '.menu-item' , function(){
-				api.refreshAdvancedAccessibilityOfItem( $( this ).find( '.item-edit' ) );
+				api.refreshAdvancedAccessibilityOfItem( $( this ).find( 'a.item-edit' ) );
 			} );
 			// We have to update on click as well because we might hover first, change the item, and then click.
-			menu.on( 'click', '.item-edit', function() {
+			menu.on( 'click', 'a.item-edit', function() {
 				api.refreshAdvancedAccessibilityOfItem( $( this ) );
 			} );
 			// Links for moving items
-			menu.on( 'click', '.menus-move', function ( e ) {
+			menu.on( 'click', '.menus-move', function () {
 				var $this = $( this ),
 					dir = $this.data( 'dir' );
 				if ( 'undefined' !== typeof dir ) {
 					api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), dir );
 				}
-				e.preventDefault();
 			});
 		},
 		/**
 		 * refreshAdvancedAccessibilityOfItem( [itemToRefresh] )
 				prevItemNameLeft = menuItem.prevAll('.menu-item-depth-' + prevItemDepth).first().find( '.menu-item-title' ).text(),
 				prevItemNameRight = menuItem.prevAll('.menu-item-depth-' + depth).first().find( '.menu-item-title' ).text(),
 				totalMenuItems = $('#menu-to-edit li').length,
 				hasSameDepthSibling = menuItem.nextAll( '.menu-item-depth-' + depth ).length;
 				menuItem.find( '.field-move' ).toggle( totalMenuItems > 1 );
 			// Where can they move this menu item?
 			if ( 0 !== position ) {
 				thisLink = menuItem.find( '.menus-move-up' );
-				thisLink.prop( 'title', menus.moveUp ).css( 'display', 'inline' );
+				thisLink.attr( 'aria-label', menus.moveUp ).css( 'display', 'inline' );
 			}
 			if ( 0 !== position && isPrimaryMenuItem ) {
 				thisLink = menuItem.find( '.menus-move-top' );
-				thisLink.prop( 'title', menus.moveToTop ).css( 'display', 'inline' );
+				thisLink.attr( 'aria-label', menus.moveToTop ).css( 'display', 'inline' );
 			}
 			if ( position + 1 !== totalMenuItems && 0 !== position ) {
 				thisLink = menuItem.find( '.menus-move-down' );
-				thisLink.prop( 'title', menus.moveDown ).css( 'display', 'inline' );
+				thisLink.attr( 'aria-label', menus.moveDown ).css( 'display', 'inline' );
 			}
 			if ( 0 === position && 0 !== hasSameDepthSibling ) {
 				thisLink = menuItem.find( '.menus-move-down' );
-				thisLink.prop( 'title', menus.moveDown ).css( 'display', 'inline' );
+				thisLink.attr( 'aria-label', menus.moveDown ).css( 'display', 'inline' );
 			}
 			if ( ! isPrimaryMenuItem ) {
 				thisLink = menuItem.find( '.menus-move-left' ),
 				thisLinkText = menus.outFrom.replace( '%s', prevItemNameLeft );
-				thisLink.prop( 'title', menus.moveOutFrom.replace( '%s', prevItemNameLeft ) ).text( thisLinkText ).css( 'display', 'inline' );
+				thisLink.attr( 'aria-label', menus.moveOutFrom.replace( '%s', prevItemNameLeft ) ).text( thisLinkText ).css( 'display', 'inline' );
 			}
 			if ( 0 !== position ) {
 				if ( menuItem.find( '.menu-item-data-parent-id' ).val() !== menuItem.prev().find( '.menu-item-data-db-id' ).val() ) {
 					thisLink = menuItem.find( '.menus-move-right' ),
 					thisLinkText = menus.under.replace( '%s', prevItemNameRight );
-					thisLink.prop( 'title', menus.moveUnder.replace( '%s', prevItemNameRight ) ).text( thisLinkText ).css( 'display', 'inline' );
+					thisLink.attr( 'aria-label', menus.moveUnder.replace( '%s', prevItemNameRight ) ).text( thisLinkText ).css( 'display', 'inline' );
 				}
 			}
 			if ( isPrimaryMenuItem ) {
 				primaryItems = $( '.menu-item-depth-0' ),
 				// String together help text for sub menu items
 				title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName );
 			}
-			$this.prop('title', title).html( title );
+			$this.attr( 'aria-label', title );
 			// Mark this item's accessibility as refreshed
 			$this.data( 'needs_accessibility_refresh', false );
 		},
 		 *
 		 * Hides all advanced accessibility buttons and marks them for refreshing.
 		 */
 		refreshAdvancedAccessibility : function() {
-			// Hide all links by default
+			// Hide all the move buttons by default.
-			$( '.menu-item-settings .field-move a' ).hide();
+			$( '.menu-item-settings .field-move .menus-move' ).hide();
 			// Mark all menu items as unprocessed
-			$( '.item-edit' ).data( 'needs_accessibility_refresh', true );
+			$( 'a.item-edit' ).data( 'needs_accessibility_refresh', true );
 			// All open items have to be refreshed or they will show no links
-			$( '.menu-item-edit-active .item-edit' ).each( function() {
+			$( '.menu-item-edit-active a.item-edit' ).each( function() {
 				api.refreshAdvancedAccessibilityOfItem( this );
 			} );
 		},
 		refreshKeyboardAccessibility : function() {
-			$( '.item-edit' ).off( 'focus' ).on( 'focus', function(){
+			$( 'a.item-edit' ).off( 'focus' ).on( 'focus', function(){
 				$(this).off( 'keydown' ).on( 'keydown', function(e){
 					var arrows,
 						$this = $( this ),
 						thisItem = $this.parents( 'li.menu-item' ),
 			menuEdge += api.isRTL ? api.menuList.width() : 0;
 			api.menuList.sortable({
 				handle: '.menu-item-handle',
 				placeholder: 'sortable-placeholder',
+				items: api.options.sortableItems,
 				start: function(e, ui) {
 					var height, width, parent, children, tempHolder;
 					// handle placement for rtl orientation
 					if ( api.isRTL )
 					width += api.depthToPx(maxChildDepth - originalDepth); // Account for children
 					width -= 2; // Subtract 2 for borders
 					ui.placeholder.width(width);
 					// Update the list of menu items.
-					tempHolder = ui.placeholder.next();
+					tempHolder = ui.placeholder.next( '.menu-item' );
 					tempHolder.css( 'margin-top', helperHeight + 'px' ); // Set the margin to absorb the placeholder
 					ui.placeholder.detach(); // detach or jQuery UI will think the placeholder is a menu item
 					$(this).sortable( 'refresh' ); // The children aren't sortable. We should let jQ UI know.
 					ui.item.after( ui.placeholder ); // reattach the placeholder.
 					tempHolder.css('margin-top', 0); // reset the margin
 				},
 				sort: function(e, ui) {
 					var offset = ui.helper.offset(),
 						edge = api.isRTL ? offset.left + ui.helper.width() : offset.left,
 						depth = api.negateIfRTL * api.pxToDepth( edge - menuEdge );
 					// Check and correct if depth is not within range.
 					// Also, if the dragged element is dragged upwards over
 					// an item, shift the placeholder to a child position.
-					if ( depth > maxDepth || offset.top < prevBottom ) depth = maxDepth;
+					if ( depth > maxDepth || offset.top < ( prevBottom - api.options.targetTolerance ) ) {
-					else if ( depth < minDepth ) depth = minDepth;
+						depth = maxDepth;
+					} else if ( depth < minDepth ) {
+						depth = minDepth;
+					}
 					if( depth != currentDepth )
 						updateCurrentDepth(ui, depth);
 					// If we overlap the next element, manually shift downwards
 			});
 			function updateSharedVars(ui) {
 				var depth;
-				prev = ui.placeholder.prev();
+				prev = ui.placeholder.prev( '.menu-item' );
-				next = ui.placeholder.next();
+				next = ui.placeholder.next( '.menu-item' );
 				// Make sure we don't select the moving item.
-				if( prev[0] == ui.item[0] ) prev = prev.prev();
+				if( prev[0] == ui.item[0] ) prev = prev.prev( '.menu-item' );
-				if( next[0] == ui.item[0] ) next = next.next();
+				if( next[0] == ui.item[0] ) next = next.next( '.menu-item' );
 				prevBottom = (prev.length) ? prev.offset().top + prev.height() : 0;
 				nextThreshold = (next.length) ? next.offset().top + next.height() / 3 : 0;
 				minDepth = (next.length) ? next.menuItemDepth() : 0;
 						return that.eventOnClickCancelLink(e.target);
 					}
 				}
 			});
 			$('#add-custom-links input[type="text"]').keypress(function(e){
+				$('#customlinkdiv').removeClass('form-invalid');
 				if ( e.keyCode === 13 ) {
 					e.preventDefault();
 					$( '#submit-customlinkdiv' ).click();
 				}
 			});
 		},
-		/**
+		attachMenuSaveSubmitListeners : function() {
-		 * An interface for managing default values for input elements
+			/*
-		 * that is both JS and accessibility-friendly.
+			 * When a navigation menu is saved, store a JSON representation of all form data
-		 *
+			 * in a single input to avoid PHP `max_input_vars` limitations. See #14134.
-		 * Input elements that add the class 'input-with-default-title'
+			 */
-		 * will have their values set to the provided HTML title when empty.
+			$( '#update-nav-menu' ).submit( function() {
-		 */
+				var navMenuData = $( '#update-nav-menu' ).serializeArray();
-		setupInputWithDefaultTitle : function() {
+				$( '[name="nav-menu-data"]' ).val( JSON.stringify( navMenuData ) );
-			var name = 'input-with-default-title';
+			});
-			$('.' + name).each( function(){
-				var $t = $(this), title = $t.attr('title'), val = $t.val();
-				$t.data( name, title );
-				if( '' === val ) $t.val( title );
-				else if ( title == val ) return;
-				else $t.removeClass( name );
-			}).focus( function(){
-				var $t = $(this);
-				if( $t.val() == $t.data(name) )
-					$t.val('').removeClass( name );
-			}).blur( function(){
-				var $t = $(this);
-				if( '' === $t.val() )
-					$t.addClass( name ).val( $t.data(name) );
-			});
-			$( '.blank-slate .input-with-default-title' ).focus();
 		},
 		attachThemeLocationsListeners : function() {
 			var loc = $('#nav-menu-theme-locations'), params = {};
 			params.action = 'menu-locations-save';
 				return false;
 			});
 		},
 		attachQuickSearchListeners : function() {
-			var searchTimer;
+			var searchTimer,
+				inputEvent;
-			$('.quick-search').keypress(function(e){
-				var t = $(this);
+			// Prevent form submission.
+			$( '#nav-menu-meta' ).on( 'submit', function( event ) {
-				if( 13 == e.which ) {
+				event.preventDefault();
-					api.updateQuickSearchResults( t );
+			});
-					return false;
-				}
+			/*
+			 * Use feature detection to determine whether inputs should use
-				if( searchTimer ) clearTimeout(searchTimer);
+			 * the `keyup` or `input` event. Input is preferred but lacks support
+			 * in legacy browsers. See changeset 34078, see also ticket #26600#comment:59
-				searchTimer = setTimeout(function(){
+			 */
-					api.updateQuickSearchResults( t );
+			if ( 'oninput' in document.createElement( 'input' ) ) {
-				}, 400);
+				inputEvent = 'input';
-			}).attr('autocomplete','off');
+			} else {
+				inputEvent = 'keyup';
+			}
+			$( '#nav-menu-meta' ).on( inputEvent, '.quick-search', function() {
+				var $this = $( this );
+				$this.attr( 'autocomplete', 'off' );
+				if ( searchTimer ) {
+					clearTimeout( searchTimer );
+				}
+				searchTimer = setTimeout( function() {
+					api.updateQuickSearchResults( $this );
+				}, 500 );
+			}).on( 'blur', '.quick-search', function() {
+				api.lastSearch = '';
+			});
 		},
 		updateQuickSearchResults : function(input) {
 			var panel, params,
-			minSearchLength = 2,
+				minSearchLength = 2,
-			q = input.val();
+				q = input.val();
-			if( q.length < minSearchLength ) return;
+			/*
+			 * Minimum characters for a search. Also avoid a new AJAX search when
+			 * the pressed key (e.g. arrows) doesn't change the searched term.
+			 */
+			if ( q.length < minSearchLength || api.lastSearch == q ) {
+				return;
+			}
+			api.lastSearch = q;
 			panel = input.parents('.tabs-panel');
 			params = {
 				'action': 'menu-quick-search',
 				'response-format': 'markup',
 			var url = $('#custom-menu-item-url').val(),
 				label = $('#custom-menu-item-name').val();
 			processMethod = processMethod || api.addMenuItemToBottom;
-			if ( '' === url || 'http://' == url )
+			if ( '' === url || 'http://' == url ) {
+				$('#customlinkdiv').addClass('form-invalid');
 				return false;
+			}
 			// Show the ajax spinner
 			$( '.customlinkdiv .spinner' ).addClass( 'is-active' );
 			this.addLinkToMenu( url, label, processMethod, function() {
 				// Remove the ajax spinner
 				callback();
 			});
 		},
 		/**
-		 * Process the add menu item request response into menu list item.
+		 * Process the add menu item request response into menu list item. Appends to menu.
 		 *
-		 * @param string menuMarkup The text server response of menu item markup.
+		 * @param {string} menuMarkup The text server response of menu item markup.
-		 * @param object req The request arguments.
+		 *
+		 * @fires document#menu-item-added Passes menuMarkup as a jQuery object.
 		 */
 		addMenuItemToBottom : function( menuMarkup ) {
-			$(menuMarkup).hideAdvancedMenuItemFields().appendTo( api.targetList );
+			var $menuMarkup = $( menuMarkup );
+			$menuMarkup.hideAdvancedMenuItemFields().appendTo( api.targetList );
 			api.refreshKeyboardAccessibility();
 			api.refreshAdvancedAccessibility();
-		},
+			$( document ).trigger( 'menu-item-added', [ $menuMarkup ] );
+		},
+		/**
+		 * Process the add menu item request response into menu list item. Prepends to menu.
+		 *
+		 * @param {string} menuMarkup The text server response of menu item markup.
+		 *
+		 * @fires document#menu-item-added Passes menuMarkup as a jQuery object.
+		 */
 		addMenuItemToTop : function( menuMarkup ) {
-			$(menuMarkup).hideAdvancedMenuItemFields().prependTo( api.targetList );
+			var $menuMarkup = $( menuMarkup );
+			$menuMarkup.hideAdvancedMenuItemFields().prependTo( api.targetList );
 			api.refreshKeyboardAccessibility();
 			api.refreshAdvancedAccessibility();
+			$( document ).trigger( 'menu-item-added', [ $menuMarkup ] );
 		},
 		attachUnsavedChangesListener : function() {
 			$('#menu-management input, #menu-management select, #menu-management, #menu-management textarea, .menu-location-menus select').change(function(){
 				api.registerChange();
 					$('.tabs', wrapper).removeClass('tabs');
 					target.parent().addClass('tabs');
 					// select the search bar
 					$('.quick-search', wrapper).focus();
+					// Hide controls in the search tab if no items found.
+					if ( ! wrapper.find( '.tabs-panel-active .menu-item-title' ).length ) {
+						wrapper.addClass( 'has-no-menu-item' );
+					} else {
+						wrapper.removeClass( 'has-no-menu-item' );
+					}
 					e.preventDefault();
 				} else if ( target.hasClass('select-all') ) {
 					selectAreaMatch = /#(.*)$/.exec(e.target.href);
 					if ( selectAreaMatch && selectAreaMatch[1] ) {
 					if ( e.target.id && 'submit-customlinkdiv' == e.target.id )
 						api.addCustomLink( api.addMenuItemToBottom );
 					else if ( e.target.id && -1 != e.target.id.indexOf('submit-') )
 						$('#' + e.target.id.replace(/submit-/, '')).addSelectedToMenu( api.addMenuItemToBottom );
 					return false;
-				} else if ( target.hasClass('page-numbers') ) {
+				}
-					$.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox',
+			});
-						function( resp ) {
-							if ( -1 == resp.indexOf('replace-id') )
+			/*
-								return;
+			 * Delegate the `click` event and attach it just to the pagination
+			 * links thus excluding the current page `<span>`. See ticket #35577.
-							var metaBoxData = $.parseJSON(resp),
+			 */
-							toReplace = document.getElementById(metaBoxData['replace-id']),
+			$( '#nav-menu-meta' ).on( 'click', 'a.page-numbers', function() {
-							placeholder = document.createElement('div'),
+				var $container = $( this ).closest( '.inside' );
-							wrap = document.createElement('div');
+				$.post( ajaxurl, this.href.replace( /.*\?/, '' ).replace( /action=([^&]*)/, '' ) + '&action=menu-get-metabox',
-							if ( ! metaBoxData.markup || ! toReplace )
+					function( resp ) {
-								return;
+						var metaBoxData = $.parseJSON( resp ),
+							toReplace;
-							wrap.innerHTML = metaBoxData.markup ? metaBoxData.markup : '';
+						if ( -1 === resp.indexOf( 'replace-id' ) ) {
-							toReplace.parentNode.insertBefore( placeholder, toReplace );
+							return;
-							placeholder.parentNode.removeChild( toReplace );
-							placeholder.parentNode.insertBefore( wrap, placeholder );
-							placeholder.parentNode.removeChild( placeholder );
 						}
-					);
+						// Get the post type menu meta box to update.
-					return false;
+						toReplace = document.getElementById( metaBoxData['replace-id'] );
-				}
+						if ( ! metaBoxData.markup || ! toReplace ) {
+							return;
+						}
+						// Update the post type menu meta box with new content from the response.
+						$container.html( metaBoxData.markup );
+					}
+				);
+				return false;
 			});
 		},
 		eventOnClickEditLink : function(clickedEl) {
 			var settings, item,
 			var matched, newID,
 			takenIDs = {},
 			form = document.getElementById('nav-menu-meta'),
 			pattern = /menu-item[(\[^]\]*/,
 			$items = $('<div>').html(resp).find('li'),
+			wrapper = panel.closest( '.accordion-section-content' ),
 			$item;
 			if( ! $items.length ) {
 				$('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
 				$( '.spinner', panel ).removeClass( 'is-active' );
+				wrapper.addClass( 'has-no-menu-item' );
 				return;
 			}
 			$items.each(function(){
 				$item = $(this);
 				}
 			});
 			$('.categorychecklist', panel).html( $items );
 			$( '.spinner', panel ).removeClass( 'is-active' );
-		},
+			wrapper.removeClass( 'has-no-menu-item' );
+		},
+		/**
+		 * Remove a menu item.
+		 * @param  {object} el The element to be removed as a jQuery object.
+		 *
+		 * @fires document#menu-removing-item Passes the element to be removed.
+		 */
 		removeMenuItem : function(el) {
 			var children = el.childMenuItems();
+			$( document ).trigger( 'menu-removing-item', [ el ] );
 			el.addClass('deleting').animate({
 					opacity : 0,
 					height: 0
 				}, 350, function() {
 					var ins = $('#menu-instructions');

enmi-conf.org