Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix scrollTo infinite loop #30

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix scrollTo infinite loop #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff5bc72
fix scrollTo infinite loop
maxime-guyot Dec 21, 2019
c6b34e6
fix #30
maxime-guyot Jan 16, 2020
8d74871
comment scrollTo for performance tests
maxime-guyot Jun 2, 2020
c2fd9ee
merge 2.1.5 + revert comment
maxime-guyot Jun 23, 2020
eee5b52
build prod
maxime-guyot Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion dist/dom7.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Licensed under MIT
*
* Released on: May 15, 2020
* Released on: June 23, 2020
*/
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
Expand Down Expand Up @@ -1253,6 +1253,10 @@
var startTime = null;
if (animateTop && newTop === currentTop) { animateTop = false; }
if (animateLeft && newLeft === currentLeft) { animateLeft = false; }
if (!animateLeft && !animateTop) {
if (callback) { callback(); }
return;
}
function render(time) {
if ( time === void 0 ) time = new Date().getTime();

Expand Down
4 changes: 2 additions & 2 deletions dist/dom7.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dom7.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion dist/dom7.modular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Licensed under MIT
*
* Released on: May 15, 2020
* Released on: June 23, 2020
*/
import { document, window } from 'ssr-window';

Expand Down Expand Up @@ -1014,6 +1014,10 @@ function scrollTo(...args) {
let startTime = null;
if (animateTop && newTop === currentTop) animateTop = false;
if (animateLeft && newLeft === currentLeft) animateLeft = false;
if (!animateLeft && !animateTop) {
if (callback) callback();
return;
}
function render(time = new Date().getTime()) {
if (startTime === null) {
startTime = time;
Expand Down
6 changes: 5 additions & 1 deletion dist/dom7.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Licensed under MIT
*
* Released on: May 15, 2020
* Released on: June 23, 2020
*/
import { document, window } from 'ssr-window';

Expand Down Expand Up @@ -1076,6 +1076,10 @@ function scrollTo(...args) {
let startTime = null;
if (animateTop && newTop === currentTop) animateTop = false;
if (animateLeft && newLeft === currentLeft) animateLeft = false;
if (!animateLeft && !animateTop) {
if (callback) callback();
return;
}
function render(time = new Date().getTime()) {
if (startTime === null) {
startTime = time;
Expand Down
4 changes: 4 additions & 0 deletions src/scroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ function scrollTo(...args) {
let startTime = null;
if (animateTop && newTop === currentTop) animateTop = false;
if (animateLeft && newLeft === currentLeft) animateLeft = false;
if (!animateLeft && !animateTop) {
if (callback) callback();
return;
}
function render(time = new Date().getTime()) {
if (startTime === null) {
startTime = time;
Expand Down