diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 9c1b28b..dc1e7e1 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -751,15 +751,15 @@ function transdate(){ window.clearTimeout(window.focus_timeout_id); } var _this = $(document.activeElement);//$(this); - if(!_this.hasClass('close-screen-btn')){ - var topOffset = window.temp_scrollY + window.top_barrier_height; - var ele_offset = _this.offset().top - topOffset; + if($('body').css('position') != 'fixed' && !_this.hasClass('close-screen-btn') && !_this.hasClass('navbar-toggle')){ + var ele_offset = _this[0].getBoundingClientRect().top - window.top_barrier_height; + console.log(_this, ele_offset) if(ele_offset < 0){ window.scroll(window.temp_scrollX, window.temp_scrollY + ele_offset); window.temp_scrollY = Math.max(window.temp_scrollY + ele_offset, 0); } window.focus_timeout_id = window.setTimeout(function(){ - var ele_offset = _this.offset().top - topOffset; + var ele_offset = _this[0].getBoundingClientRect().top - window.top_barrier_height; if(ele_offset < 0){ window.scroll(window.temp_scrollX, window.temp_scrollY + ele_offset); window.temp_scrollY = Math.max(window.temp_scrollY + ele_offset, 0);