diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index 3d9f80acde..251e106c74 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -333,33 +333,31 @@ $(document).ready(function() { if(magiVal < 0){ magiVal = 0; } - magiVal = $(window).height()-($('.navbar').height()+$('.footer').height()); - if(magiVal < 0){ - magiVal = 0; - } $('.editorScrollDiv').css("height", (magiVal-85) + "px"); } magiVal = $(window).height()-($('.navbar').height()+$('.footer').height()); if(magiVal < 0){ magiVal = 0; } - $('.scroll-locker').css("min-height", $('.editorScrollDiv').height()).css("height",magiVal-85); + + console.log(magiVal); + + $('.scroll-locker').css("min-height", $('.editorScrollDiv').height()).css("height",magiVal-185); } else { $('.editorScrollDiv').css("max-height", 500 + "px"); - $('.scroll-locker').css('position', 'inherit').css('top', 'inherit').css('width', '100%').css('max-height', '85%').css('overflow-y', 'auto').css('overflow-x', 'hidden'); + $('.scroll-locker').css('position', 'inherit').css('top', 'inherit').css('width', '100%').css('max-height', '85%'); } } - if ($('.scroll-locker').offset()){ - $(document).ready(function(){ + if ($('.scroll-locker').html()){ + $('.scroll-locker').css('overflow-y', 'auto').css('overflow-x', 'hidden') lockTop(); $(window).on('resize', function(){ lockTop(); }); - $(window).scroll(function() { + $(window).on('scroll', function() { lockTop(); }); - }); } } });