From 13e1cfef44afbc559263e3bcbbe1aa9c48d37c7b Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 4 May 2010 08:31:40 +0000 Subject: [PATCH] Have 'Add to Menu' and multiple-item drag/drop only affect one meta box at a time. props ptahdunbar, with koopersmith. Non-JS will still handle the meta boxes all together as one form. see #13220, see #13219. git-svn-id: https://develop.svn.wordpress.org/trunk@14436 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/js/nav-menu.dev.js | 181 +++++++++++++++++++++++------------- wp-admin/js/nav-menu.js | 2 +- 2 files changed, 116 insertions(+), 67 deletions(-) diff --git a/wp-admin/js/nav-menu.dev.js b/wp-admin/js/nav-menu.dev.js index 4402b7fee5..cd53212f6d 100644 --- a/wp-admin/js/nav-menu.dev.js +++ b/wp-admin/js/nav-menu.dev.js @@ -196,7 +196,6 @@ var WPNavMenuHandler = function ($) { handle: '.menu-item-handle', placeholder: 'sortable-placeholder', start: function(e, ui) { - console.log('sort start', e, ui); var next, height, width, parent, children, maxChildDepth; transport = ui.item.children('.menu-item-transport'); @@ -367,7 +366,7 @@ var WPNavMenuHandler = function ($) { ui.helper.children('div').addClass('hidden-handle'); // Trigger the ajax - li.parents('.inside').find('.add-to-menu input').trigger('submit'); + li.parents('.inside').find('.add-to-menu input').click(); // Lock dimensions ui.helper.width( ui.helper.width() ); @@ -438,11 +437,85 @@ var WPNavMenuHandler = function ($) { that.setupQuickSearchEventListeners(el); }); - $(formEL).bind('submit', function(e) { - return that.eventSubmitMetaForm.call(that, this, e); + // If a "Add to Menu" button was clicked, submit that metabox ajax style. + $(formEL).click(function(e) { + // based on the input, call that function + var divcontainer = $(e.target).parent().parent().parent(); + + if ( $(e.target).is('input') && $(e.target).hasClass('button-secondary') && !$(e.target).hasClass('quick-search-submit') ) { + if ( $(divcontainer).hasClass('customlinkdiv') ) { + that.addCustomLink(); + } else if ( $(divcontainer).hasClass('posttypediv') || $(divcontainer).hasClass('taxonomydiv') ) { + that.addItemsToMenu( $(divcontainer).attr('id') ); + }; + return false; + } else if ( $(e.target).is('input') && $(e.target).hasClass('quick-search-submit') ) { + that.quickSearch( $(divcontainer).attr('id') ); + return false; + }; }); - $(formEL).find('input:submit').click(function() { - $(this).siblings('img.waiting').show(); + }, + + 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(){}; + + processMethod = that.processQuickSearchQueryResponse; + + params = { + 'action': 'menu-quick-search', + 'response-format': 'markup', + 'menu': menu, + 'menu-settings-column-nonce': nonce, + 'q': q, + 'type': type + }; + + $.post( ajaxurl, params, function(menuMarkup) { + processMethod.call(that, menuMarkup, params); + }); + }, + + addCustomLink : function() { + var url = $('#custom-menu-item-url').val(), + label = $('#custom-menu-item-name').val(), + menu = $('#menu').val(), + nonce = $('#menu-settings-column-nonce').val(), + params = {}, + that = this, + processMethod = function(){}; + + if ( '' == url || 'http://' == url ) + return false; + + // Show the ajax spinner + $('.customlinkdiv img.waiting').show(); + + params = { + 'action': 'add-menu-item', + 'menu': menu, + 'menu-settings-column-nonce': nonce, + 'menu-item': { + '-1': { + 'menu-item-type': 'custom', + 'menu-item-url': url, + 'menu-item-title': label + } + } + }; + + processMethod = that.eventAddMenuItem; + + $.post( ajaxurl, params, function(menuMarkup) { + processMethod.call(that, menuMarkup, params); + + // Remove the ajax spinner + $('.customlinkdiv img.waiting').hide(); }); }, @@ -690,73 +763,53 @@ var WPNavMenuHandler = function ($) { }, /** - * Callback for the meta form submit action listener. + * Adds menu items to the menu. * - * @param object thisForm The submitted form. - * @param object e The event object. + * @param string id The id of the metabox */ - eventSubmitMetaForm : function(thisForm, e) { - var inputs = thisForm.getElementsByTagName('input'), - len = inputs.length, - i, j, - listItemData, - listItemDBID, - listItemDBIDMatch, + addItemsToMenu : function(id) { + var items = $( '.tabs-panel-active .categorychecklist li input:checked', '#' + id), + menu = $('#menu').val(), + nonce = $('#menu-settings-column-nonce').val(), params = {}, + that = this, processMethod = function(){}, re = new RegExp('menu-item\\[(\[^\\]\]*)'); + + processMethod = that.eventAddMenuItem; + + // If no items are checked, bail. + if ( !items.length ) + return false; + + // Show the ajax spinner + $('#' + id + ' img.waiting').show(); - that = this; - params['action'] = ''; + // do stuff + $(items).each(function(){ + listItemDBIDMatch = re.exec( $(this).attr('name') ); + listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10); + listItemData = getListDataFromID(listItemDBID); - for ( i = 0; i < len; i++ ) { - if ( // we're submitting a checked item - inputs[i].name && - -1 != inputs[i].name.indexOf('menu-item-object-id') && - inputs[i].checked || - ( // or we're dealing with a custom link - 'undefined' != typeof inputs[i].id && - 'custom-menu-item-url' == inputs[i].id && - '' != inputs[i].value && - 'http://' != inputs[i].value - ) - ) { - params['action'] = 'add-menu-item'; - processMethod = that.processAddMenuItemResponse; + params = { + 'action': 'add-menu-item', + 'menu': menu, + 'menu-settings-column-nonce': nonce, + 'menu-item': {} + }; - listItemDBIDMatch = re.exec(inputs[i].name); - listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10); - listItemData = getListDataFromID(listItemDBID); + params['menu-item'][listItemDBID] = listItemData; - for ( j in listItemData ) { - params['menu-item[' + listItemDBID + '][' + j + ']'] = listItemData[j]; - } + $.post( ajaxurl, params, function(menuMarkup) { + processMethod.call(that, menuMarkup, params); + }); - inputs[i].checked = false; - - // we're submitting a search term - } else if ( - '' == params['action'] && // give precedence to adding items - '' != inputs[i].value && - inputs[i].className && - -1 != inputs[i].className.search(/quick-search\b[^-]/) - ) { - params['action'] = 'menu-quick-search'; - params['q'] = inputs[i].value; - params['response-format'] = 'markup'; - params['type'] = inputs[i].name; - processMethod = that.processQuickSearchQueryResponse; - } - } - params['menu'] = thisForm.elements['menu'].value; - params['menu-settings-column-nonce'] = thisForm.elements['menu-settings-column-nonce'].value; - - $.post( ajaxurl, params, function(menuMarkup) { - processMethod.call(that, menuMarkup, params); - $(thisForm).find('img.waiting').hide(); + // Uncheck the item + $(this).attr('checked', false); }); - return false; + // Remove the ajax spinner + $('#' + id + ' img.waiting').hide(); }, /** @@ -765,12 +818,8 @@ var WPNavMenuHandler = function ($) { * @param string menuMarkup The text server response of menu item markup. * @param object req The request arguments. */ - processAddMenuItemResponse : function( menuMarkup, req ) { + eventAddMenuItem : function( menuMarkup, req ) { $(menuMarkup).hideAdvancedMenuItemFields().appendTo( targetList ); - - /* set custom link form back to defaults */ - $('#custom-menu-item-name').val('').blur(); - $('#custom-menu-item-url').val('http://'); }, /** diff --git a/wp-admin/js/nav-menu.js b/wp-admin/js/nav-menu.js index 05ec03ba31..4014f73ed5 100644 --- a/wp-admin/js/nav-menu.js +++ b/wp-admin/js/nav-menu.js @@ -1 +1 @@ -var WPNavMenuHandler=function(d){var h={},f=30,c=11,k=function(m,q,n,p){if(m&&m[0]){var o=d.parseJSON(m[0]);if(o.post_title){if(o.ID&&o.post_type){h[o.post_title]={ID:o.ID,object_type:o.post_type}}return o.post_title}}},l=function(m,q,n,p){if(m&&m[0]){var o=d.parseJSON(m[0]);if(o.post_title){return o.post_title}}},b=function(s,r){if(!s){return false}r=r||document;var n=["menu-item-db-id","menu-item-object-id","menu-item-object","menu-item-parent-id","menu-item-position","menu-item-type","menu-item-append","menu-item-title","menu-item-url","menu-item-description","menu-item-attr-title","menu-item-target","menu-item-classes","menu-item-xfn"],m={},o=r.getElementsByTagName("input"),q=o.length,p,t=document.getElementById("nav-menu-meta-object-id").value;while(q--){p=n.length;while(p--){if(o[q]&&o[q].name&&"menu-item["+s+"]["+n[p]+"]"==o[q].name){m[n[p]]=o[q].value}}}return m},a=function(){g.find(".menu-item-data-position").val(function(m){return m+1})},e=function(m){return m*f},i=function(m){return Math.floor(m/f)},g,j;d.fn.extend({menuItemDepth:function(){return i(this.eq(0).css("margin-left").slice(0,-2))},updateDepthClass:function(n,m){return this.each(function(){var o=d(this);m=m||o.menuItemDepth();d(this).removeClass("menu-item-depth-"+m).addClass("menu-item-depth-"+n)})},shiftDepthClass:function(m){return this.each(function(){var n=d(this),o=n.menuItemDepth();d(this).removeClass("menu-item-depth-"+o).addClass("menu-item-depth-"+(o+m))})},childMenuItems:function(){var m=d();this.each(function(){var n=d(this),p=n.menuItemDepth(),o=n.next();while(o.length&&o.menuItemDepth()>p){m=m.add(o);o=o.next()}});return m},updateParentMenuItemDBId:function(){return this.each(function(){var o=d(this),m=o.find(".menu-item-data-parent-id"),p=o.menuItemDepth(),n=o.prev();if(p==0){m.val(0)}else{while(n.menuItemDepth()!=p-1){n=n.prev()}m.val(n.find(".menu-item-data-object-id").val())}})},hideAdvancedMenuItemFields:function(){return this.each(function(){var m=d(this);d(".hide-column-tog").not(":checked").each(function(){m.find(".field-"+d(this).val()).addClass("hidden-field")})})},});return{init:function(){g=d("#menu-to-edit");j=g;this.attachMenuEditListeners();this.attachMenuMetaListeners(document.getElementById("nav-menu-meta"));this.attachTabsPanelListeners();if(g.length){this.initSortables()}this.initToggles();this.initTabManager();this.initAddMenuItemDraggables()},initToggles:function(){postboxes.add_postbox_toggles("nav-menus");columns.useCheckboxesForHidden();columns.checked=function(m){d(".field-"+m).removeClass("hidden-field")};columns.unchecked=function(m){d(".field-"+m).addClass("hidden-field")};g.hideAdvancedMenuItemFields()},initSortables:function(){var s=0,r,q,m,p=g.offset().left,t,o;g.sortable({handle:".menu-item-handle",placeholder:"sortable-placeholder",start:function(C,B){console.log("sort start",C,B);var A,v,z,y,w,x;o=B.item.children(".menu-item-transport");t=(B.helper.hasClass("new-menu-item"));r=(t)?0:B.item.menuItemDepth();n(B,r);if(!t){y=(B.item.next()[0]==B.placeholder[0])?B.item.next():B.item;w=y.childMenuItems();o.append(w)}u(B);v=o.outerHeight();v+=(v>0)?(B.placeholder.css("margin-top").slice(0,-2)*1):0;v+=B.helper.outerHeight();v-=2;B.placeholder.height(v);x=r;if(!t){w.each(function(){var D=d(this).menuItemDepth();x=(D>x)?D:x})}z=B.helper.find(".menu-item-handle").outerWidth();z+=e(x-r);z-=2;B.placeholder.width(z)},stop:function(y,x){var w,v=s-r;w=o.children().insertAfter(x.item);if(t){x.item.remove();if(v!=0){w.shiftDepthClass(v)}w.updateParentMenuItemDBId()}else{if(v!=0){x.item.updateDepthClass(s);w.shiftDepthClass(v)}x.item.updateParentMenuItemDBId()}a()},change:function(w,v){if(!v.placeholder.parent().hasClass("menu")){v.placeholder.appendTo(g)}u(v)},sort:function(w,v){var x=i(v.helper.offset().left-p);if(xm){x=m}}if(x!=s){n(v,x)}},receive:function(w,v){o=v.sender.children(".menu-item-transport")}});function u(x){var w=x.placeholder.prev(),v=x.placeholder.next(),y;if(w[0]==x.item[0]){w=w.prev()}if(v[0]==x.item[0]){v=v.next()}q=(v.length)?v.menuItemDepth():0;if(w.length){m=((y=w.menuItemDepth()+1)>c)?c:y}else{m=0}}function n(v,w){v.placeholder.updateDepthClass(w,s);s=w}},initAddMenuItemDraggables:function(){d.fn.extend({checkItem:function(){return this.each(function(){d(this).addClass("selected-menu-item").next().children("input").attr("checked","checked")})},uncheckItem:function(){return this.each(function(){d(this).removeClass("selected-menu-item").next().children("input").removeAttr("checked")})},toggleItem:function(){return this.each(function(){var n=d(this);if(n.hasClass("selected-menu-item")){n.uncheckItem()}else{n.checkItem()}})}});var m=d(".potential-menu-item");m.click(function(n){d(this).toggleItem()}).children().draggable({helper:"clone",connectToSortable:"ul#menu-to-edit",distance:5,zIndex:100,start:function(s,q){var r=d(s.target),p=r.parent(),n=p.parent(),o;p.checkItem();j=r.children(".menu-item-transport");o=m.filter(".selected-menu-item").children().not(q.helper).clone();q.helper.children(".additional-menu-items").append(o);q.helper.addClass("new-menu-item");q.helper.children("div").hide();o.first().css("margin-top",0);o.children("div").addClass("menu-item-handle");q.helper.children("div").addClass("hidden-handle");n.parents(".inside").find(".add-to-menu input").trigger("submit");q.helper.width(q.helper.width());q.helper.height(q.helper.height())},stop:function(o,n){j=g;m.filter(".selected-menu-item").uncheckItem()}})},attachMenuEditListeners:function(){var m=this;d("#update-nav-menu").bind("click",function(n){if(n.target&&n.target.className){if(-1!=n.target.className.indexOf("item-edit")){return m.eventOnClickEditLink(n.target)}else{if(-1!=n.target.className.indexOf("menu-delete")){return m.eventOnClickMenuDelete(n.target)}else{if(-1!=n.target.className.indexOf("item-delete")){return m.eventOnClickMenuItemDelete(n.target)}else{if(-1!=n.target.className.indexOf("item-close")){return m.eventOnClickCloseLink(n.target)}}}}}})},setupInputWithDefaultTitle:function(){var m="input-with-default-title";d("."+m).each(function(){var p=d(this),o=p.attr("title"),n=p.val();p.data(m,o);if(""==n){p.val(o)}else{if(o==n){return}else{p.removeClass(m)}}}).focus(function(){var n=d(this);if(n.val()==n.data(m)){n.val("").removeClass(m)}}).blur(function(){var n=d(this);if(""==n.val()){n.val(n.data(m)).addClass(m)}})},attachMenuMetaListeners:function(m){if(!m){return}var n=this;this.setupInputWithDefaultTitle();d("input.quick-search").each(function(o,p){n.setupQuickSearchEventListeners(p)});d(m).bind("submit",function(o){return n.eventSubmitMetaForm.call(n,this,o)});d(m).find("input:submit").click(function(){d(this).siblings("img.waiting").show()})},attachTabsPanelListeners:function(){d("#menu-settings-column").bind("click",function(r){if(r.target&&r.target.className&&-1!=r.target.className.indexOf("nav-tab-link")){var s,n=/#(.*)$/.exec(r.target.href),q,t=d(r.target).parents(".inside").first()[0],m=t?t.getElementsByTagName("input"):[],o=m.length;while(o--){m[o].checked=false}d(".tabs-panel",t).each(function(){if(this.className){this.className=this.className.replace("tabs-panel-active","tabs-panel-inactive")}});d(".tabs",t).each(function(){this.className=this.className.replace("tabs","")});r.target.parentNode.className+=" tabs";if(n&&n[1]){s=document.getElementById(n[1]);if(s){s.className=s.className.replace("tabs-panel-inactive","tabs-panel-active")}}return false}else{if(r.target&&r.target.className&&-1!=r.target.className.indexOf("select-all")){var p=/#(.*)$/.exec(r.target.href);if(p&&p[1]){d("#"+p[1]+" .tabs-panel-active input[type=checkbox]").attr("checked","checked");return false}}}})},initTabManager:function(){var r=d(".nav-tabs-wrapper"),s=r.children(".nav-tabs"),q=s.children(".nav-tab-active"),u=s.children(".nav-tab"),o=0,v,p,t,n;resizing=false;function m(){p=r.offset().left;v=p+r.width();q.makeTabVisible()}d.fn.extend({makeTabVisible:function(){var x=this.eq(0),y,w;if(!x.length){return}y=x.offset().left;w=y+x.outerWidth();if(w>v){s.animate({"margin-left":"+="+(v-w)+"px",},"fast")}else{if(y=p)?true:false}});u.each(function(){o+=d(this).outerWidth(true)});if(o<=r.width()-s.css("padding-left").slice(0,-2)-s.css("padding-right").slice(0,-2)){return}s.css({"margin-right":(-1*o)+"px",padding:0,});t=d('');n=d('');r.wrap('