fixed page rounding error, built

futurepress · Apr 4, 2014 · 0888642 · 0888642
1 parent ae7c84a
commit 0888642
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 22 deletions.
diff --git a/build/epub.js b/build/epub.js
diff --git a/build/epub.js.map b/build/epub.js.map
diff --git a/build/epub.min.js b/build/epub.min.js
diff --git a/build/epub.min.map b/build/epub.min.map
diff --git a/build/epub_no_underscore.js b/build/epub_no_underscore.js
diff --git a/build/epub_no_underscore.js.map b/build/epub_no_underscore.js.map
diff --git a/build/hooks.js b/build/hooks.js
diff --git a/build/hooks.min.map b/build/hooks.min.map
diff --git a/hooks/default/endnotes.js b/hooks/default/endnotes.js
@@ -5,7 +5,7 @@ EPUBJS.Hooks.register("beforeChapterDisplay").endnotes = function(callback, rend
 			attr = "epub:type",
 			type = "noteref",
 			folder = EPUBJS.core.folder(location.pathname),
-			cssPath = folder + EPUBJS.cssPath || folder,
+			cssPath = (folder + EPUBJS.cssPath) || folder,
 			popups = {};
 
 		EPUBJS.core.addCss(cssPath + "popup.css", false, renderer.render.document.head);

diff --git a/hooks/extensions/hypothesis.js b/hooks/extensions/hypothesis.js
@@ -9,12 +9,14 @@
 // 
 // 
 EPUBJS.Hooks.register("beforeChapterDisplay").hypothesis = function(callback, renderer){
-
+		var folder = EPUBJS.core.folder(location.pathname);
+		var cssPath = (folder + EPUBJS.cssPath) || folder;
+
 		if(!renderer) return;
 
 		EPUBJS.core.addScript("https://hypothes.is/app/embed.js?role=guest&light=true", null, renderer.doc.head);
 
-		EPUBJS.core.addCss("/demo/css/annotations.css", null, renderer.doc.head);
+		EPUBJS.core.addCss( cssPath + "annotations.css", null, renderer.doc.head);
 
 		if(callback) callback();		
 };
diff --git a/reader/js/epub.js.map b/reader/js/epub.js.map
diff --git a/reader/js/epub.min.js b/reader/js/epub.min.js
diff --git a/src/layout.js b/src/layout.js
@@ -45,7 +45,7 @@ EPUBJS.Layout.Reflowable.prototype.calculatePages = function() {
 	var totalWidth, displayedPages;
 	this.documentElement.style.width = "auto"; //-- reset width for calculations
 	totalWidth = this.documentElement.scrollWidth;
-	displayedPages = Math.round(totalWidth / this.spreadWidth);
+	displayedPages = Math.ceil(totalWidth / this.spreadWidth);
 
 	return {
 		displayedPages : displayedPages,
@@ -99,11 +99,10 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
 
 EPUBJS.Layout.ReflowableSpreads.prototype.calculatePages = function() {
 	var totalWidth = this.documentElement.scrollWidth;
-	var displayedPages = Math.round(totalWidth / this.spreadWidth);
+	var displayedPages = Math.ceil(totalWidth / this.spreadWidth);
 
 	//-- Add a page to the width of the document to account an for odd number of pages
 	this.documentElement.style.width = totalWidth + this.spreadWidth + "px";
-
 	return {
 		displayedPages : displayedPages,
 		pageCount : displayedPages * 2