From b2db4fd03a365e1b083e1eb8f64a1b2b5d450ef6 Mon Sep 17 00:00:00 2001 From: Fred Chasen Date: Tue, 20 Aug 2013 18:34:01 -0700 Subject: [PATCH] Fixed #30 and Fixed #37 --- examples/basic-dev.html | 4 ++-- src/book.js | 4 ++-- src/renderer.js | 22 ++++++++++++++++------ src/unarchiver.js | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/examples/basic-dev.html b/examples/basic-dev.html index 5879d19..b289a90 100644 --- a/examples/basic-dev.html +++ b/examples/basic-dev.html @@ -1,5 +1,5 @@ - + @@ -103,7 +103,7 @@ diff --git a/src/book.js b/src/book.js index 2b268cf..0cad2c5 100644 --- a/src/book.js +++ b/src/book.js @@ -69,7 +69,7 @@ EPUBJS.Book = function(options){ this.opened = new RSVP.Promise(); // BookUrl is optional, but if present start loading process if(this.settings.bookPath) { - this.open(this.settings.bookPath); + this.open(this.settings.bookPath, this.settings.reload); } @@ -635,7 +635,7 @@ EPUBJS.Book.prototype.removeStyle = function(style) { delete this.settings.styles[style]; } -EPUBJS.Book.prototype.unload = function(bookPath, forceReload){ +EPUBJS.Book.prototype.unload = function(){ if(this.settings.restore) { this.saveSettings(); diff --git a/src/renderer.js b/src/renderer.js index 445adee..a982759 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -24,7 +24,8 @@ EPUBJS.Renderer = function(book) { EPUBJS.Renderer.prototype.initialize = function(){ this.iframe = document.createElement('iframe'); //this.iframe.id = "epubjs-iframe"; - + this.iframe.scrolling = "no"; + if(this.book.settings.width || this.book.settings.height){ this.resizeIframe(false, this.book.settings.width || this.el.clientWidth, this.book.settings.height || this.el.clientHeight); } else { @@ -193,7 +194,14 @@ EPUBJS.Renderer.prototype.setIframeSrc = function(url){ this.iframe.src = url; - + + this.derf = document.createElement('iframe'); + var b = new Blob(['

PASS (1/1)

'], { type: 'text/html' }); + this.derf.src = window.webkitURL.createObjectURL(b); + this.derf.onload = function() { + console.log("this.derf"); + } + document.body.appendChild(this.derf) this.iframe.onload = function() { renderer.doc = renderer.iframe.contentDocument; renderer.docEl = renderer.doc.documentElement; @@ -277,7 +285,7 @@ EPUBJS.Renderer.prototype.formatSpread = function(){ // this.bodyEl.style.fontSize = localStorage.getItem("fontSize") || "medium"; //-- Clear Margins - this.bodyEl.style.margin = "0"; + if(this.bodyEl) this.bodyEl.style.margin = "0"; this.docEl.style.overflow = "hidden"; @@ -403,8 +411,6 @@ EPUBJS.Renderer.prototype.prevPage = function(){ EPUBJS.Renderer.prototype.chapterEnd = function(){ this.page(this.displayedPages); - - this.currentLocationCfi = this.getPageCfi(); } EPUBJS.Renderer.prototype.setLeft = function(leftPos){ @@ -544,7 +550,11 @@ EPUBJS.Renderer.prototype.page = function(pg){ this.chapterPos = pg; this.leftPos = this.spreadWidth * (pg-1); //-- pages start at 1 this.setLeft(this.leftPos); - + + this.currentLocationCfi = this.getPageCfi(); + + this.book.trigger("renderer:pageChanged", this.currentLocationCfi); + // localStorage.setItem("chapterPos", pg); return true; } diff --git a/src/unarchiver.js b/src/unarchiver.js index 5cc3e26..5b80f45 100644 --- a/src/unarchiver.js +++ b/src/unarchiver.js @@ -73,7 +73,7 @@ EPUBJS.Unarchiver.prototype.getUrl = function(url, mime){ promise.resolve(this.urlCache[url]); return promise; } - + entry.getBlob(mime || zip.getMimeType(entry.name), function(blob){ var tempUrl = _URL.createObjectURL(blob); promise.resolve(tempUrl);