Affichage ecran chargement

app/main/context-menu.js

@@ -22,7 +22,7 @@ menu.append(new MenuItem({
     type: 'checkbox',
     checked: false,
     click: () => {
-        mainWindow.webContents.send('loader');
+        mainWindow.webContents.send('app-loader');
     }
 }));
 

app/render/event.js

@@ -1,4 +1,4 @@
-const { ipcRenderer } = require('electron');
+ipcRenderer.removeAllListeners();
 
 ipcRenderer.on('reset-app', (event, arg) => {
     document.location = 'reset.html';
@@ -11,6 +11,6 @@ ipcRenderer.on('new-note', (event, arg) => {
     }
 });
 
-ipcRenderer.on('loader', (event, arg) => {
-    console.log('loader');
+ipcRenderer.on('app-loader', (event, arg) => {
+    func.loader();
 });

app/render/function.js

@@ -0,0 +1,20 @@
+const func = {}
+
+func.loader = function () {
+    console.log('func');
+    if ($('#page-loader').hasClass('hide')) {
+        $('#page-loader').removeClass('hide');
+        $('#navbar').addClass('hide');
+        if ($('#float-add-btn')) {
+            $('#float-add-btn').addClass('hide');
+        }
+    } else {
+        if ($('#float-add-btn')) {
+            $('#float-add-btn').removeClass('hide');
+        }
+        $('#navbar').removeClass('hide');
+        $('#page-loader').addClass('hide');
+    }
+};
+
+module.exports = func;

app/render/import.js

@@ -0,0 +1,3 @@
+const { ipcRenderer } = require('electron');
+const $ = require('jquery');
+const func = require('../render/function');

app/src/edit.html

@@ -44,14 +44,21 @@
             </div>
         </main>
 
+        <!-- Loader -->
+        <div id="page-loader" class="bg-loader grey darken-4 hide">
+            <div class="loader progress">
+                <div class="indeterminate"></div>
+            </div>   
+        </div>
+
+        <script type="text/javascript" src="../render/import.js"></script>
+        <script type="text/javascript" src="../render/event.js"></script>
         <script type="text/javascript" src="js/materialize.min.js"></script>
         <script type="text/javascript" src="js/google-code-prettify/prettify.js"></script>
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript" src="js/binder.js"></script>
-        <script type="text/javascript" src="../render/event.js"></script>
         <script type="text/javascript">
             // Import
-            const $ = require('jquery');
             const SimpleMDE = require('simplemde');
 
             // Global var

app/src/index.html

@@ -82,15 +82,14 @@
             </div>   
         </div>
                         
+        <script type="text/javascript" src="../render/import.js"></script>
+        <script type="text/javascript" src="../render/event.js"></script>
         <script type="text/javascript" src="js/materialize.min.js"></script>
         <script type="text/javascript" src="js/google-code-prettify/prettify.js"></script>
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript" src="js/binder.js"></script>
         <script type="text/javascript" src="../render/event.js"></script>
         <script type="text/javascript">
-            // Import
-            const $ = require('jquery');
-
             // Global var
             var scope;
             var modal;
@@ -108,7 +107,7 @@
                     printContent(scope);
                     // Show page
                     setTimeout(() => {
-                        pageLoader(false);  
+                        func.loader();  
                         //Show discovery the first time
                         if (!localStorage.discovery) {
                             // Load discovery
@@ -191,18 +190,6 @@
                     html: 'Carte supprimée',
                 });
             }
-
-            function pageLoader(active) {
-                if (active) {
-                    $('#page-loader').removeClass('hide');
-                    $('#navbar').addClass('hide');
-                    $('#float-add-btn').addClass('hide');
-                } else {
-                    $('#float-add-btn').removeClass('hide');
-                    $('#navbar').removeClass('hide');
-                    $('#page-loader').addClass('hide');
-                }
-            }
         </script>
     </body>
 </html>