From 94201ed44ac1835637e77a6a7f583aca70bbf2d3 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 14 Feb 2021 11:36:44 -0500 Subject: Rename window scroll (#1390) * Rename WindowScroll to ScrollElement * Rename window-scroll.js to scroll-element.js * Update global order --- ext/js/display/display.js | 4 +- ext/js/dom/scroll-element.js | 110 +++++++++++++++++++++++++++++++++++++++++++ ext/js/dom/window-scroll.js | 110 ------------------------------------------- 3 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 ext/js/dom/scroll-element.js delete mode 100644 ext/js/dom/window-scroll.js (limited to 'ext/js') diff --git a/ext/js/display/display.js b/ext/js/display/display.js index c522fe14..fe4160a6 100644 --- a/ext/js/display/display.js +++ b/ext/js/display/display.js @@ -29,8 +29,8 @@ * PopupFactory * PopupMenu * QueryParser + * ScrollElement * TextScanner - * WindowScroll * api * dynamicLoader */ @@ -90,7 +90,7 @@ class Display extends EventDispatcher { this._updateAdderButtonsPromise = Promise.resolve(); this._contentScrollElement = document.querySelector('#content-scroll'); this._contentScrollBodyElement = document.querySelector('#content-body'); - this._windowScroll = new WindowScroll(this._contentScrollElement); + this._windowScroll = new ScrollElement(this._contentScrollElement); this._closeButton = document.querySelector('#close-button'); this._navigationPreviousButton = document.querySelector('#navigate-previous-button'); this._navigationNextButton = document.querySelector('#navigate-next-button'); diff --git a/ext/js/dom/scroll-element.js b/ext/js/dom/scroll-element.js new file mode 100644 index 00000000..173ce499 --- /dev/null +++ b/ext/js/dom/scroll-element.js @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2019-2021 Yomichan Authors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +class ScrollElement { + constructor(node) { + this._node = node; + this._animationRequestId = null; + this._animationStartTime = 0; + this._animationStartX = 0; + this._animationStartY = 0; + this._animationEndTime = 0; + this._animationEndX = 0; + this._animationEndY = 0; + this._requestAnimationFrameCallback = this._onAnimationFrame.bind(this); + } + + get x() { + return this._node !== null ? this._node.scrollLeft : window.scrollX || window.pageXOffset; + } + + get y() { + return this._node !== null ? this._node.scrollTop : window.scrollY || window.pageYOffset; + } + + toY(y) { + this.to(this.x, y); + } + + toX(x) { + this.to(x, this.y); + } + + to(x, y) { + this.stop(); + this._scroll(x, y); + } + + animate(x, y, time) { + this._animationStartX = this.x; + this._animationStartY = this.y; + this._animationStartTime = window.performance.now(); + this._animationEndX = x; + this._animationEndY = y; + this._animationEndTime = this._animationStartTime + time; + this._animationRequestId = window.requestAnimationFrame(this._requestAnimationFrameCallback); + } + + stop() { + if (this._animationRequestId === null) { + return; + } + + window.cancelAnimationFrame(this._animationRequestId); + this._animationRequestId = null; + } + + // Private + + _onAnimationFrame(time) { + if (time >= this._animationEndTime) { + this._scroll(this._animationEndX, this._animationEndY); + this._animationRequestId = null; + return; + } + + const t = this._easeInOutCubic((time - this._animationStartTime) / (this._animationEndTime - this._animationStartTime)); + this._scroll( + this._lerp(this._animationStartX, this._animationEndX, t), + this._lerp(this._animationStartY, this._animationEndY, t) + ); + + this._animationRequestId = window.requestAnimationFrame(this._requestAnimationFrameCallback); + } + + _easeInOutCubic(t) { + if (t < 0.5) { + return (4.0 * t * t * t); + } else { + t = 1.0 - t; + return 1.0 - (4.0 * t * t * t); + } + } + + _lerp(start, end, percent) { + return (end - start) * percent + start; + } + + _scroll(x, y) { + if (this._node !== null) { + this._node.scrollLeft = x; + this._node.scrollTop = y; + } else { + window.scroll(x, y); + } + } +} diff --git a/ext/js/dom/window-scroll.js b/ext/js/dom/window-scroll.js deleted file mode 100644 index 33577795..00000000 --- a/ext/js/dom/window-scroll.js +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2019-2021 Yomichan Authors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -class WindowScroll { - constructor(node) { - this._node = node; - this._animationRequestId = null; - this._animationStartTime = 0; - this._animationStartX = 0; - this._animationStartY = 0; - this._animationEndTime = 0; - this._animationEndX = 0; - this._animationEndY = 0; - this._requestAnimationFrameCallback = this._onAnimationFrame.bind(this); - } - - get x() { - return this._node !== null ? this._node.scrollLeft : window.scrollX || window.pageXOffset; - } - - get y() { - return this._node !== null ? this._node.scrollTop : window.scrollY || window.pageYOffset; - } - - toY(y) { - this.to(this.x, y); - } - - toX(x) { - this.to(x, this.y); - } - - to(x, y) { - this.stop(); - this._scroll(x, y); - } - - animate(x, y, time) { - this._animationStartX = this.x; - this._animationStartY = this.y; - this._animationStartTime = window.performance.now(); - this._animationEndX = x; - this._animationEndY = y; - this._animationEndTime = this._animationStartTime + time; - this._animationRequestId = window.requestAnimationFrame(this._requestAnimationFrameCallback); - } - - stop() { - if (this._animationRequestId === null) { - return; - } - - window.cancelAnimationFrame(this._animationRequestId); - this._animationRequestId = null; - } - - // Private - - _onAnimationFrame(time) { - if (time >= this._animationEndTime) { - this._scroll(this._animationEndX, this._animationEndY); - this._animationRequestId = null; - return; - } - - const t = this._easeInOutCubic((time - this._animationStartTime) / (this._animationEndTime - this._animationStartTime)); - this._scroll( - this._lerp(this._animationStartX, this._animationEndX, t), - this._lerp(this._animationStartY, this._animationEndY, t) - ); - - this._animationRequestId = window.requestAnimationFrame(this._requestAnimationFrameCallback); - } - - _easeInOutCubic(t) { - if (t < 0.5) { - return (4.0 * t * t * t); - } else { - t = 1.0 - t; - return 1.0 - (4.0 * t * t * t); - } - } - - _lerp(start, end, percent) { - return (end - start) * percent + start; - } - - _scroll(x, y) { - if (this._node !== null) { - this._node.scrollLeft = x; - this._node.scrollTop = y; - } else { - window.scroll(x, y); - } - } -} -- cgit v1.2.3