Customizer: Nav Menus JS cleanup, second round
* Follow the same pattern of namespace instantiation that `WidgetCustomizerPreview` uses * Remove use of `self` for global delegation * Use `api` for `wp.customize` and import only top-level globals * Bind `this` where appropriate and disambiguate scope See #32911. Built from https://develop.svn.wordpress.org/trunk@33347 git-svn-id: http://core.svn.wordpress.org/trunk@33319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
parent
146befe7bf
commit
23712a822f
@ -1,8 +1,12 @@
|
||||
/* global JSON, _wpCustomizePreviewNavMenusExports */
|
||||
|
||||
wp.customize.menusPreview = ( function( $, api ) {
|
||||
( function( $, _, wp ) {
|
||||
'use strict';
|
||||
var currentRefreshDebounced = {},
|
||||
|
||||
if ( ! wp || ! wp.customize ) { return; }
|
||||
|
||||
var api = wp.customize,
|
||||
currentRefreshDebounced = {},
|
||||
refreshDebounceDelay = 200,
|
||||
settings = {},
|
||||
defaultSettings = {
|
||||
@ -16,19 +20,13 @@ wp.customize.menusPreview = ( function( $, api ) {
|
||||
stylesheet: ''
|
||||
},
|
||||
navMenuInstanceArgs: {}
|
||||
},
|
||||
self = {};
|
||||
|
||||
api.bind( 'preview-ready', function() {
|
||||
api.preview.bind( 'active', function() {
|
||||
self.init();
|
||||
} );
|
||||
} );
|
||||
};
|
||||
|
||||
api.MenusCustomizerPreview = {
|
||||
/**
|
||||
* Bootstrap functionality.
|
||||
*/
|
||||
self.init = function() {
|
||||
init : function() {
|
||||
var self = this, initializedSettings = {};
|
||||
|
||||
settings = _.extend( {}, defaultSettings );
|
||||
@ -65,54 +63,54 @@ wp.customize.menusPreview = ( function( $, api ) {
|
||||
}
|
||||
}
|
||||
} );
|
||||
};
|
||||
},
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {wp.customize.Value} setting
|
||||
* @returns {boolean} Whether the setting was bound.
|
||||
*/
|
||||
self.bindListener = function( setting ) {
|
||||
bindListener : function( setting ) {
|
||||
var matches, themeLocation;
|
||||
|
||||
matches = setting.id.match( /^nav_menu\[(-?\d+)]$/ );
|
||||
if ( matches ) {
|
||||
setting.navMenuId = parseInt( matches[1], 10 );
|
||||
setting.bind( self.onChangeNavMenuSetting );
|
||||
setting.bind( this.onChangeNavMenuSetting );
|
||||
return true;
|
||||
}
|
||||
|
||||
matches = setting.id.match( /^nav_menu_item\[(-?\d+)]$/ );
|
||||
if ( matches ) {
|
||||
setting.navMenuItemId = parseInt( matches[1], 10 );
|
||||
setting.bind( self.onChangeNavMenuItemSetting );
|
||||
setting.bind( this.onChangeNavMenuItemSetting );
|
||||
return true;
|
||||
}
|
||||
|
||||
matches = setting.id.match( /^nav_menu_locations\[(.+?)]/ );
|
||||
if ( matches ) {
|
||||
themeLocation = matches[1];
|
||||
setting.bind( function() {
|
||||
self.refreshMenuLocation( themeLocation );
|
||||
} );
|
||||
setting.bind( _.bind( function() {
|
||||
this.refreshMenuLocation( themeLocation );
|
||||
}, this ) );
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
},
|
||||
|
||||
/**
|
||||
* Handle changing of a nav_menu setting.
|
||||
*
|
||||
* @this {wp.customize.Setting}
|
||||
*/
|
||||
self.onChangeNavMenuSetting = function() {
|
||||
onChangeNavMenuSetting : function() {
|
||||
var setting = this;
|
||||
if ( ! setting.navMenuId ) {
|
||||
throw new Error( 'Expected navMenuId property to be set.' );
|
||||
}
|
||||
self.refreshMenu( setting.navMenuId );
|
||||
};
|
||||
api.MenusCustomizerPreview.refreshMenu( setting.navMenuId );
|
||||
},
|
||||
|
||||
/**
|
||||
* Handle changing of a nav_menu_item setting.
|
||||
@ -121,21 +119,21 @@ wp.customize.menusPreview = ( function( $, api ) {
|
||||
* @param {object} to
|
||||
* @param {object} from
|
||||
*/
|
||||
self.onChangeNavMenuItemSetting = function( to, from ) {
|
||||
onChangeNavMenuItemSetting : function( to, from ) {
|
||||
if ( from && from.nav_menu_term_id && ( ! to || from.nav_menu_term_id !== to.nav_menu_term_id ) ) {
|
||||
self.refreshMenu( from.nav_menu_term_id );
|
||||
api.MenusCustomizerPreview.refreshMenu( from.nav_menu_term_id );
|
||||
}
|
||||
if ( to && to.nav_menu_term_id ) {
|
||||
self.refreshMenu( to.nav_menu_term_id );
|
||||
api.MenusCustomizerPreview.refreshMenu( to.nav_menu_term_id );
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
/**
|
||||
* Update a given menu rendered in the preview.
|
||||
*
|
||||
* @param {int} menuId
|
||||
*/
|
||||
self.refreshMenu = function( menuId ) {
|
||||
refreshMenu : function( menuId ) {
|
||||
var assignedLocations = [];
|
||||
|
||||
api.each(function( setting, id ) {
|
||||
@ -150,14 +148,14 @@ wp.customize.menusPreview = ( function( $, api ) {
|
||||
this.refreshMenuInstanceDebounced( instanceNumber );
|
||||
}
|
||||
}, this );
|
||||
};
|
||||
},
|
||||
|
||||
/**
|
||||
* Refresh the menu(s) associated with a given nav menu location.
|
||||
*
|
||||
* @param {string} location
|
||||
*/
|
||||
self.refreshMenuLocation = function( location ) {
|
||||
refreshMenuLocation : function( location ) {
|
||||
var foundInstance = false;
|
||||
_.each( settings.navMenuInstanceArgs, function( navMenuArgs, instanceNumber ) {
|
||||
if ( location === navMenuArgs.theme_location ) {
|
||||
@ -168,15 +166,15 @@ wp.customize.menusPreview = ( function( $, api ) {
|
||||
if ( ! foundInstance ) {
|
||||
api.preview.send( 'refresh' );
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
/**
|
||||
* Update a specific instance of a given menu on the page.
|
||||
*
|
||||
* @param {int} instanceNumber
|
||||
*/
|
||||
self.refreshMenuInstance = function( instanceNumber ) {
|
||||
var self = this, data, menuId, customized, container, request, wpNavArgs, instance, containerInstanceClassName;
|
||||
refreshMenuInstance : function( instanceNumber ) {
|
||||
var data, menuId, customized, container, request, wpNavArgs, instance, containerInstanceClassName;
|
||||
|
||||
if ( ! settings.navMenuInstanceArgs[ instanceNumber ] ) {
|
||||
throw new Error( 'unknown_instance_number' );
|
||||
@ -261,20 +259,25 @@ wp.customize.menusPreview = ( function( $, api ) {
|
||||
container.removeClass( 'customize-partial-refreshing' );
|
||||
$( document ).trigger( 'customize-preview-menu-refreshed', [ eventParam ] );
|
||||
} );
|
||||
};
|
||||
},
|
||||
|
||||
self.refreshMenuInstanceDebounced = function( instanceNumber ) {
|
||||
refreshMenuInstanceDebounced : function( instanceNumber ) {
|
||||
if ( currentRefreshDebounced[ instanceNumber ] ) {
|
||||
clearTimeout( currentRefreshDebounced[ instanceNumber ] );
|
||||
}
|
||||
currentRefreshDebounced[ instanceNumber ] = setTimeout(
|
||||
function() {
|
||||
self.refreshMenuInstance( instanceNumber );
|
||||
},
|
||||
_.bind( function() {
|
||||
this.refreshMenuInstance( instanceNumber );
|
||||
}, this ),
|
||||
refreshDebounceDelay
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
return self;
|
||||
api.bind( 'preview-ready', function() {
|
||||
api.preview.bind( 'active', function() {
|
||||
api.MenusCustomizerPreview.init();
|
||||
} );
|
||||
} );
|
||||
|
||||
}( jQuery, wp.customize ) );
|
||||
}( jQuery, _, wp ) );
|
||||
|
||||
@ -1 +1 @@
|
||||
wp.customize.menusPreview=function(a,b){"use strict";var c={},d=200,e={},f={renderQueryVar:null,renderNonceValue:null,renderNoncePostKey:null,previewCustomizeNonce:null,requestUri:"/",theme:{active:!1,stylesheet:""},navMenuInstanceArgs:{}},g={};return b.bind("preview-ready",function(){b.preview.bind("active",function(){g.init()})}),g.init=function(){var a=this,c={};e=_.extend({},f),"undefined"!=typeof _wpCustomizePreviewNavMenusExports&&_.extend(e,_wpCustomizePreviewNavMenusExports),b.each(function(b,d){b.id=d,c[b.id]=!0,a.bindListener(b)}),b.preview.bind("setting",function(d){var e,f,g;d=d.slice(),e=d.shift(),f=d.shift(),g=b(e),g||(g=b.create(e,f)),g.id||(g.id=e),c[g.id]||(c[g.id]=!0,a.bindListener(g)&&g.callbacks.fireWith(g,[g(),null]))})},g.bindListener=function(a){var b,c;return(b=a.id.match(/^nav_menu\[(-?\d+)]$/))?(a.navMenuId=parseInt(b[1],10),a.bind(g.onChangeNavMenuSetting),!0):(b=a.id.match(/^nav_menu_item\[(-?\d+)]$/))?(a.navMenuItemId=parseInt(b[1],10),a.bind(g.onChangeNavMenuItemSetting),!0):(b=a.id.match(/^nav_menu_locations\[(.+?)]/),b?(c=b[1],a.bind(function(){g.refreshMenuLocation(c)}),!0):!1)},g.onChangeNavMenuSetting=function(){var a=this;if(!a.navMenuId)throw new Error("Expected navMenuId property to be set.");g.refreshMenu(a.navMenuId)},g.onChangeNavMenuItemSetting=function(a,b){!b||!b.nav_menu_term_id||a&&b.nav_menu_term_id===a.nav_menu_term_id||g.refreshMenu(b.nav_menu_term_id),a&&a.nav_menu_term_id&&g.refreshMenu(a.nav_menu_term_id)},g.refreshMenu=function(a){var c=[];b.each(function(b,d){var e=d.match(/^nav_menu_locations\[(.+?)]/);e&&a===b()&&c.push(e[1])}),_.each(e.navMenuInstanceArgs,function(b,d){(a===b.menu||-1!==_.indexOf(c,b.theme_location))&&this.refreshMenuInstanceDebounced(d)},this)},g.refreshMenuLocation=function(a){var c=!1;_.each(e.navMenuInstanceArgs,function(b,d){a===b.theme_location&&(this.refreshMenuInstanceDebounced(d),c=!0)},this),c||b.preview.send("refresh")},g.refreshMenuInstance=function(c){var d,f,g,h,i,j,k,l;if(!e.navMenuInstanceArgs[c])throw new Error("unknown_instance_number");return k=e.navMenuInstanceArgs[c],l="partial-refreshable-nav-menu-"+String(c),h=a("."+l),_.isNumber(k.menu)?f=k.menu:k.theme_location&&b.has("nav_menu_locations["+k.theme_location+"]")&&(f=b("nav_menu_locations["+k.theme_location+"]").get()),f&&k.can_partial_refresh&&0!==h.length?(f=parseInt(f,10),d={nonce:e.previewCustomizeNonce,wp_customize:"on"},e.theme.active||(d.theme=e.theme.stylesheet),d[e.renderQueryVar]="1",g={},b.each(function(a,b){var c=a.get(),d=!1;d=d||/^nav_menu_locations\[/.test(b),d=d||b==="nav_menu["+String(f)+"]",d=d||/^nav_menu_item\[/.test(b)&&(!1===c||f===c.nav_menu_term_id),d&&(g[b]=c)}),d.customized=JSON.stringify(g),d[e.renderNoncePostKey]=e.renderNonceValue,j=a.extend({},k),d.wp_nav_menu_args_hash=j.args_hash,delete j.args_hash,d.wp_nav_menu_args=JSON.stringify(j),h.addClass("customize-partial-refreshing"),i=wp.ajax.send(null,{data:d,url:e.requestUri}),void i.done(function(d){if(!1===d)return void b.preview.send("refresh");var e,f=h;h=a(d),h.addClass(l),h.addClass("partial-refreshable-nav-menu customize-partial-refreshing"),f.replaceWith(h),e={instanceNumber:c,wpNavArgs:j,oldContainer:f,newContainer:h},h.removeClass("customize-partial-refreshing"),a(document).trigger("customize-preview-menu-refreshed",[e])})):void b.preview.send("refresh")},g.refreshMenuInstanceDebounced=function(a){c[a]&&clearTimeout(c[a]),c[a]=setTimeout(function(){g.refreshMenuInstance(a)},d)},g}(jQuery,wp.customize);
|
||||
!function(a,b,c){"use strict";if(c&&c.customize){var d=c.customize,e={},f=200,g={},h={renderQueryVar:null,renderNonceValue:null,renderNoncePostKey:null,previewCustomizeNonce:null,requestUri:"/",theme:{active:!1,stylesheet:""},navMenuInstanceArgs:{}};d.MenusCustomizerPreview={init:function(){var a=this,c={};g=b.extend({},h),"undefined"!=typeof _wpCustomizePreviewNavMenusExports&&b.extend(g,_wpCustomizePreviewNavMenusExports),d.each(function(b,d){b.id=d,c[b.id]=!0,a.bindListener(b)}),d.preview.bind("setting",function(b){var e,f,g;b=b.slice(),e=b.shift(),f=b.shift(),g=d(e),g||(g=d.create(e,f)),g.id||(g.id=e),c[g.id]||(c[g.id]=!0,a.bindListener(g)&&g.callbacks.fireWith(g,[g(),null]))})},bindListener:function(a){var c,d;return(c=a.id.match(/^nav_menu\[(-?\d+)]$/))?(a.navMenuId=parseInt(c[1],10),a.bind(this.onChangeNavMenuSetting),!0):(c=a.id.match(/^nav_menu_item\[(-?\d+)]$/))?(a.navMenuItemId=parseInt(c[1],10),a.bind(this.onChangeNavMenuItemSetting),!0):(c=a.id.match(/^nav_menu_locations\[(.+?)]/),c?(d=c[1],a.bind(b.bind(function(){this.refreshMenuLocation(d)},this)),!0):!1)},onChangeNavMenuSetting:function(){var a=this;if(!a.navMenuId)throw new Error("Expected navMenuId property to be set.");d.MenusCustomizerPreview.refreshMenu(a.navMenuId)},onChangeNavMenuItemSetting:function(a,b){!b||!b.nav_menu_term_id||a&&b.nav_menu_term_id===a.nav_menu_term_id||d.MenusCustomizerPreview.refreshMenu(b.nav_menu_term_id),a&&a.nav_menu_term_id&&d.MenusCustomizerPreview.refreshMenu(a.nav_menu_term_id)},refreshMenu:function(a){var c=[];d.each(function(b,d){var e=d.match(/^nav_menu_locations\[(.+?)]/);e&&a===b()&&c.push(e[1])}),b.each(g.navMenuInstanceArgs,function(d,e){(a===d.menu||-1!==b.indexOf(c,d.theme_location))&&this.refreshMenuInstanceDebounced(e)},this)},refreshMenuLocation:function(a){var c=!1;b.each(g.navMenuInstanceArgs,function(b,d){a===b.theme_location&&(this.refreshMenuInstanceDebounced(d),c=!0)},this),c||d.preview.send("refresh")},refreshMenuInstance:function(e){var f,h,i,j,k,l,m,n;if(!g.navMenuInstanceArgs[e])throw new Error("unknown_instance_number");return m=g.navMenuInstanceArgs[e],n="partial-refreshable-nav-menu-"+String(e),j=a("."+n),b.isNumber(m.menu)?h=m.menu:m.theme_location&&d.has("nav_menu_locations["+m.theme_location+"]")&&(h=d("nav_menu_locations["+m.theme_location+"]").get()),h&&m.can_partial_refresh&&0!==j.length?(h=parseInt(h,10),f={nonce:g.previewCustomizeNonce,wp_customize:"on"},g.theme.active||(f.theme=g.theme.stylesheet),f[g.renderQueryVar]="1",i={},d.each(function(a,b){var c=a.get(),d=!1;d=d||/^nav_menu_locations\[/.test(b),d=d||b==="nav_menu["+String(h)+"]",d=d||/^nav_menu_item\[/.test(b)&&(!1===c||h===c.nav_menu_term_id),d&&(i[b]=c)}),f.customized=JSON.stringify(i),f[g.renderNoncePostKey]=g.renderNonceValue,l=a.extend({},m),f.wp_nav_menu_args_hash=l.args_hash,delete l.args_hash,f.wp_nav_menu_args=JSON.stringify(l),j.addClass("customize-partial-refreshing"),k=c.ajax.send(null,{data:f,url:g.requestUri}),void k.done(function(b){if(!1===b)return void d.preview.send("refresh");var c,f=j;j=a(b),j.addClass(n),j.addClass("partial-refreshable-nav-menu customize-partial-refreshing"),f.replaceWith(j),c={instanceNumber:e,wpNavArgs:l,oldContainer:f,newContainer:j},j.removeClass("customize-partial-refreshing"),a(document).trigger("customize-preview-menu-refreshed",[c])})):void d.preview.send("refresh")},refreshMenuInstanceDebounced:function(a){e[a]&&clearTimeout(e[a]),e[a]=setTimeout(b.bind(function(){this.refreshMenuInstance(a)},this),f)}},d.bind("preview-ready",function(){d.preview.bind("active",function(){d.MenusCustomizerPreview.init()})})}}(jQuery,_,wp);
|
||||
@ -4,7 +4,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.3-beta3-33346';
|
||||
$wp_version = '4.3-beta3-33347';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user