From aa9c2535d9531c50bd37aea97f45bebbc9cc5b85 Mon Sep 17 00:00:00 2001
From: Fred Chasen <fchasen@gmail.com>
Date: Fri, 7 Jul 2017 13:43:52 -0400
Subject: [PATCH] Fix min image size, locationOf no longer uses scrollX / Y

---
 examples/hypothesis.html     | 2 +-
 src/managers/views/iframe.js | 4 ++--
 src/rendition.js             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/hypothesis.html b/examples/hypothesis.html
index 6d94d16..a0823c4 100644
--- a/examples/hypothesis.html
+++ b/examples/hypothesis.html
@@ -188,7 +188,7 @@
 
   <script>
     // Load the opf
-    var book = ePub("https://s3.amazonaws.com/epubjs/books/alice/OPS/package.opf");
+    var book = ePub(window.location.protocol + "//s3.amazonaws.com/epubjs/books/alice/OPS/package.opf");
     var rendition = book.renderTo("viewer", {
       flow: "scrolled-doc",
       ignoreClass: "annotator-hl"
diff --git a/src/managers/views/iframe.js b/src/managers/views/iframe.js
index 6a82bf3..fda1257 100644
--- a/src/managers/views/iframe.js
+++ b/src/managers/views/iframe.js
@@ -545,8 +545,8 @@ class IframeView {
 		var targetPos = this.contents.locationOf(target, this.settings.ignoreClass);
 
 		return {
-			"left": window.scrollX + targetPos.left,
-			"top": window.scrollY + targetPos.top
+			"left": targetPos.left,
+			"top": targetPos.top
 		};
 	}
 
diff --git a/src/rendition.js b/src/rendition.js
index 5fa730b..ab43084 100644
--- a/src/rendition.js
+++ b/src/rendition.js
@@ -643,8 +643,8 @@ class Rendition {
 
 		contents.addStylesheetRules({
 			"img" : {
-				"max-width": (this._layout.columnWidth) + "px !important",
-				"max-height": (this._layout.height) + "px !important",
+				"max-width": (this._layout.columnWidth ? this._layout.columnWidth + "px" : "100%") + "!important",
+				"max-height": (this._layout.height ? this._layout.height + "px" : "50%") + "!important",
 				"object-fit": "contain",
 				"page-break-inside": "avoid"
 			}