Merge remote-tracking branch 'sysadminstory/fix-saving-data'
This commit is contained in:
commit
70e88ffbe1
@ -23,10 +23,9 @@ document.onreadystatechange = function () {
|
|||||||
options.session.preferences = $session.data('preferences') || {};
|
options.session.preferences = $session.data('preferences') || {};
|
||||||
options.session.defaults = $session.data('defaults') || {};
|
options.session.defaults = $session.data('defaults') || {};
|
||||||
options.session.basePath = $session.data('basepath');
|
options.session.basePath = $session.data('basepath');
|
||||||
|
options.session.staticPath = $session.data('staticpath');
|
||||||
options.session.downloadLink = $session.data('downloadlink');
|
options.session.downloadLink = $session.data('downloadlink');
|
||||||
|
|
||||||
console.log(options.session.basePath);
|
|
||||||
|
|
||||||
|
|
||||||
/* functions return jquery promises */
|
/* functions return jquery promises */
|
||||||
options.session.getPreference = function(name) {
|
options.session.getPreference = function(name) {
|
||||||
@ -118,6 +117,7 @@ document.onreadystatechange = function () {
|
|||||||
EPUBJS.filePath = "vendor/epubjs/";
|
EPUBJS.filePath = "vendor/epubjs/";
|
||||||
EPUBJS.cssPath = "vendor/epubjs/css/";
|
EPUBJS.cssPath = "vendor/epubjs/css/";
|
||||||
EPUBJS.basePath = $('.session').data('basepath');
|
EPUBJS.basePath = $('.session').data('basepath');
|
||||||
|
EPUBJS.staticPath = $('.session').data('staticpath');
|
||||||
|
|
||||||
/* device-specific boilerplate */
|
/* device-specific boilerplate */
|
||||||
|
|
||||||
@ -145,7 +145,7 @@ document.onreadystatechange = function () {
|
|||||||
function renderPdf(file, options) {
|
function renderPdf(file, options) {
|
||||||
PDFJS.filePath = "vendor/pdfjs/";
|
PDFJS.filePath = "vendor/pdfjs/";
|
||||||
PDFJS.imageResourcesPath = "vendor/pdfjs/css/images/";
|
PDFJS.imageResourcesPath = "vendor/pdfjs/css/images/";
|
||||||
PDFJS.workerSrc = options.session.basePath + 'vendor/pdfjs/lib/pdf.worker.js';
|
PDFJS.workerSrc = options.session.staticPath + 'vendor/pdfjs/lib/pdf.worker.js';
|
||||||
|
|
||||||
var reader = pdfReader(file, options);
|
var reader = pdfReader(file, options);
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
?>
|
?>
|
||||||
|
|
||||||
<html dir="ltr">
|
<html dir="ltr">
|
||||||
<head class="session" data-nonce='<?php p($nonce);?>' data-downloadlink='<?php print_unescaped($downloadLink);?>' data-fileid='<?php print_unescaped($fileId);?>' data-filetype='<?php print_unescaped($fileType);?>' data-filename='<?php print_unescaped($fileName);?>' data-version='<?php print_unescaped($version);?>' data-basepath='<?php p($urlGenerator->linkTo("epubreader",""));?>' data-scope='<?php print_unescaped($scope);?>' data-cursor='<?php print_unescaped($cursor);?>' data-defaults='<?php print_unescaped($defaults);?>' data-preferences='<?php print_unescaped($preferences);?>' data-metadata='<?php print_unescaped($metadata);?>' data-annotations='<?php print_unescaped($annotations);?>'>
|
<head class="session" data-nonce='<?php p($nonce);?>' data-downloadlink='<?php print_unescaped($downloadLink);?>' data-fileid='<?php print_unescaped($fileId);?>' data-filetype='<?php print_unescaped($fileType);?>' data-filename='<?php print_unescaped($fileName);?>' data-version='<?php print_unescaped($version);?>' data-basepath='<?php p($urlGenerator->linkToRoute('epubreader.page.showReader'));?>' data-staticpath='<?php p($urlGenerator->linkTo('epubreader', ''));?>' data-scope='<?php print_unescaped($scope);?>' data-cursor='<?php print_unescaped($cursor);?>' data-defaults='<?php print_unescaped($defaults);?>' data-preferences='<?php print_unescaped($preferences);?>' data-metadata='<?php print_unescaped($metadata);?>' data-annotations='<?php print_unescaped($annotations);?>'>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
?>
|
?>
|
||||||
|
|
||||||
<html dir="ltr">
|
<html dir="ltr">
|
||||||
<head class="session" data-nonce='<?php p($nonce);?>' data-downloadlink='<?php print_unescaped($downloadLink);?>' data-fileid='<?php print_unescaped($fileId);?>' data-filetype='<?php print_unescaped($fileType);?>' data-filename='<?php print_unescaped($fileName);?>' data-version='<?php print_unescaped($version);?>' data-basepath='<?php p($urlGenerator->linkTo("epubreader",""));?>' data-scope='<?php print_unescaped($scope);?>' data-cursor='<?php print_unescaped($cursor);?>' data-defaults='<?php print_unescaped($defaults);?>' data-preferences='<?php print_unescaped($preferences);?>' data-metadata='<?php print_unescaped($metadata);?>' data-annotations='<?php print_unescaped($annotations);?>'>
|
<head class="session" data-nonce='<?php p($nonce);?>' data-downloadlink='<?php print_unescaped($downloadLink);?>' data-fileid='<?php print_unescaped($fileId);?>' data-filetype='<?php print_unescaped($fileType);?>' data-filename='<?php print_unescaped($fileName);?>' data-version='<?php print_unescaped($version);?>' data-basepath='<?php p($urlGenerator->linkToRoute('epubreader.page.showReader'));?>' data-staticpath='<?php p($urlGenerator->linkTo('epubreader', ''));?>' data-scope='<?php print_unescaped($scope);?>' data-cursor='<?php print_unescaped($cursor);?>' data-defaults='<?php print_unescaped($defaults);?>' data-preferences='<?php print_unescaped($preferences);?>' data-metadata='<?php print_unescaped($metadata);?>' data-annotations='<?php print_unescaped($annotations);?>'>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
?>
|
?>
|
||||||
|
|
||||||
<html dir="ltr">
|
<html dir="ltr">
|
||||||
<head class="session" data-nonce='<?php p($nonce);?>' data-downloadlink='<?php print_unescaped($downloadLink);?>' data-fileid='<?php print_unescaped($fileId);?>' data-filetype='<?php print_unescaped($fileType);?>' data-filename='<?php print_unescaped($fileName);?>' data-version='<?php print_unescaped($version);?>' data-basepath='<?php p($urlGenerator->linkTo("epubreader",""));?>' data-scope='<?php print_unescaped($scope);?>' data-cursor='<?php print_unescaped($cursor);?>' data-defaults='<?php print_unescaped($defaults);?>' data-preferences='<?php print_unescaped($preferences);?>' data-metadata='<?php print_unescaped($metadata);?>' data-annotations='<?php print_unescaped($annotations);?>'>
|
<head class="session" data-nonce='<?php p($nonce);?>' data-downloadlink='<?php print_unescaped($downloadLink);?>' data-fileid='<?php print_unescaped($fileId);?>' data-filetype='<?php print_unescaped($fileType);?>' data-filename='<?php print_unescaped($fileName);?>' data-version='<?php print_unescaped($version);?>' data-basepath='<?php p($urlGenerator->linkToRoute('epubreader.page.showReader'));?>' data-staticpath='<?php p($urlGenerator->linkTo('epubreader', ''));?>' data-scope='<?php print_unescaped($scope);?>' data-cursor='<?php print_unescaped($cursor);?>' data-defaults='<?php print_unescaped($defaults);?>' data-preferences='<?php print_unescaped($preferences);?>' data-metadata='<?php print_unescaped($metadata);?>' data-annotations='<?php print_unescaped($annotations);?>'>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
@ -43,6 +43,7 @@
|
|||||||
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/css/text_layer_builder.css')) ?>?v=<?php p($version) ?>">
|
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/css/text_layer_builder.css')) ?>?v=<?php p($version) ?>">
|
||||||
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/css/annotation_layer_builder.css')) ?>?v=<?php p($version) ?>">
|
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/css/annotation_layer_builder.css')) ?>?v=<?php p($version) ?>">
|
||||||
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/epubjs/libs/jquery.min.js')) ?>?v=<?php p($version) ?>"> </script>
|
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/epubjs/libs/jquery.min.js')) ?>?v=<?php p($version) ?>"> </script>
|
||||||
|
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/lib/pdf.worker.js')) ?>?v=<?php p($version) ?>"> </script>
|
||||||
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/bartaz/jquery.highlight.js')) ?>?v=<?php p($version) ?>"> </script>
|
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/bartaz/jquery.highlight.js')) ?>?v=<?php p($version) ?>"> </script>
|
||||||
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/jquery/put-delete.js')) ?>?v=<?php p($version) ?>"> </script>
|
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/jquery/put-delete.js')) ?>?v=<?php p($version) ?>"> </script>
|
||||||
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/sindresorhus/screenfull.js')) ?>?v=<?php p($version) ?>"> </script>
|
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/sindresorhus/screenfull.js')) ?>?v=<?php p($version) ?>"> </script>
|
||||||
|
4
vendor/cbrjs/cbr.js
vendored
4
vendor/cbrjs/cbr.js
vendored
@ -73,7 +73,7 @@ CBRJS.Reader = function(bookPath, _options) {
|
|||||||
xhr.onload = function () {
|
xhr.onload = function () {
|
||||||
if ((this.status === 200) && this.response) {
|
if ((this.status === 200) && this.response) {
|
||||||
var done = false;
|
var done = false;
|
||||||
var ua = new bitjs.archive[archive_class](this.response, document.head.dataset.basepath + 'vendor/bitjs/');
|
var ua = new bitjs.archive[archive_class](this.response, document.head.dataset.staticpath + 'vendor/bitjs/');
|
||||||
|
|
||||||
ua.addEventListener(bitjs.archive.UnarchiveEvent.Type.START, function (e) {
|
ua.addEventListener(bitjs.archive.UnarchiveEvent.Type.START, function (e) {
|
||||||
$progressbar.css('width', '0%');
|
$progressbar.css('width', '0%');
|
||||||
@ -276,7 +276,7 @@ ComicBook = (function ($) {
|
|||||||
70: 'toggleFullscreen', // f
|
70: 'toggleFullscreen', // f
|
||||||
27: 'closeSidebar' // esc
|
27: 'closeSidebar' // esc
|
||||||
},
|
},
|
||||||
vendorPath: document.head.dataset.basepath + 'vendor/',
|
vendorPath: document.head.dataset.staticpath + 'vendor/',
|
||||||
forward_buffer: 3,
|
forward_buffer: 3,
|
||||||
session: {
|
session: {
|
||||||
getCursor: function() {},
|
getCursor: function() {},
|
||||||
|
Reference in New Issue
Block a user