Extracting reload method

thamara · May 16, 2020 · 68c71dc · 68c71dc
1 parent d673f75
commit 68c71dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/js/calendar.js b/js/calendar.js
@@ -26,7 +26,7 @@ ipcRenderer.on('PREFERENCE_SAVED', function(event, inputs) {
 });
 
 /*
- * Get nofified when preferences has been updated.
+ * Get nofified when waivers get updated.
  */
 ipcRenderer.on('WAIVER_SAVED', function() {
     calendar.loadInternalWaiveStore();

diff --git a/js/classes/Calendar.js b/js/classes/Calendar.js
@@ -367,6 +367,12 @@ class Calendar {
         $('#calendar-table-body').html(this.generateTableBody());
     }
 
+    reload() {
+        this.loadInternalStore();
+        this.loadInternalWaiveStore();
+        this.redraw();
+    }
+
     redraw() {
         this._draw();
     }

diff --git a/main.js b/main.js
@@ -258,8 +258,7 @@ function createWindow() {
                                 const importResult = importDatabaseFromFile(response);
                                 if (importResult['result']) {
                                     // Reload only the calendar itself to avoid a flash
-                                    win.webContents.executeJavaScript('calendar.loadInternalStore()');
-                                    win.webContents.executeJavaScript('calendar.redraw()');
+                                    win.webContents.executeJavaScript('calendar.reload()');
                                     dialog.showMessageBox(BrowserWindow.getFocusedWindow(),
                                         {
                                             title: 'Time to Leave',
@@ -304,8 +303,7 @@ function createWindow() {
                             store.clear();
                             waivedWorkdays.clear();
                             // Reload only the calendar itself to avoid a flash
-                            win.webContents.executeJavaScript('calendar.loadInternalStore()');
-                            win.webContents.executeJavaScript('calendar.redraw()');
+                            win.webContents.executeJavaScript('calendar.reload()');
                             dialog.showMessageBox(BrowserWindow.getFocusedWindow(),
                                 {
                                     title: 'Time to Leave',