Merge branch 'dev' into improve-styles

demiankatz · demiankatz · commit 9b3072c90dbc · 2025-04-25T12:56:45.000-04:00
diff --git a/client/util/Zoomy.ts b/client/util/Zoomy.ts
@@ -310,12 +310,12 @@ var Zoomy = {
         } else {
             this.image.zoom = zoom;
         }
-     
+
         if (this.image.zoom < this.image.minZoom) {
             this.image.zoom = this.image.minZoom;
         }
 
-	// prevent infinite zoom
+        // prevent infinite zoom
         if (this.image.zoom > 10) {
             this.image.zoom = 10;
         }

Original file line number	Diff line number	Diff line change
`@@ -310,12 +310,12 @@ var Zoomy = {`
`310`	`310`	`} else {`
`311`	`311`	`this.image.zoom = zoom;`
`312`	`312`	`}`
`313`		`-`
	`313`	`+`
`314`	`314`	`if (this.image.zoom < this.image.minZoom) {`
`315`	`315`	`this.image.zoom = this.image.minZoom;`
`316`	`316`	`}`
`317`	`317`
`318`		`- // prevent infinite zoom`
	`318`	`+ // prevent infinite zoom`
`319`	`319`	`if (this.image.zoom > 10) {`
`320`	`320`	`this.image.zoom = 10;`
`321`	`321`	`}`