Merge from master

This commit is contained in:
Ozzieisaacs
2019-12-22 15:28:43 +01:00
parent 288944db2c
commit bbe91f439a
7 changed files with 36 additions and 112 deletions
-33
View File
@@ -152,39 +152,6 @@ body {
max-width: 70%;
}
#left {
left: 40px;
}
#right {
right: 40px;
}
.arrow {
position: absolute;
top: 50%;
margin-top: -32px;
font-size: 64px;
color: #E2E2E2;
font-family: arial, sans-serif;
font-weight: bold;
cursor: pointer;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.arrow:hover {
color: #777;
}
.arrow:active,
.arrow.active {
color: #000;
}
th, td {
padding: 5px;
}
+1 -23
View File
@@ -65,28 +65,6 @@
right: 40px;
}
.arrow {
position: absolute;
top: 50%;
margin-top: -32px;
font-size: 64px;
color: #E2E2E2;
font-family: arial, sans-serif;
font-weight: bold;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}
.arrow:hover {
color: #777;
}
.arrow:active {
color: #000;
}
xmp,
pre,
plaintext {
@@ -111,4 +89,4 @@
-moz-column-gap: 20px;
-webkit-column-gap: 20px;
position: relative;
}
}
+11 -12
View File
@@ -15,16 +15,10 @@ body {
}
#main {
/* height: 500px; */
position: absolute;
width: 100%;
height: 100%;
right: 0;
/* left: 40px; */
/* -webkit-transform: translate(40px, 0);
-moz-transform: translate(40px, 0); */
/* border-radius: 5px 0px 0px 5px; */
border-radius: 5px;
background: #fff;
overflow: hidden;
@@ -114,18 +108,20 @@ body {
border: none;
}
#prev {
#left,#prev {
left: 40px;
padding-right:80px;
}
#next {
#right,#next {
right: 40px;
padding-left:80px;
}
.arrow {
position: absolute;
top: 50%;
margin-top: -32px;
margin-top: -192px;
font-size: 64px;
color: #E2E2E2;
font-family: arial, sans-serif;
@@ -136,6 +132,9 @@ body {
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
padding-top: 160px;
padding-bottom: 160px;
padding-right: 80px;
}
.arrow:hover {
@@ -753,9 +752,9 @@ input:-ms-placeholder {
}
}*/
@media only screen
and (min-device-width : 768px)
and (max-device-width : 1024px)
@media only screen
and (min-device-width : 768px)
and (max-device-width : 1024px)
and (orientation : landscape)
/*and (-webkit-min-device-pixel-ratio: 2)*/ {
#viewer{
+10 -2
View File
@@ -9,10 +9,18 @@
/**
* CRC Implementation.
*/
/* global Uint8Array, Uint32Array, bitjs, DataView */
/* global Uint8Array, Uint32Array, bitjs, DataView, mem */
/* exported MAXWINMASK, UnpackFilter */
var CRCTab = new Array(256).fill(0);
function emptyArr(n, v) {
var arr = [];
for (var i = 0; i < n; i += 1) {
arr[i] = v;
}
return arr;
}
var CRCTab = emptyArr(256, 0);
function initCRC() {
for (var i = 0; i < 256; ++i) {
+4 -1
View File
@@ -1,12 +1,14 @@
/* global $, calibre, EPUBJS, ePubReader */
var reader;
(function() {
"use strict";
EPUBJS.filePath = calibre.filePath;
EPUBJS.cssPath = calibre.cssPath;
var reader = ePubReader(calibre.bookUrl, {
reader = ePubReader(calibre.bookUrl, {
restore: true,
bookmarks: calibre.bookmark ? [calibre.bookmark] : []
});
@@ -40,4 +42,5 @@
alert(error);
});
}
// reader.book.package.metadata.direction= "rtl"; wait for reader reader before changing reading direction
})();