Skip to content

Commit

Permalink
Fixed nav-current detection in IE which omitted the leading slash fro…
Browse files Browse the repository at this point in the history
…m pathname.
  • Loading branch information
Paul Jackson authored and Paul Jackson committed Sep 19, 2012
1 parent fad757e commit 99cbdc2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build/js/pe-ap-min.js

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions src/js/pe-ap.js
Expand Up @@ -709,14 +709,17 @@
menulinks,
menulink,
menulinkurl,
menulinkurllen,
menulinkquery,
menulinkquerylen,
menulinkslen,
bclinks,
bclink,
bclinkurl,
bclinkslen,
bcindex,
h1text = pe.main.find('h1').text(),
addslash = true,
match = false;
menusrc = typeof menusrc.jquery !== 'undefined' ? menusrc : $(menusrc);
menulinks = menusrc.find('a').get();
Expand All @@ -729,17 +732,19 @@
while (menulinkslen--) {
menulink = menulinks[menulinkslen];
if (menulink.getAttribute('href').slice(0, 1) !== '#') {
menulinkurl = menulink.hostname + menulink.pathname;
menulinkurl = menulink.hostname + menulink.pathname.replace(/^([^\/])/, '/$1');
menulinkurllen = menulinkurl.length;
menulinkquery = menulink.search;
menulinkquerylen = menulinkquery.length;
bcindex = bclinkslen;
if ((pageurl.slice(-menulinkurl.length) === menulinkurl && (menulinkquery.length === 0 || pageurlquery.slice(-menulinkquery.length) === menulinkquery)) || menulink.innerHTML === h1text) {
if ((pageurl.slice(-menulinkurllen) === menulinkurl && (menulinkquerylen === 0 || pageurlquery.slice(-menulinkquerylen) === menulinkquery)) || menulink.innerHTML === h1text) {
match = true;
break;
}
while (bcindex--) {
bclink = bclinks[bcindex];
bclinkurl = bclink.hostname + bclink.pathname;
if (bclinkurl.indexOf(menulinkurl) !== -1) {
bclinkurl = bclink.hostname + bclink.pathname.replace(/^([^\/])/, '/$1');
if (bclinkurl.slice(-menulinkurllen) === menulinkurl) {
match = true;
break;
}
Expand Down

0 comments on commit 99cbdc2

Please sign in to comment.