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(iframe-view): can't turn pages after changing window size

Browse source
This commit is contained in:
NoraH1to 2023-05-20 01:36:00 +08:00
parent f09089cf77
commit 0caaf5f3da
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/managers/helpers/views.js
View file

@ -77,9 +77,8 @@ class Views {
}
destroy(view) {
if(view.displayed){
view.destroy();
}
// Just destroy it.
view.destroy();
if(this.container){
this.container.removeChild(view.element);

24
src/managers/views/iframe.js
View file

@ -6,7 +6,16 @@ import { EVENTS } from "../../utils/constants";
import { Pane, Highlight, Underline } from "marks-pane";
class IframeView {
/**
* One section only have one View,
* we can put them into the map to destroy the old one.
*/
static ViewMap = new Map();
constructor(section, options) {
const oldView = IframeView.ViewMap.get(section.href);
if (oldView) oldView.destroy();
IframeView.ViewMap.set(section.href, this);
this.settings = extend({
ignoreClass : "",
axis: undefined, //options.layout && options.layout.props.flow === "scrolled" ? "vertical" : "horizontal",
@ -48,6 +57,7 @@ class IframeView {
this.highlights = {};
this.underlines = {};
this.marks = {};
this.loading = undefined;
}
@ -98,7 +108,7 @@ class IframeView {
if (this.settings.allowPopups) {
this.iframe.sandbox += " allow-popups";
}
this.iframe.setAttribute("enable-annotation", "true");
this.resizing = true;
@ -158,7 +168,6 @@ class IframeView {
return this.load(contents);
}.bind(this))
.then(function(){
// find and report the writingMode axis
let writingMode = this.contents.writingMode();
@ -382,7 +391,8 @@ class IframeView {
load(contents) {
var loading = new defer();
this.loading && this.loading.reject('cancel');
var loading = this.loading = new defer();
var loaded = loading.promise;
if(!this.iframe) {
@ -841,6 +851,14 @@ class IframeView {
this._height = null;
}
/**
* Make sure the promise doesn't get stuck in pending,
* This avoids queue blocking.
*/
if (this.loading) {
this.loading.reject('cancel');
}
// this.element.style.height = "0px";
// this.element.style.width = "0px";
}