Merge branch 'main' into release/2.3.0-last-tweaks

invoke-ai · Feb 9, 2023 · 424cee6 · 424cee6
2 parents 158d1ef + da193ec
commit 424cee6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/invokeai/frontend/.eslintrc.js b/invokeai/frontend/.eslintrc.js
@@ -31,6 +31,7 @@ module.exports = {
     'space-before-blocks': 'error',
     'import/prefer-default-export': 'off',
     '@typescript-eslint/no-unused-vars': ['warn', { varsIgnorePattern: '_+' }],
+    'prettier/prettier': ['error', { endOfLine: 'auto' }],
   },
   settings: {
     react: {

diff --git a/...ai/frontend/dist/assets/index-8606d352.js → ...ai/frontend/dist/assets/index-252612ad.js b/...ai/frontend/dist/assets/index-8606d352.js → ...ai/frontend/dist/assets/index-252612ad.js
diff --git a/invokeai/frontend/dist/index.html b/invokeai/frontend/dist/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>InvokeAI - A Stable Diffusion Toolkit</title>
     <link rel="shortcut icon" type="icon" href="./assets/favicon-0d253ced.ico" />
-    <script type="module" crossorigin src="./assets/index-8606d352.js"></script>
+    <script type="module" crossorigin src="./assets/index-252612ad.js"></script>
     <link rel="stylesheet" href="./assets/index-b0bf79f4.css">
   </head>
 

diff --git a/invokeai/frontend/src/features/parameters/store/generationSlice.ts b/invokeai/frontend/src/features/parameters/store/generationSlice.ts
@@ -195,8 +195,11 @@ export const generationSlice = createSlice({
       } else {
         state.threshold = threshold;
       }
-      if (perlin) state.perlin = perlin;
-      if (typeof perlin === 'undefined') state.perlin = 0;
+      if (typeof perlin === 'undefined') {
+        state.perlin = 0;
+      } else {
+        state.perlin = perlin;
+      }
       if (typeof seamless === 'boolean') state.seamless = seamless;
       // if (typeof hires_fix === 'boolean') state.hiresFix = hires_fix; // TODO: Needs to be fixed after reorg
       if (width) state.width = width;
@@ -268,10 +271,16 @@ export const generationSlice = createSlice({
       if (sampler) state.sampler = sampler;
       if (steps) state.steps = steps;
       if (cfg_scale) state.cfgScale = cfg_scale;
-      if (threshold) state.threshold = threshold;
-      if (typeof threshold === 'undefined') state.threshold = 0;
-      if (perlin) state.perlin = perlin;
-      if (typeof perlin === 'undefined') state.perlin = 0;
+      if (typeof threshold === 'undefined') {
+        state.threshold = 0;
+      } else {
+        state.threshold = threshold;
+      }
+      if (typeof perlin === 'undefined') {
+        state.perlin = 0;
+      } else {
+        state.perlin = perlin;
+      }
       if (typeof seamless === 'boolean') state.seamless = seamless;
       // if (typeof hires_fix === 'boolean') state.hiresFix = hires_fix; // TODO: Needs to be fixed after reorg
       if (width) state.width = width;

diff --git a/invokeai/frontend/stats.html b/invokeai/frontend/stats.html