Fix: changing ui theme only works after two tries

FPGAwars · Oct 29, 2024 · 128934a · 128934a
1 parent ba848fe
commit 128934a
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 38 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js
@@ -1069,8 +1069,10 @@ angular
       // Theme support
       $scope.selectTheme = function (theme) {
         if (profile.get("uiTheme") !== theme) {
+          console.log('[UITHEME]==>'+theme);
           profile.set("uiTheme", theme);
-          //-- Shared variable for ace-editor blocks in "profile.js"
+      setTimeout(function(){
+            //-- Shared variable for ace-editor blocks in "profile.js"
           global.uiTheme = theme;
           //-- Load selected profile
           utils.loadProfile(profile);
@@ -1085,6 +1087,8 @@ angular
               });
             }
           );
+
+        } ,1000);
           //ICEpm.publishAt('all', 'ui.updateTheme', { uiTheme: theme });
         }
       };

diff --git a/app/scripts/services/utils.js b/app/scripts/services/utils.js
@@ -1321,6 +1321,7 @@ angular.module('icestudio')
 
             // Update dependencies
             if (opt.deps !== false) {
+             console.log('DEPS',opt);
                 var types = this.findSubDependencies(p, common.allDependencies);
                 for (var t in types) {
                     p.dependencies[types[t]] = common.allDependencies[types[t]];

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,8 +45,9 @@
     "grunt-zip": "^0.18.2",
     "npm-platform-dependencies": "0.1.0",
     "nw": "0.83.0",
-    "nw-builder": "^4.5.4"},
-  "darwinDependencies": {
+    "nw-builder": "^4.5.4"
+  },
+  "dependencies": {
     "fs-xattr": "^0.4.0",
     "grunt-appdmg": "github:agoodney/grunt-appdmg"
   }