Moved showTableModal observable from Eagle to ParameterTable. Cleaned…

… up some other spaghetti functions
ICRAR · Aug 14, 2024 · 2a3126f · 2a3126f
1 parent 9aa1139
commit 2a3126f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/Eagle.ts b/src/Eagle.ts
@@ -110,7 +110,6 @@ export class Eagle {
     graphErrors : ko.ObservableArray<Errors.Issue>;
     loadingWarnings : ko.ObservableArray<Errors.Issue>;
     loadingErrors : ko.ObservableArray<Errors.Issue>;
-    showTableModal : ko.Observable<boolean>;
     currentFileInfo : ko.Observable<FileInfo>;
     currentFileInfoTitle : ko.Observable<string>;
     hierarchyMode : ko.Observable<boolean>; //we need this to be able to keep the right window in the hierarchy tab if the user is actively using it, but otherwise always switch the right window to the inspector.
@@ -201,7 +200,6 @@ export class Eagle {
         this.loadingWarnings = ko.observableArray([]);
         this.loadingErrors = ko.observableArray([]);
 
-        this.showTableModal = ko.observable(false)
         this.currentFileInfo = ko.observable(null);
         this.currentFileInfoTitle = ko.observable("");
         this.hierarchyMode = ko.observable(false)

diff --git a/src/GraphConfigurationsTable.ts b/src/GraphConfigurationsTable.ts
@@ -26,7 +26,7 @@ export class GraphConfigurationsTable {
                 }
             }
 
-            Utils.showOpenGraphConfigurationsTableModal();
+            $('#graphConfigurationsTableModal').modal("show");
 
             GraphConfigurationsTable.showTableModal(true)
 

diff --git a/src/KeyboardShortcut.ts b/src/KeyboardShortcut.ts
@@ -79,10 +79,6 @@ export class KeyboardShortcut {
         return Setting.findValue(Setting.ALLOW_GRAPH_EDITING);
     }
 
-    static showTableModal(eagle: Eagle) : boolean {
-        return eagle.showTableModal()
-    }
-
     static graphNotEmpty(eagle: Eagle) : boolean {
         if (eagle.logicalGraph() === null){
             return false;
@@ -233,7 +229,7 @@ export class KeyboardShortcut {
             new KeyboardShortcut("select_all_in_graph", "Select all in graph", ["a"], "keydown", KeyboardShortcut.Modifier.Ctrl, KeyboardShortcut.true, [''], KeyboardShortcut.true, KeyboardShortcut.graphNotEmpty, (eagle): void => { eagle.selectAllInGraph(); }),
             new KeyboardShortcut("select_none_in_graph", "Select none in graph", ["Escape"], "keydown", KeyboardShortcut.Modifier.None, KeyboardShortcut.true, ['deselect'], KeyboardShortcut.true, KeyboardShortcut.somethingIsSelected, (eagle): void => { eagle.selectNoneInGraph(); }),
             new KeyboardShortcut("fix_all", "Fix all errors in graph", ["f"], "keydown", KeyboardShortcut.Modifier.None, KeyboardShortcut.true, [''], KeyboardShortcut.allowGraphEditing, KeyboardShortcut.allowGraphEditing, (eagle): void => { Errors.fixAll(); }),
-            new KeyboardShortcut("table_move_down", "Table move down one cell", ["Enter"], "keydown", KeyboardShortcut.Modifier.Input, KeyboardShortcut.true, ['controls'], KeyboardShortcut.false, KeyboardShortcut.showTableModal, (eagle): void => { ParameterTable.tableEnterShortcut(currentEvent);}),
+            new KeyboardShortcut("table_move_down", "Table move down one cell", ["Enter"], "keydown", KeyboardShortcut.Modifier.Input, KeyboardShortcut.true, ['controls'], KeyboardShortcut.false, ParameterTable.showTableModal, (eagle): void => { ParameterTable.tableEnterShortcut(currentEvent);}),
         ];
     }
 

diff --git a/src/Modals.ts b/src/Modals.ts
@@ -355,7 +355,7 @@ export class Modals {
         });
 
         $('#parameterTableModal').on('hidden.bs.modal', function(){
-            eagle.showTableModal(false)
+            ParameterTable.showTableModal(false)
             eagle.checkGraph();
         });
 

diff --git a/src/ParameterTable.ts b/src/ParameterTable.ts
@@ -14,6 +14,8 @@ import { GraphConfig, GraphConfigField } from "./GraphConfig";
 
 export class ParameterTable {
 
+    static showTableModal : ko.Observable<boolean> = ko.observable(false);
+
     static mode: ko.Observable<ParameterTable.Mode>;
     static selectionParent : ko.Observable<Field | null>; // row in the parameter table that is currently selected
     static selectionParentIndex : ko.Observable<number> // id of the selected field
@@ -481,7 +483,7 @@ export class ParameterTable {
                 if($('.modal.show').attr('id')==='parameterTableModal'){
                     // TODO: use closeModal here!
                     $('#parameterTableModal').modal('hide')
-                    eagle.showTableModal(false)
+                    ParameterTable.showTableModal(false)
                 }else{
                     return
                 }
@@ -492,17 +494,19 @@ export class ParameterTable {
                 RightClick.closeCustomContextMenu(true);
 
                 setTimeout(function() {
-                    Utils.showOpenParamsTableModal(mode);
+                    ParameterTable.mode(mode);
+                    $('#parameterTableModal').modal("show");
                 }, 30);
             }else{
                 if (mode=== ParameterTable.Mode.NodeFields && !eagle.selectedNode()){
                     eagle.hideEagleIsLoading()
                     Utils.showNotification("Error", "No Node Is Selected", "warning");
                 }else{
-                    Utils.showOpenParamsTableModal(mode);
+                    ParameterTable.mode(mode);
+                    $('#parameterTableModal').modal("show");
                 }
             }
-            eagle.showTableModal(true)
+            ParameterTable.showTableModal(true)
 
         },5)
     }
