Browse Source

affinage reglages pour sidebar sticked

Bastien Sevajol 11 years ago
parent
commit
e43ee1140e

+ 9 - 6
src/Muzich/CoreBundle/Resources/public/js/muzich.js View File

2605
       $(this).parents('li.top_menu_element').addClass('open');
2605
       $(this).parents('li.top_menu_element').addClass('open');
2606
       $(this).parents('li.top_menu_element').find('ul.submenu').show();
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
       //sidebar_fix_to_bottom_finish();
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
         $(".sidebar").animate({
2614
         $(".sidebar").animate({
2614
           top: top_recalculated
2615
           top: top_recalculated
2615
         }, 500);
2616
         }, 500);
2621
       $(this).parents('li.top_menu_element').removeClass('open');
2622
       $(this).parents('li.top_menu_element').removeClass('open');
2622
       $(this).parents('li.top_menu_element').addClass('close');
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
       //sidebar_fix_to_bottom_finish();
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
         var top_recalculated =  top - diff;
2630
         var top_recalculated =  top - diff;
2630
         $(".sidebar").animate({
2631
         $(".sidebar").animate({
2631
           top: top_recalculated
2632
           top: top_recalculated
3312
   {
3313
   {
3313
     $('#content').stickySidebar();
3314
     $('#content').stickySidebar();
3314
     window.sidebar_sticked = true;
3315
     window.sidebar_sticked = true;
3316
+    console.log('window.sidebar_sticked');
3315
   }
3317
   }
3316
   else
3318
   else
3317
   {
3319
   {
3318
     $('#sidebar .sidebar').css('padding-bottom', '155px');
3320
     $('#sidebar .sidebar').css('padding-bottom', '155px');
3319
     $("#sidebar .sidebar").sticky({topSpacing:25});
3321
     $("#sidebar .sidebar").sticky({topSpacing:25});
3320
     window.sidebar_topsticked = true;
3322
     window.sidebar_topsticked = true;
3323
+    console.log('window.sidebar_topsticked');
3321
   }
3324
   }
3322
   
3325
   
3323
 });
3326
 });

+ 0 - 0
web/img/1361037350_control_play_off.png View File


+ 0 - 0
web/img/drag1.png View File


+ 0 - 0
web/img/drag2.png View File


+ 0 - 0
web/img/drag3.png View File


+ 0 - 0
web/img/icon_add.png View File


+ 0 - 0
web/img/icon_add_2.png View File


+ 0 - 0
web/img/icon_more.png View File


+ 0 - 0
web/img/icon_more_2.png View File


+ 0 - 0
web/img/tag_color.png View File


+ 0 - 0
web/img/tick_ticked.png View File


+ 0 - 0
web/img/tick_untick.png View File


+ 0 - 0
web/js/jquery.sticky.js View File


+ 0 - 0
web/js/jquery.stickysidebar.js View File