Skip to content

Commit

Permalink
Refactoring method names
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrea Verlicchi committed Jun 25, 2020
1 parent 5ea5649 commit c4bd423
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/lazyload.cancelOnExit.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { removeClass } from "./lazyload.class";
import { updateLoadingCount } from "./lazyload.counters";
import { resetStatus, hasStatusLoading } from "./lazyload.data";

export const cancelLoadingIfRequired = (element, entry, settings, instance) => {
export const cancelLoading = (element, entry, settings, instance) => {
if (!settings.cancel_on_exit) return;
if (!hasStatusLoading(element)) return;
if (element.tagName !== "IMG") return; //Works only on images
Expand Down
8 changes: 4 additions & 4 deletions src/lazyload.intersectionHandlers.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { safeCallback } from "./lazyload.callback";
import { load } from "./lazyload.load";
import { hasEmptyStatus, hadStartedLoading } from "./lazyload.data";
import { cancelLoadingIfRequired } from "./lazyload.cancelOnExit";
import { unobserveIfRequired } from "./lazyload.unobserve";
import { cancelLoading } from "./lazyload.cancelOnExit";
import { unobserveEntered } from "./lazyload.unobserve";

export const onEnter = (element, entry, settings, instance) => {
safeCallback(settings.callback_enter, element, entry, instance);
unobserveIfRequired(element, settings, instance);
unobserveEntered(element, settings, instance);
if (hadStartedLoading(element)) return; //Prevent loading it again
load(element, settings, instance);
};

export const onExit = (element, entry, settings, instance) => {
if (hasEmptyStatus(element)) return; //Ignore the first pass, at landing
cancelLoadingIfRequired(element, entry, settings, instance);
cancelLoading(element, entry, settings, instance);
safeCallback(settings.callback_exit, element, entry, instance);
};
2 changes: 1 addition & 1 deletion src/lazyload.unobserve.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ export const resetObserver = (observer) => {
observer.disconnect();
};

export const unobserveIfRequired = (element, settings, instance) => {
export const unobserveEntered = (element, settings, instance) => {
if (settings.unobserve_entered) unobserve(element, instance);
}

0 comments on commit c4bd423

Please sign in to comment.