Skip to content

Option to split double pages #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hwharrison wants to merge 3 commits into from
Closed

Option to split double pages #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
205fe4d
If page-width is greater than page-height, cuts the page into two hal…
TBthegr81 Feb 21, 2019
199b044
Make splitting double pages a setting in options
hwharrison Feb 22, 2019
18a0903
formatting fix
hwharrison Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 51 additions & 7 deletions source/comicReader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ getSettings(function() {
if(start) {
if(start.download) {
renderFaviconPercentage(0);

loadComic(function(err) {
port.send({
what: "message_to_opener",
Expand Down Expand Up @@ -541,7 +541,7 @@ function setupSelectors() { // run a DOM scan to analyse how the reader DOM tree
}

// download the opened comic. a callback and a step function can be used.
function loadComic(callback, step, metaData) {
function loadComic(callback, step, metaData) {
throttleBlocker();
addTopBar();
overlay.style.display = "block";
Expand Down Expand Up @@ -652,6 +652,26 @@ function loadComic(callback, step, metaData) {
if(settings.container == 2)
downloadData(getName() + "/" + result.name, page, true);

var floatingPerc = (pos + 1) / l,
perc = Math.round(floatingPerc * 100);
div.getElementsByTagName("span")[0].innerHTML = perc;
renderFaviconPercentage(floatingPerc);
step(perc);
interval();
});
},
function(page) {
port.send({
what: "add_page",
page: (settings.container != 2 ? page : null),
i: pos-1,
len: numLength,
extension: (settings.page ? "png" : "jpeg"),
toZip: (settings.container != 2)
}, function(result) {
if(settings.container == 2)
downloadData(getName() + "/" + result.name, page, true);

var floatingPerc = (pos + 1) / l,
perc = Math.round(floatingPerc * 100);
div.getElementsByTagName("span")[0].innerHTML = perc;
Expand Down Expand Up @@ -831,7 +851,7 @@ function pageLoaded(callback) {
}

// get data URL of the currently opened page in the reader (async! result is given to callback)
function getOpenedPage(callback) {
function getOpenedPage(callback, callback2) {
pageLoaded(function() {
var view = dom.getCanvasContainer(),
canvasOnThisPage = dom.canvasElements;
Expand All @@ -841,15 +861,39 @@ function getOpenedPage(callback) {
outCanvas = document.createElement('canvas'),
ctx = outCanvas.getContext('2d'),
canvas, data;
outCanvas.width = w;
outCanvas.height = h;
outCanvas.width = w;
outCanvas.height = h;

if(settings.pageSplit && w > h) {
var outCanvas2 = document.createElement('canvas'),
ctx2 = outCanvas2.getContext('2d');
outCanvas.width = w/2;
outCanvas2.width = w/2;
outCanvas2.height = h;
}

for(var i = 0; i < canvasOnThisPage.length; i++) {
canvas = canvasOnThisPage[i];
ctx.drawImage(canvas, parseInt(canvas.style.left) || 0, parseInt(canvas.style.top) || 0, parseInt(canvas.style.width) || 0, parseInt(canvas.style.height) || 0);
if(settings.pageSplit && w > h) {
ctx.drawImage(canvas, 0, 0, w/2, h, 0, 0, w/2, h);
ctx2.drawImage(canvas, w/2, 0 , w/2, h, 0, 0, w/2, h);
}
else {
ctx.drawImage(canvas, parseInt(canvas.style.left) || 0, parseInt(canvas.style.top) || 0, parseInt(canvas.style.width) || 0, parseInt(canvas.style.height) || 0);
}
}
data = getUsernameImage(ctx, w, h);
ctx.putImageData(data, w - data.width, h - data.height);

callback(outCanvas.toDataURL("image/" + (settings.page ? "png" : "jpeg")));
if(settings.pageSplit && w > h) {
//console.log("Returning 2 pages");
callback(outCanvas.toDataURL("image/" + (settings.page ? "png" : "jpeg")));
callback2(outCanvas2.toDataURL("image/" + (settings.page ? "png" : "jpeg")));
}
else {
//console.log("Returning 1 page");
callback(outCanvas.toDataURL("image/" + (settings.page ? "png" : "jpeg")), null);
}

});
}
6 changes: 5 additions & 1 deletion source/options/options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ <h2>Backup behaviour</h2>
<div class="aligner">Favicon text color:</div><div class="aligner r"><select id="faviconColor">
<option value="0">Black (for light themes)</option>
<option value="1">White (for dark themes)</option>
</select></div>
</select></div><br>
<div class="aligner">Split double-page spreads:</div><div class="aligner r"><select id="pageSplit">
<option value="0">No</option>
<option value="1">Yes</option>
</select></div>

<h2>Updates</h2>
<p>To get notifications about extension updates, you have to add an update server.</p>
Expand Down