From ac9668f9bb188830ca6fac5c411fd7328b3f8c92 Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Sun, 12 Apr 2020 05:47:41 +0200
Subject: [PATCH] Migrate imageLoader to ES6

---
 package.json                         |  3 ++-
 src/components/images/imageLoader.js | 30 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 8de04b362..e33b447f8 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,8 @@
           "src/scripts/dfnshelper.js",
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
-          "src/components/lazyloader/lazyloader-intersectionobserver.js"
+          "src/components/lazyloader/lazyloader-intersectionobserver.js",
+          "src/components/images/imageLoader.js"
         ],
         "plugins": [
           "@babel/plugin-transform-modules-amd"
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index 4d6a45d2d..fda6e5466 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -1,9 +1,9 @@
-define(['lazyLoader', 'userSettings', 'css!./style'], function (lazyLoader, userSettings) {
-    'use strict';
+import lazyLoader from 'lazyLoader';
+import userSettings from 'userSettings';
+import 'css!./style';
+/* eslint-disable indent */
 
-    var self = {};
-
-    function fillImage(entry) {
+    export function fillImage(entry) {
         if (!entry) {
             throw new Error('entry cannot be null');
         }
@@ -59,11 +59,11 @@ define(['lazyLoader', 'userSettings', 'css!./style'], function (lazyLoader, user
         }
     }
 
-    function lazyChildren(elem) {
+    export function lazyChildren(elem) {
         lazyLoader.lazyChildren(elem, fillImage);
     }
 
-    function getPrimaryImageAspectRatio(items) {
+    export function getPrimaryImageAspectRatio(items) {
 
         var values = [];
 
@@ -123,7 +123,7 @@ define(['lazyLoader', 'userSettings', 'css!./style'], function (lazyLoader, user
         return result;
     }
 
-    function fillImages(elems) {
+    export function fillImages(elems) {
 
         for (var i = 0, length = elems.length; i < length; i++) {
             var elem = elems[0];
@@ -131,10 +131,10 @@ define(['lazyLoader', 'userSettings', 'css!./style'], function (lazyLoader, user
         }
     }
 
-    self.fillImages = fillImages;
-    self.lazyImage = fillImage;
-    self.lazyChildren = lazyChildren;
-    self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio;
-
-    return self;
-});
+/* eslint-enable indent */
+export default {
+    fillImages: fillImages,
+    lazyImage: fillImage,
+    lazyChildren: lazyChildren,
+    getPrimaryImageAspectRatio: getPrimaryImageAspectRatio
+};