Merge branch 'dev' into release_candidate

1 files changed, 18 insertions, 18 deletions

diff --git a/javascript/hires_fix.js b/javascript/hires_fix.js
index 48196be4..0d04ab3b 100644
--- a/javascript/hires_fix.js
+++ b/javascript/hires_fix.js
@@ -1,18 +1,18 @@
-

-function onCalcResolutionHires(enable, width, height, hr_scale, hr_resize_x, hr_resize_y){

-    function setInactive(elem, inactive){

-        elem.classList.toggle('inactive', !!inactive)

-    }

-

-    var hrUpscaleBy = gradioApp().getElementById('txt2img_hr_scale')

-    var hrResizeX = gradioApp().getElementById('txt2img_hr_resize_x')

-    var hrResizeY = gradioApp().getElementById('txt2img_hr_resize_y')

-

-    gradioApp().getElementById('txt2img_hires_fix_row2').style.display = opts.use_old_hires_fix_width_height ? "none" : ""

-

-    setInactive(hrUpscaleBy, opts.use_old_hires_fix_width_height || hr_resize_x > 0 || hr_resize_y > 0)

-    setInactive(hrResizeX, opts.use_old_hires_fix_width_height || hr_resize_x == 0)

-    setInactive(hrResizeY, opts.use_old_hires_fix_width_height || hr_resize_y == 0)

-

-    return [enable, width, height, hr_scale, hr_resize_x, hr_resize_y]

-}

+
+function onCalcResolutionHires(enable, width, height, hr_scale, hr_resize_x, hr_resize_y) {
+    function setInactive(elem, inactive) {
+        elem.classList.toggle('inactive', !!inactive);
+    }
+
+    var hrUpscaleBy = gradioApp().getElementById('txt2img_hr_scale');
+    var hrResizeX = gradioApp().getElementById('txt2img_hr_resize_x');
+    var hrResizeY = gradioApp().getElementById('txt2img_hr_resize_y');
+
+    gradioApp().getElementById('txt2img_hires_fix_row2').style.display = opts.use_old_hires_fix_width_height ? "none" : "";
+
+    setInactive(hrUpscaleBy, opts.use_old_hires_fix_width_height || hr_resize_x > 0 || hr_resize_y > 0);
+    setInactive(hrResizeX, opts.use_old_hires_fix_width_height || hr_resize_x == 0);
+    setInactive(hrResizeY, opts.use_old_hires_fix_width_height || hr_resize_y == 0);
+
+    return [enable, width, height, hr_scale, hr_resize_x, hr_resize_y];
+}