move endBlockingTask() out of graph.loadDesign

- and fitContent() is always done in loadDesign, after the callback
FPGAwars · Apr 22, 2024 · 4a858b4 · 4a858b4
1 parent b4fb242
commit 4a858b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 33 deletions.
diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js
@@ -140,9 +140,14 @@ angular
         }
       };
 
+      function loadSelectedGraph() {
+        utils.beginBlockingTask(); 
+        setTimeout(function(){
+          _decoupledLoadSelectedGraph();
+        },500);
+      }
+
       function _decoupledLoadSelectedGraph() {
-
-
         var n = graph.breadcrumbs.length;
         var opt = { disabled: true };
         var design = false;
@@ -166,8 +171,7 @@ angular
           graph.resetView();
           graph.loadDesign(design, opt, function () {
             $scope.isNavigating = false;
-             graph.fitContent();
-
+            utils.endBlockingTask();
           });
           $scope.topModule = true;
         }
@@ -191,24 +195,13 @@ angular
           graph.fitContent();
           graph.resetView();
           graph.loadDesign(dependency.design, opt, function () {
-            graph.fitContent();
             $scope.isNavigating = false;
-
+            utils.endBlockingTask();
           });
           $scope.information = dependency.package;
         }
       }
 
-
-
-      function loadSelectedGraph() {
-
-        utils.beginBlockingTask(); 
-        setTimeout(function(){
-          _decoupledLoadSelectedGraph();
-        },500);
-      }
-
       $rootScope.$on('navigateProject', function (event, args) {
         var opt = { disabled: true };
         if (typeof args.submodule !== 'undefined') {
@@ -230,9 +223,7 @@ angular
           graph.resetView();
           project.update({ deps: false }, function () {
             graph.loadDesign(args.project.design, opt, function () {
-
               utils.endBlockingTask();
-
             });
 
           });

diff --git a/app/scripts/services/graph.js b/app/scripts/services/graph.js
@@ -1451,7 +1451,7 @@ angular.module('icestudio')
 
                     let cells = graphToCells(design.graph, opt);
 
-                      self.fitContent();
+                    self.fitContent();
 
                     graph.addCells(cells);
 
@@ -1463,23 +1463,14 @@ angular.module('icestudio')
                     }
 
                     if (callback) {
-
-
                         callback();
-
-                        utils.endBlockingTask();
-
-                         self.fitContent();
-                    } else {
-
-                        utils.endBlockingTask();
-
-                         self.fitContent();
-
                     }
-
+
+                    self.fitContent();
                     return true;
                 }
+
+                return false;
             };
 
             function graphToCells(_graph, opt) {

diff --git a/app/scripts/services/project.js b/app/scripts/services/project.js
@@ -142,9 +142,9 @@ angular.module('icestudio')
 
         var ret = graph.loadDesign(project.design, opt, function () {
           graph.resetCommandStack();
-          graph.fitContent();
           alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) }));
           common.hasChangesSinceBuild = true;
+          utils.endBlockingTask();
         });
 
         if (ret) {