|
@@ -2605,11 +2605,12 @@ $(document).ready(function(){
|
2605
|
2605
|
$(this).parents('li.top_menu_element').addClass('open');
|
2606
|
2606
|
$(this).parents('li.top_menu_element').find('ul.submenu').show();
|
2607
|
2607
|
|
|
2608
|
+ var top = parseInt($('.sidebar').css('top'), 10);
|
|
2609
|
+ var diff = $('.sidebar').height() - sidebar_height;
|
|
2610
|
+ var top_recalculated = top - diff;
|
2608
|
2611
|
//sidebar_fix_to_bottom_finish();
|
2609
|
|
- if ($('.sidebar').css('position') == 'absolute' || $('.sidebar').position().top < 1)
|
|
2612
|
+ if ($('.sidebar').css('position') == 'absolute' || parseInt($('.sidebar').css('top'), 10) < (25+diff))
|
2610
|
2613
|
{
|
2611
|
|
- var top = $('.sidebar').position().top;
|
2612
|
|
- var top_recalculated = top - ($('.sidebar').height() - sidebar_height);
|
2613
|
2614
|
$(".sidebar").animate({
|
2614
|
2615
|
top: top_recalculated
|
2615
|
2616
|
}, 500);
|
|
@@ -2621,11 +2622,11 @@ $(document).ready(function(){
|
2621
|
2622
|
$(this).parents('li.top_menu_element').removeClass('open');
|
2622
|
2623
|
$(this).parents('li.top_menu_element').addClass('close');
|
2623
|
2624
|
|
|
2625
|
+ var top = parseInt($('.sidebar').css('top'), 10);
|
|
2626
|
+ var diff = $('.sidebar').height() - sidebar_height;
|
2624
|
2627
|
//sidebar_fix_to_bottom_finish();
|
2625
|
|
- if ($('.sidebar').css('position') == 'absolute' || $('.sidebar').position().top < 1)
|
|
2628
|
+ if ($('.sidebar').css('position') == 'absolute' || parseInt($('.sidebar').css('top'), 10) < (25-diff))
|
2626
|
2629
|
{
|
2627
|
|
- var top = $('.sidebar').position().top;
|
2628
|
|
- var diff = $('.sidebar').height() - sidebar_height;
|
2629
|
2630
|
var top_recalculated = top - diff;
|
2630
|
2631
|
$(".sidebar").animate({
|
2631
|
2632
|
top: top_recalculated
|
|
@@ -3312,12 +3313,14 @@ $(document).ready(function(){
|
3312
|
3313
|
{
|
3313
|
3314
|
$('#content').stickySidebar();
|
3314
|
3315
|
window.sidebar_sticked = true;
|
|
3316
|
+ console.log('window.sidebar_sticked');
|
3315
|
3317
|
}
|
3316
|
3318
|
else
|
3317
|
3319
|
{
|
3318
|
3320
|
$('#sidebar .sidebar').css('padding-bottom', '155px');
|
3319
|
3321
|
$("#sidebar .sidebar").sticky({topSpacing:25});
|
3320
|
3322
|
window.sidebar_topsticked = true;
|
|
3323
|
+ console.log('window.sidebar_topsticked');
|
3321
|
3324
|
}
|
3322
|
3325
|
|
3323
|
3326
|
});
|