Prechádzať zdrojové kódy

Deplacement loadData

Arthur Brandao 5 rokov pred
rodič
commit
0e72886fcc
2 zmenil súbory, kde vykonal 38 pridanie a 39 odobranie
  1. 0 39
      src/index.html
  2. 38 0
      src/js/script.js

+ 0 - 39
src/index.html

@@ -132,45 +132,6 @@
                 const tooltip = M.Tooltip.init(document.querySelectorAll('.tooltipped'))[0];
             });
 
-            /**
-             * Load all card
-             * @param boolean toArray (optionnal) send result in array and not in object (default: false)
-             */
-            function loadData(toArray) {
-                toArray = toArray ? toArray : false;
-                const data = toArray ? [] : {};
-                return new Promise(resolve => {
-                    // Data already load
-                    if (localStorage.list) {
-                        const list = JSON.parse(localStorage.list);
-                        for (element of list) {
-                            console.log(element);
-                            toArray ? data.push(JSON.parse(localStorage.getItem(element))) : data[element] = JSON.parse(localStorage.getItem(element));
-                        }
-                        resolve(data);
-                    } 
-                    // Load data on server
-                    else {
-                        const list = [];
-                        $.getJSON('data/list.json', (file) => {
-                            const total = file.length;
-                            let count = 0;
-                            file.forEach(element => {
-                                $.getJSON(`data/${element}.json`, (result) => {
-                                    toArray ? data.push(result) : data[result.id] = result;
-                                    list.push(result.id);
-                                    localStorage.setItem(result.id, JSON.stringify(result));
-                                    if (++count === total) {
-                                        localStorage.setItem('list', JSON.stringify(list));
-                                        resolve(data);
-                                    }
-                                });
-                            });
-                        });
-                    }
-                });
-            }
-
             function printContent(scope) {
                 for(element of scope.card) {
                     element.content = element.content.toHTML();

+ 38 - 0
src/js/script.js

@@ -52,4 +52,42 @@ function parseURLParameter() {
 function getURLParameter(key) {
     const get = parseURLParameter();
     return get[key];
+}
+
+/**
+ * Load all card
+ * @param boolean toArray (optionnal) send result in array and not in object (default: false)
+ */
+function loadData(toArray) {
+    toArray = toArray ? toArray : false;
+    const data = toArray ? [] : {};
+    return new Promise(resolve => {
+        // Data already load
+        if (localStorage.list) {
+            const list = JSON.parse(localStorage.list);
+            for (element of list) {
+                toArray ? data.push(JSON.parse(localStorage.getItem(element))) : data[element] = JSON.parse(localStorage.getItem(element));
+            }
+            resolve(data);
+        } 
+        // Load data on server
+        else {
+            const list = [];
+            $.getJSON('data/list.json', (file) => {
+                const total = file.length;
+                let count = 0;
+                file.forEach(element => {
+                    $.getJSON(`data/${element}.json`, (result) => {
+                        toArray ? data.push(result) : data[result.id] = result;
+                        list.push(result.id);
+                        localStorage.setItem(result.id, JSON.stringify(result));
+                        if (++count === total) {
+                            localStorage.setItem('list', JSON.stringify(list));
+                            resolve(data);
+                        }
+                    });
+                });
+            });
+        }
+    });
 }