diff --git a/examples/embedded.html b/examples/embedded.html index 27a6885..50b66a1 100644 --- a/examples/embedded.html +++ b/examples/embedded.html @@ -46,7 +46,7 @@ // height: "100vh", overflow: "visible", manager: "continuous", - flow: "paginated" + // flow: "paginated" }); rendition.display(currentCfi || currentSectionIndex); diff --git a/src/contents.js b/src/contents.js index fd1c7ce..b22078b 100644 --- a/src/contents.js +++ b/src/contents.js @@ -764,7 +764,7 @@ class Contents { var COLUMN_WIDTH = prefixed("column-width"); var COLUMN_FILL = prefixed("column-fill"); - this.width("100%"); + this.width(width); this.height(height); // Deal with Mobile trying to scale to viewport diff --git a/src/layout.js b/src/layout.js index 9581802..c734210 100644 --- a/src/layout.js +++ b/src/layout.js @@ -171,6 +171,10 @@ class Layout { format(contents){ var formating; + if (this.settings.direction) { + contents.direction(this.settings.direction); + } + if (this.name === "pre-paginated") { formating = contents.fit(this.columnWidth, this.height); } else if (this._flow === "paginated") { diff --git a/src/managers/default/index.js b/src/managers/default/index.js index c05db93..a9447c7 100644 --- a/src/managers/default/index.js +++ b/src/managers/default/index.js @@ -258,16 +258,6 @@ class DefaultViewManager { this.add(section) .then(function(view){ - // if (this.settings.direction === "rtl") { - // let offset = view.offset(); - // let width = view.width(); - // - // this.moveTo({ - // left: offset.left + width, - // top: offset.top - // }); - // } - // Move to correct place within the section, if needed if(target) { let offset = view.locationOf(target); @@ -309,10 +299,6 @@ class DefaultViewManager { this.emit("resize", view.section); } - // moveTo(offset){ - // this.scrollTo(offset.left, offset.top); - // }; - moveTo(offset){ var distX = 0, distY = 0; @@ -501,7 +487,6 @@ class DefaultViewManager { if (this.settings.direction === "rtl") { this.scrollTo(0, 0, true); } else { - console.log(this.container.scrollWidth); this.scrollTo(this.container.scrollWidth - this.layout.delta, 0, true); } } diff --git a/src/managers/views/iframe.js b/src/managers/views/iframe.js index 1a8ced0..63c7b14 100644 --- a/src/managers/views/iframe.js +++ b/src/managers/views/iframe.js @@ -9,7 +9,7 @@ class IframeView { this.settings = extend({ ignoreClass : "", axis: "vertical", - direction: "ltr", + direction: undefined, width: 0, height: 0, layout: undefined, diff --git a/src/rendition.js b/src/rendition.js index 0f417c9..a9f1b08 100644 --- a/src/rendition.js +++ b/src/rendition.js @@ -427,6 +427,7 @@ class Rendition { var flow = this.settings.flow || metadata.flow || "auto"; var viewport = metadata.viewport || ""; var minSpreadWidth = this.settings.minSpreadWidth || metadata.minSpreadWidth || 800; + var direction = this.settings.direction || metadata.direction || "ltr"; if ((this.settings.width === 0 || this.settings.width > 0) && (this.settings.height === 0 || this.settings.height > 0)) { @@ -439,7 +440,8 @@ class Rendition { orientation : orientation, flow : flow, viewport : viewport, - minSpreadWidth : minSpreadWidth + minSpreadWidth : minSpreadWidth, + direction: direction }; return properties;