@@ -522,7 +526,7 @@ export class ParameterTable {
 
     static closeModal = (): void => {
         $('#parameterTableModal').modal('hide')
-        Eagle.getInstance().showTableModal(false)
+        ParameterTable.showTableModal(false)
     }
 
     static addEmptyTableRow = () : void => {

diff --git a/src/Utils.ts b/src/Utils.ts
@@ -764,6 +764,7 @@ export class Utils {
         $('#settingsModal').modal("hide");
     }
 
+    /*
     static showOpenParamsTableModal(mode: ParameterTable.Mode) : void {
         ParameterTable.mode(mode);
         $('#parameterTableModal').modal("show");
@@ -772,6 +773,7 @@ export class Utils {
     static showOpenGraphConfigurationsTableModal() : void {
         $('#graphConfigurationsTableModal').modal("show");
     }
+    */
 
     static showShortcutsModal() : void {
         $('#shortcutsModal').modal("show");

diff --git a/templates/modals/parameter_table.html b/templates/modals/parameter_table.html
@@ -2,7 +2,7 @@
 <div class="modal fade" id="parameterTableModal" tabindex="-1" role="dialog" aria-labelledby="parameterTableModalTitle" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
         <div class="modal-content">
-            <!-- ko if: showTableModal() -->
+            <!-- ko if: ParameterTable.showTableModal() -->
                 <div class="modal-header" data-bind="click: function(){ParameterTable.resetSelection()}">
                     <!-- ko if: ParameterTable.inMode(ParameterTable.Mode.GraphConfig) -->
                         <h5 class="modal-title" id="parameterTableModalTitle">
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ export class GraphConfigurationsTable { @@
                     }
                 }
-                Utils.showOpenGraphConfigurationsTableModal();
+                $('#graphConfigurationsTableModal').modal("show");
                 GraphConfigurationsTable.showTableModal(true)
@@ Expand Down @@