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

Remove more trailing commas in nav menus JS. props koopersmith and ocean90, see #13220.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14474 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-06 15:40:29 +00:00
parent 970943e636
commit 494290312a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ var wpNavMenu, WPNavMenuHandler = function ($) {
t.find('img.waiting').hide(); t.find('img.waiting').hide();
}); });
}); });
}, }
}); });
}, },
@ -476,7 +476,7 @@ var wpNavMenu, WPNavMenuHandler = function ($) {
'action': 'add-menu-item', 'action': 'add-menu-item',
'menu': menu, 'menu': menu,
'menu-settings-column-nonce': nonce, 'menu-settings-column-nonce': nonce,
'menu-item': menuItem, 'menu-item': menuItem
}; };
$.post( ajaxurl, params, function(menuMarkup) { $.post( ajaxurl, params, function(menuMarkup) {
@ -560,7 +560,7 @@ var wpNavMenu, WPNavMenuHandler = function ($) {
tabs = fluid.children('.nav-tab'), tabs = fluid.children('.nav-tab'),
tabsWidth = 0, tabsWidth = 0,
fixedRight, fixedLeft, fixedRight, fixedLeft,
arrowLeft, arrowRight arrowLeft, arrowRight,
resizing = false; resizing = false;
function resetMenuTabs() { function resetMenuTabs() {
@ -576,9 +576,9 @@ var wpNavMenu, WPNavMenuHandler = function ($) {
left = t.offset().left; left = t.offset().left;
right = left + t.outerWidth(); right = left + t.outerWidth();
if( right > fixedRight ) if( right > fixedRight )
fluid.animate({ 'margin-left' : "+=" + (fixedRight - right) + 'px', }, 'fast'); fluid.animate({ 'margin-left' : "+=" + (fixedRight - right) + 'px' }, 'fast');
else if ( left < fixedLeft ) else if ( left < fixedLeft )
fluid.animate({ 'margin-left' : "-=" + (left - fixedLeft) + 'px', }, 'fast'); fluid.animate({ 'margin-left' : "-=" + (left - fixedLeft) + 'px' }, 'fast');
return t; return t;
}, },
isTabVisible : function() { isTabVisible : function() {
@ -603,7 +603,7 @@ var wpNavMenu, WPNavMenuHandler = function ($) {
// Set up right margin for overflow, unset padding // Set up right margin for overflow, unset padding
fluid.css({ fluid.css({
'margin-right' : (-1 * tabsWidth) + 'px', 'margin-right' : (-1 * tabsWidth) + 'px',
'padding' : 0, 'padding' : 0
}); });
// Build tab navigation // Build tab navigation
@ -629,19 +629,19 @@ var wpNavMenu, WPNavMenuHandler = function ($) {
arrow : arrowLeft, arrow : arrowLeft,
next : "next", next : "next",
last : "first", last : "first",
operator : "+=", operator : "+="
},{ },{
arrow : arrowRight, arrow : arrowRight,
next : "prev", next : "prev",
last : "last", last : "last",
operator : "-=", operator : "-="
}], function(){ }], function(){
var that = this; var that = this;
this.arrow.mousedown(function(){ this.arrow.mousedown(function(){
var last = tabs[that.last](), var last = tabs[that.last](),
fn = function() { fn = function() {
if( ! last.isTabVisible() ) if( ! last.isTabVisible() )
fluid.animate({ 'margin-left' : that.operator + '90px', }, 300, "linear", fn); fluid.animate({ 'margin-left' : that.operator + '90px' }, 300, "linear", fn);
}; };
fn(); fn();
}).mouseup(function(){ }).mouseup(function(){

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

File diff suppressed because one or more lines are too long