diff --git a/widget/navbar/src/navbar.js b/widget/navbar/src/navbar.js index 8865a5e8d1eedfa126ae4de242863d87b0498e53..5ff861236a64b30dd05c8b1549a705610cc5cf5b 100755 --- a/widget/navbar/src/navbar.js +++ b/widget/navbar/src/navbar.js @@ -17,7 +17,7 @@ define(function(require, exports, module) { $navBarNav = $navBar.find('.am-navbar-nav'), $navItems = $navBar.find('li'), navItemsCounter = $navItems.length; - configItems = $navBarNav.attr('class') && parseInt($navBarNav.attr('class').match(/sm-block-grid-(\d)/)[1]) || 3, + configItems = $navBarNav.attr('class') && parseInt($navBarNav.attr('class').match(/sm-block-grid-(\d+)/)[1]) || 3, navMinWidth = 60, //每个li最小宽度 offsetWidth = 16, $share = $navItems.filter('[data-am-navbar-share]'), @@ -71,11 +71,12 @@ define(function(require, exports, module) { }); } - if (navItemsCounter > configItems && navItemsCounter > calcSuiteItems()) { initActions(); } + // console.log('NavItems: %d, config: %d, best: %d', navItemsCounter, configItems, calcSuiteItems()); + function initActions() { $navBarNav.append($moreLink); @@ -86,8 +87,6 @@ define(function(require, exports, module) { } function checkNavBarItems() { - // console.log('best: %d', calcSuiteItems()); - if (calcSuiteItems() >= navItemsCounter) { // 显示所有链接,隐藏 more $moreLink.hide();