xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scroll functions in Edge (#2337)

Browse Source 
Use more standard / robust document.scrollingElement
pull/2346/head
Alexandre Alapetite 6 years ago committed by GitHub
parent 2efab9893c
commit e1bb23ee44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      p/scripts/main.js

21
p/scripts/main.js
Unescape View File

@ -2,6 +2,7 @@
/* jshint esversion:6, strict:global */ /* jshint esversion:6, strict:global */
//<Polyfills> //<Polyfills>
if (!document.scrollingElement) document.scrollingElement = document.documentElement;
if (!NodeList.prototype.forEach) NodeList.prototype.forEach = Array.prototype.forEach; if (!NodeList.prototype.forEach) NodeList.prototype.forEach = Array.prototype.forEach;
if (!Element.prototype.matches) Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.mozMatchesSelector || Element.prototype.webkitMatchesSelector; if (!Element.prototype.matches) Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.mozMatchesSelector || Element.prototype.webkitMatchesSelector;
if (!Element.prototype.closest) Element.prototype.closest = function (s) { if (!Element.prototype.closest) Element.prototype.closest = function (s) {
@ -51,11 +52,11 @@ function badAjax() {
} }
function needsScroll(elem) { function needsScroll(elem) {
const winBottom = document.documentElement.scrollTop + document.documentElement.clientHeight, const winBottom = document.scrollingElement.scrollTop + document.scrollingElement.clientHeight,
elemTop = elem.offsetParent.offsetTop + elem.offsetTop, elemTop = elem.offsetParent.offsetTop + elem.offsetTop,
elemBottom = elemTop + elem.offsetHeight; elemBottom = elemTop + elem.offsetHeight;
return (elemTop < document.documentElement.scrollTop || elemBottom > winBottom) ? return (elemTop < document.scrollingElement.scrollTop || elemBottom > winBottom) ?
elemTop - (document.documentElement.clientHeight / 2) : 0; elemTop - (document.scrollingElement.clientHeight / 2) : 0;
} }
function str2int(str) { function str2int(str) {
@ -363,7 +364,7 @@ function toggleContent(new_active, old_active, skipping) {
} }
const relative_move = context.current_view === 'global', const relative_move = context.current_view === 'global',
box_to_move = relative_move ? document.getElementById('panel') : document.documentElement; box_to_move = relative_move ? document.getElementById('panel') : document.scrollingElement;
if (context.sticky_post) { //Stick the article to the top when opened if (context.sticky_post) { //Stick the article to the top when opened
let prev_article = new_active.previousElementSibling, let prev_article = new_active.previousElementSibling,
@ -528,7 +529,7 @@ function user_filter(key) {
// Force scrolling to the filter div // Force scrolling to the filter div
const scroll = needsScroll(document.querySelector('.header')); const scroll = needsScroll(document.querySelector('.header'));
if (scroll !== 0) { if (scroll !== 0) {
document.documentElement.scrollTop = scroll; document.scrollingElement.scrollTop = scroll;
} }
// Force the key value if there is only one action, so we can trigger it automatically // Force the key value if there is only one action, so we can trigger it automatically
if (filters.length === 1) { if (filters.length === 1) {
@ -556,7 +557,7 @@ function auto_share(key) {
// Force scrolling to the share div // Force scrolling to the share div
const scrollTop = needsScroll(share.closest('.bottom')); const scrollTop = needsScroll(share.closest('.bottom'));
if (scrollTop !== 0) { if (scrollTop !== 0) {
document.documentElement.scrollTop = scrollTop; document.scrollingElement.scrollTop = scrollTop;
} }
// Force the key value if there is only one action, so we can trigger it automatically // Force the key value if there is only one action, so we can trigger it automatically
if (shares.length === 1) { if (shares.length === 1) {
@ -621,10 +622,10 @@ function onScroll() {
function init_posts() { function init_posts() {
if (context.auto_load_more || context.auto_mark_scroll || context.auto_remove_article) { if (context.auto_load_more || context.auto_mark_scroll || context.auto_remove_article) {
box_to_follow = context.current_view === 'global' ? document.getElementById('panel') : document.documentElement; box_to_follow = context.current_view === 'global' ? document.getElementById('panel') : document.scrollingElement;
let lastScroll = 0, //Throttle let lastScroll = 0, //Throttle
timerId = 0; timerId = 0;
(box_to_follow === document.documentElement ? window : box_to_follow).onscroll = function () { (box_to_follow === document.scrollingElement ? window : box_to_follow).onscroll = function () {
clearTimeout(timerId); clearTimeout(timerId);
if (lastScroll + 500 < Date.now()) { if (lastScroll + 500 < Date.now()) {
lastScroll = Date.now(); lastScroll = Date.now();
@ -987,10 +988,10 @@ function init_nav_entries() {
}; };
nav_entries.querySelector('.up').onclick = function (e) { nav_entries.querySelector('.up').onclick = function (e) {
const active_item = document.querySelector('.flux.current'), const active_item = document.querySelector('.flux.current'),
windowTop = document.documentElement.scrollTop, windowTop = document.scrollingElement.scrollTop,
item_top = active_item.offsetParent.offsetTop + active_item.offsetTop; item_top = active_item.offsetParent.offsetTop + active_item.offsetTop;
document.documentElement.scrollTop = windowTop > item_top ? item_top : 0; document.scrollingElement.scrollTop = windowTop > item_top ? item_top : 0;
return false; return false;
}; };
} }

Write Preview
Loading…
Cancel
Save