diff --git a/src/initializeOnLinkClickScroll.ts b/src/initializeOnLinkClickScroll.ts index 1ff2dd609f09739189adbcf0be7c3cefc2ca698c..879ad20102445f6acd791a9ff5933d830fad13d8 100644 --- a/src/initializeOnLinkClickScroll.ts +++ b/src/initializeOnLinkClickScroll.ts @@ -1,4 +1,4 @@ -import {scrollTo} from './scrollTo'; +import {scrollToTarget} from './scrollToTarget'; import {assert} from './assert'; import {HashTarget} from './HashTarget'; @@ -11,6 +11,6 @@ export function initializeOnLinkClickScroll(): void assert(element !== null); event.preventDefault(); - scrollTo(HashTarget.fromString(element.hash, document)); + scrollToTarget(HashTarget.fromString(element.hash, document)); }))); } diff --git a/src/initializeOnLoadScroll.ts b/src/initializeOnLoadScroll.ts index 837b15f04e0b6b6cb879d68881ee038e6e438426..ac644d809adbaa2795fd314fffcdf2ffe7d639f0 100644 --- a/src/initializeOnLoadScroll.ts +++ b/src/initializeOnLoadScroll.ts @@ -1,4 +1,4 @@ -import {scrollTo} from './scrollTo'; +import {scrollToTarget} from './scrollToTarget'; import {HashTarget} from './HashTarget'; import {assert} from './assert'; @@ -36,6 +36,6 @@ export function initializeOnLoadScroll(): void // Then, scroll down to it smoothly. assert(hashTarget !== null, 'Hash target should be set on DOM loaded.'); - scrollTo(hashTarget); + scrollToTarget(hashTarget); }); } diff --git a/src/scrollTo.ts b/src/scrollToTarget.ts similarity index 52% rename from src/scrollTo.ts rename to src/scrollToTarget.ts index d863549511c119b02de8ae59b807eeaaa89b7dbd..0a5c714fd40d4151a2a917b80bfc72fd47b54681 100644 --- a/src/scrollTo.ts +++ b/src/scrollToTarget.ts @@ -1,11 +1,11 @@ import * as Velocity from 'velocity-animate'; import {HashTarget} from './HashTarget'; -export function scrollTo(hash: HashTarget): void +export function scrollToTarget(hashTarget: HashTarget): void { - Velocity.animate(hash.getElement(), 'scroll', { + Velocity.animate(hashTarget.getElement(), 'scroll', { duration: 1200, // todo: different depending on offset from page top? easing: 'ease-in-skip-out', - complete: () => window.location.hash = hash.getHash(), + complete: () => window.location.hash = hashTarget.getHash(), }); }