Skip to content
This repository was archived by the owner on Jan 24, 2018. It is now read-only.

Fix skrollr-menu handling unwanted links #48

Open
manuelbua wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix skrollr-menu handling unwanted links #48

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40064b0
Fix skrollr-menu handling unwanted links
manuelbua Jul 8, 2014
226379b
Minor code layout fix
manuelbua Jul 8, 2014
616d107
Fix null case, minor code layout
manuelbua Aug 5, 2014
88e6d7c
Fix edge case, minor refactoring
manuelbua Aug 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/skrollr.menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@
var handleLink = function(link, fake) {
//Don't use the href property (link.href) because it contains the absolute url.
var href = link.getAttribute('href');
var clazz = link.getAttribute('class');
var validClazz = !(clazz===null) && (clazz.trim().length > 0);

//Check if it's a hashlink.
if(!/^#/.test(href)) {
if(!/^#/.test(href) || (!validClazz) || (validClazz && clazz.indexOf(_menuLinkClass)==-1)) {
return false;
}

Expand Down Expand Up @@ -132,8 +134,8 @@

var jumpStraightToHash = function() {
if(window.location.hash && document.querySelector) {
var link = document.querySelector('a[href="' + window.location.hash + '"]');

var searchFor = 'a' + (_menuLinkClass ? '.' + _menuLinkClass: '');
var link = document.querySelector(searchFor + '[href="' + window.location.hash + '"]');
if(link) {
handleLink(link, true);
}
Expand All @@ -158,6 +160,7 @@
_duration = options.duration || DEFAULT_DURATION;
_handleLink = options.handleLink;
_scale = options.scale || DEFAULT_SCALE;
_menuLinkClass = options.menuLinkClass || '';

if(typeof _duration === 'number') {
_duration = (function(duration) {
Expand Down Expand Up @@ -198,6 +201,7 @@
var _animate;
var _handleLink;
var _scale;
var _menuLinkClass;

//In case the page was opened with a hash, prevent jumping to it.
//http://stackoverflow.com/questions/3659072/jquery-disable-anchor-jump-when-loading-a-page
Expand All @@ -206,4 +210,4 @@
window.scrollTo(0, 0);
}
});
}(document, window));
}(document, window));