Skip to content
This repository has been archived by the owner on Feb 22, 2018. It is now read-only.

Commit

Permalink
fix ToC scrolls off screen on articles (close #258)
Browse files Browse the repository at this point in the history
  • Loading branch information
vicb committed Jan 11, 2014
1 parent 77f7f00 commit 46dc3eb
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 15 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -8,3 +8,4 @@ Google Inc.
Matthew Butler <butler.matthew@gmail.com>
Chris Buckett <chrisbuckett@gmail.com>
Michael Haubenwallner <michael.haubenwallner@gmail.com>
Victor Berchet <victor.berchet@gmail.com>
43 changes: 28 additions & 15 deletions src/site/js/scripts.js
Expand Up @@ -67,26 +67,39 @@ $(function() {
target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
var isnavtabs = $('.nav-tabs')[0];
if (target.length && !isnavtabs) {
var scrollOffset = $('.navbar').outerHeight() + scrollPadding;
if(typeof $(this).data('slide') !== 'undefined') {
$('html,body').animate({
scrollTop: target.offset().top - scrollOffset
}, 1000);
}

window.location.hash = this.hash;
var hashPrefix = $(this).data('slide') ? "jsa-" : "js-";
window.location.hash = hashPrefix + this.hash.substr(1);
return false;
} else {
window.location.hash = this.hash;
}
}
});

var currentHash;
setInterval(
function() {
var match = window.location.hash.match(/^#js(a?)-(.*)$/);
if (match === null) {
return;
}
var target = $('a[name=' + match[2] + ']');
if (match[2] !== currentHash && target) {
var scrollOffset = $('.navbar').outerHeight() + scrollPadding;
$('html,body').animate({
scrollTop: target.offset().top - scrollOffset
}, match[1] ? 1000 : 1);
currentHash = match[2];
}
},
100
);
});



$(function(){

var popOpen = false;

$('.dart-popover').popover();
Expand All @@ -110,7 +123,7 @@ $(function(){
var targetTouch = $(touch.target);
if(!navDisabled) {
if(targetTouch[0] == navToggle[0] || targetTouch[0] == iconBar[0]) {

// iconBar.removeClass('collapsed');
}
} else {
Expand All @@ -125,10 +138,10 @@ $(function(){
// iconBar.removeClass('collapsed');
}


});


$(document).on('touchmove', function(e) {
// console.log($(this).scrollTop(), lastScrollPosY);
if($(this).scrollTop() != lastScrollPosY) {
Expand Down Expand Up @@ -174,17 +187,17 @@ $(function(){
e.preventDefault();
if (popOpen) {
$('.dart-popover').not(this).popover('hide');
}
}
popOpen = true;

});



// Adding the navigation to the popup
// $("a.dart-popover").each(function(index) {
// var lnk = $(this);

// // Add prev and nex buttons
// if ( lnk == $('.lang-dart:first-child a.dart-popover') ) {
// //console.log('first');
Expand Down

0 comments on commit 46dc3eb

Please sign in to comment.