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 internal link target bug

Browse source
This commit is contained in:
Fred Chasen 2017-10-17 16:15:56 -07:00
parent 7ee4e117f8
commit eb2c57f07b
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/contents.js
View file

@ -253,10 +253,24 @@ class Contents {
if (settings.scale) { if (settings.scale) {
newContent.push("initial-scale=" + settings.scale); newContent.push("initial-scale=" + settings.scale);
} }
if (settings.scalable) {
newContent.push("minimum-scale=" + settings.minimum); if (settings.scalable === "no") {
newContent.push("maximum-scale=" + settings.maximum); newContent.push("minimum-scale=" + settings.scale);
newContent.push("maximum-scale=" + settings.scale);
newContent.push("user-scalable=" + settings.scalable); newContent.push("user-scalable=" + settings.scalable);
} else {
if (settings.scalable) {
newContent.push("user-scalable=" + settings.scalable);
}
if (settings.minimum) {
newContent.push("minimum-scale=" + settings.minimum);
}
if (settings.maximum) {
newContent.push("minimum-scale=" + settings.maximum);
}
} }
if (!$viewport) { if (!$viewport) {

4
src/managers/default/index.js
View file

@ -1,5 +1,5 @@
import EventEmitter from "event-emitter"; import EventEmitter from "event-emitter";
import {extend, defer, windowBounds} from "../../utils/core"; import {extend, defer, windowBounds, isNumber} from "../../utils/core";
import Mapping from "../../mapping"; import Mapping from "../../mapping";
import Queue from "../../utils/queue"; import Queue from "../../utils/queue";
import Stage from "../helpers/stage"; import Stage from "../helpers/stage";
@ -225,7 +225,7 @@ class DefaultViewManager {
var displayed = displaying.promise; var displayed = displaying.promise;
// Check if moving to target is needed // Check if moving to target is needed
if (target === section.href || parseInt(target)) { if (target === section.href || isNumber(target)) {
target = undefined; target = undefined;
} }