yetangitu/epub.js
1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-03 14:59:18 +02:00
Code Issues Releases Wiki Activity

Fix orientation change listener

Browse source
This commit is contained in:
Fred Chasen 2017-09-29 18:12:37 -07:00
parent d77fc06a2e
commit c96468fd80
5 changed files with 96 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/rendition.js
View file

@ -179,7 +179,7 @@ class Rendition {
this.manager.on("resized", this.onResized.bind(this));
// Listen for rotation
this.manager.on("orientationChange", this.onOrientationChange.bind(this));
this.manager.on("orientationchange", this.onOrientationChange.bind(this));
// Listen for scroll changes
this.manager.on("scrolled", this.reportLocation.bind(this));
@ -365,7 +365,6 @@ class Rendition {
});
if (this.location && this.location.start) {
// this.manager.clear();
this.display(this.location.start.cfi);
}
@ -376,12 +375,12 @@ class Rendition {
* @private
*/
onOrientationChange(orientation){
if (this.location) {
this.manager.clear();
this.display(this.location.start.cfi);
}
// Handled in resize event
// if (this.location) {
// this.display(this.location.start.cfi);
// }
this.emit("orientationChange", orientation);
this.emit("orientationchange", orientation);
}
/**
@ -527,10 +526,30 @@ class Rendition {
*/
reportLocation(){
return this.q.enqueue(function reportedLocation(){
var location = this.manager.currentLocation();
if (location && location.then && typeof location.then === "function") {
location.then(function(result) {
let located = this.located(result);
requestAnimationFrame(function reportedLocationAfterRAF() {
var location = this.manager.currentLocation();
if (location && location.then && typeof location.then === "function") {
location.then(function(result) {
let located = this.located(result);
if (!located || !located.start || !located.end) {
return;
}
this.location = located;
this.emit("locationChanged", {
index: this.location.start.index,
href: this.location.start.href,
start: this.location.start.cfi,
end: this.location.end.cfi,
percentage: this.location.start.percentage
});
this.emit("relocated", this.location);
}.bind(this));
} else if (location) {
let located = this.located(location);
if (!located || !located.start || !located.end) {
return;
@ -547,27 +566,8 @@ class Rendition {
});
this.emit("relocated", this.location);
}.bind(this));
} else if (location) {
let located = this.located(location);
if (!located || !located.start || !located.end) {
return;
}
this.location = located;
this.emit("locationChanged", {
index: this.location.start.index,
href: this.location.start.href,
start: this.location.start.cfi,
end: this.location.end.cfi,
percentage: this.location.start.percentage
});
this.emit("relocated", this.location);
}
}.bind(this));
}.bind(this));
}