yetangitu/epub.js
1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-04 15:09:16 +02:00
Code Issues Releases Wiki Activity

Allow checkLocation to return a promise

Browse source
This commit is contained in:
Fred Chasen 2016-08-24 22:00:28 +02:00
parent ff081bc389
commit 4e7276c151
5 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dist/epub.js vendored
View file

@ -7394,7 +7394,11 @@ Contents.prototype.fit = function(width, height){
this.css("backgroundColor", "transparent");
};
Contents.prototype.mapPage = function(cfiBase, start, end) {
var mapping = new Mapping();
return mapping.page(this, cfiBase, start, end);
};
Contents.prototype.destroy = function() {
// Stop observing
@ -11821,8 +11825,17 @@ Rendition.prototype.spread = function(spread, min){
Rendition.prototype.reportLocation = function(){
return this.q.enqueue(function(){
this.location = this.manager.currentLocation();
this.trigger("locationChanged", this.location);
var location = this.manager.currentLocation();
if (location.then && typeof location.then === 'function') {
location.then(function(result) {
this.location = result;
this.trigger("locationChanged", this.location);
}.bind(this));
} else {
this.location = location;
this.trigger("locationChanged", this.location);
}
}.bind(this));
};

2
dist/epub.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
examples/spreads.html
View file

@ -118,7 +118,7 @@
<div id="next" class="arrow">›</div>
<script>
// Load the opf
var book = ePub("https://s3.amazonaws.com/moby-dick/moby-dick.epub");
window.book = ePub("https://s3.amazonaws.com/moby-dick/moby-dick.epub");
var rendition = book.renderTo("viewer", {
manager: "continuous",
flow: "paginated",

4
src/contents.js
View file

@ -635,7 +635,11 @@ Contents.prototype.fit = function(width, height){
this.css("backgroundColor", "transparent");
};
Contents.prototype.mapPage = function(cfiBase, start, end) {
var mapping = new Mapping();
return mapping.page(this, cfiBase, start, end);
};
Contents.prototype.destroy = function() {
// Stop observing

13
src/rendition.js
View file

@ -360,8 +360,17 @@ Rendition.prototype.spread = function(spread, min){
Rendition.prototype.reportLocation = function(){
return this.q.enqueue(function(){
this.location = this.manager.currentLocation();
this.trigger("locationChanged", this.location);
var location = this.manager.currentLocation();
if (location.then && typeof location.then === 'function') {
location.then(function(result) {
this.location = result;
this.trigger("locationChanged", this.location);
}.bind(this));
} else {
this.location = location;
this.trigger("locationChanged", this.location);
}
}.bind(this));
};