fix limit-width to never apply in single-column; fix auto-disabling of two columns

2 files changed, 7 insertions, 6 deletions

diff --git a/reader.css b/reader.css
index 5e53f3f..5639306 100755
--- a/reader.css
+++ b/reader.css
@@ -109,7 +109,7 @@
     margin: auto;
 }
 
-#reader.fit-size img.limit-width {
+#reader.fit-size:not(.single-column) img.limit-width {
 	max-width : 50%;
 }
 
diff --git a/reader.js b/reader.js
index 8a9c884..390e2ca 100755
--- a/reader.js
+++ b/reader.js
@@ -395,14 +395,15 @@ $(document).ready(function () {
 	}
 
 	$("#reader img").on("load", function(e) {
-		const img = $(this);
+		const left = $("#reader .left-page");
+		const right = $("#reader .right-page");
 
-		img.fadeIn();
+		left.fadeIn();
 
-		if (img.width() > img.height()) {
-			$(".right-page").hide();
+		if (left.width() >= left.height() || right.width() >= right.height()) {
+			right.hide();
 		} else {
-			$(".right-page").fadeIn();
+			right.fadeIn();
 		}
 
 		window.setTimeout(() => {