From 864705c655021e10beef7a751e98526b3ce8f4a3 Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Fri, 30 Nov 2018 17:58:44 +0800 Subject: [PATCH] fix nav menu --- source/js/app.js | 84 ++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/source/js/app.js b/source/js/app.js index 44e2319..4fec345 100755 --- a/source/js/app.js +++ b/source/js/app.js @@ -49,47 +49,47 @@ var customSearch; $top.click(()=>scrolltoElement(document.body)); } - function setHeaderMenu() { - var $headerMenu = $('header .menu'); - var $underline = $headerMenu.find('.underline'); - function setUnderline($item, transition) { - $item = $item || $headerMenu.find('li a.active');//get instant - transition = transition === undefined ? true : !!transition; - if (!transition) $underline.addClass('disable-trans'); - if ($item && $item.length) { - $item.addClass('active').siblings().removeClass('active'); - $underline.css({ - left: $item.position().left, - width: $item.innerWidth() - }); - } else { - $underline.css({ - left: 0, - width: 0 - }); - } - if (!transition) { - setTimeout(function () { $underline.removeClass('disable-trans') }, 0);//get into the queue. - } - } - // $headerMenu.on('mouseenter', 'li', function (e) { - // setUnderline($(e.currentTarget)); - // }); - // $headerMenu.on('mouseout', function () { - // setUnderline(); - // }); - //set current active nav - var $active_link = null; - if (location.pathname === '/' || location.pathname.startsWith('/page/')) { - $active_link = $('.nav-home', $headerMenu); - } else { - var name = location.pathname.match(/\/(.*?)\//); - if (name.length > 1) { - $active_link = $('.nav-' + name[1], $headerMenu); - } - } - setUnderline($active_link, false); - } + // function setHeaderMenu() { + // var $headerMenu = $('header .menu'); + // var $underline = $headerMenu.find('.underline'); + // function setUnderline($item, transition) { + // $item = $item || $headerMenu.find('li a.active');//get instant + // transition = transition === undefined ? true : !!transition; + // if (!transition) $underline.addClass('disable-trans'); + // if ($item && $item.length) { + // $item.addClass('active').siblings().removeClass('active'); + // $underline.css({ + // left: $item.position().left, + // width: $item.innerWidth() + // }); + // } else { + // $underline.css({ + // left: 0, + // width: 0 + // }); + // } + // if (!transition) { + // setTimeout(function () { $underline.removeClass('disable-trans') }, 0);//get into the queue. + // } + // } + // // $headerMenu.on('mouseenter', 'li', function (e) { + // // setUnderline($(e.currentTarget)); + // // }); + // // $headerMenu.on('mouseout', function () { + // // setUnderline(); + // // }); + // //set current active nav + // var $active_link = null; + // if (location.pathname === '/' || location.pathname.startsWith('/page/')) { + // $active_link = $('.nav-home', $headerMenu); + // } else { + // var name = location.pathname.match(/\/(.*?)\//); + // if (name.length > 1) { + // $active_link = $('.nav-' + name[1], $headerMenu); + // } + // } + // setUnderline($active_link, false); + // } function setHeaderMenuPhone() { var $switcher = $('.l_header .switcher .s-menu'); $switcher.click(function (e) { @@ -214,7 +214,7 @@ var customSearch; $(function () { //set header setHeader(); - setHeaderMenu(); + // setHeaderMenu(); setHeaderMenuPhone(); setHeaderSearch(); setWaves();