yetangitu/nextcloud-apps
1
0
Fork 0
mirror of https://github.com/Yetangitu/owncloud-apps.git synced 2025-10-02 14:49:17 +02:00
Code Issues Releases Wiki Activity

Fix several basepath issues

Browse source
This commit is contained in:
Manuel Valls Fernández 2018-06-24 13:38:09 +02:00
parent 457c1603fa
commit 161ae961a9
No known key found for this signature in database
GPG key ID: 9789F80D7992F42B
5 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
files_reader/templates/cbreader.php
View file

@ -36,9 +36,9 @@
<title> <title>
<?php p($title);?> <?php p($title);?>
</title> </title>
<link rel="shortcut icon" href="img/book.png"> <link rel="shortcut icon" href="<?php p($urlGenerator->linkTo('files_reader', 'img/book.png')) ?>">
<link rel="stylesheet" href="vendor/icomoon/style.css?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>">
<link rel="stylesheet" href="vendor/cbrjs/css/cbr.css?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/cbrjs/css/cbr.css')) ?>?v=<?php p($version) ?>">
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'js/lib/Blob.js')) ?>?v=<?php p($version) ?>"> </script> <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'js/lib/Blob.js')) ?>?v=<?php p($version) ?>"> </script>
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/libs/jquery.min.js')) ?>?v=<?php p($version) ?>"> </script> <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/libs/jquery.min.js')) ?>?v=<?php p($version) ?>"> </script>
<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/sindresorhus/screenfull.js')) ?>?v=<?php p($version) ?>"> </script> <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/sindresorhus/screenfull.js')) ?>?v=<?php p($version) ?>"> </script>
@ -109,7 +109,9 @@
<!-- /toolbar --> <!-- /toolbar -->
<!-- loading overlay --> <!-- loading overlay -->
<div id="cbr-loading-overlay" class="cbr-control control overlay" name="loadingOverlay" style="display:none"></div> <div id="cbr-loading-overlay" class="cbr-control control overlay" name="loadingOverlay" style="display:none">
<img src="<?php p($urlGenerator->linkTo('files_reader', 'img/loading.gif')) ?>">
</div>
<!-- /loading overlay --> <!-- /loading overlay -->
<!-- busy overlay --> <!-- busy overlay -->

8
files_reader/templates/epubreader.php
View file

@ -36,7 +36,7 @@
<title> <title>
<?php p($title);?> <?php p($title);?>
</title> </title>
<link rel="shortcut icon" href="img/book.png"> <link rel="shortcut icon" href="<?php p($urlGenerator->linkTo('files_reader', 'img/book.png')) ?>">
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>">
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/css/main.css')) ?>?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/css/main.css')) ?>?v=<?php p($version) ?>">
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/css/sidebar.css')) ?>?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/css/sidebar.css')) ?>?v=<?php p($version) ?>">
@ -155,7 +155,7 @@
<div class="control-group"> <div class="control-group">
<input type="checkbox" id="use_custom_colors" name="use_custom_colors"> <input type="checkbox" id="use_custom_colors" name="use_custom_colors">
<label for="use_custom_colors"> <label for="use_custom_colors">
Use custom colors Use custom colors
</label> </label>
<div class="center-box"> <div class="center-box">
<input type="color" id="day_color" value="#0a0a0a"> <input type="color" id="day_color" value="#0a0a0a">
@ -209,7 +209,7 @@
<div class="control-group"> <div class="control-group">
<input type="checkbox" id="touch_nav" name="touch_nav"> <input type="checkbox" id="touch_nav" name="touch_nav">
<label for="touch_nav"> <label for="touch_nav">
disable extra-wide page turn areas disable extra-wide page turn areas
</label> </label>
</div> </div>
<div class="control-group"> <div class="control-group">
@ -283,7 +283,7 @@
</div> </div>
</div> </div>
<div id="loader"> <div id="loader">
<img src="img/loading.gif"> <img src="<?php p($urlGenerator->linkTo('files_reader', 'img/loading.gif')) ?>">
</div> </div>
<!-- /navigation + viewer --> <!-- /navigation + viewer -->

8
files_reader/templates/pdfreader.php
View file

@ -36,7 +36,7 @@
<title> <title>
<?php p($title);?> <?php p($title);?>
</title> </title>
<link rel="shortcut icon" href="img/book.png"> <link rel="shortcut icon" href="<?php p($urlGenerator->linkTo('files_reader', 'img/book.png')) ?>">
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>">
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/css/main.css')) ?>?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/css/main.css')) ?>?v=<?php p($version) ?>">
<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/css/sidebar.css')) ?>?v=<?php p($version) ?>"> <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/css/sidebar.css')) ?>?v=<?php p($version) ?>">
@ -113,7 +113,7 @@
<ul id="outline" class="outline"> <ul id="outline" class="outline">
</ul> </ul>
</div> </div>
<!-- currently not used <!-- currently not used
<div id="notesView" class="notes-view view"> <div id="notesView" class="notes-view view">
<div> <div>
@ -183,7 +183,7 @@
<div class="control-group"> <div class="control-group">
<input type="checkbox" id="touch_nav" name="touch_nav"> <input type="checkbox" id="touch_nav" name="touch_nav">
<label for="touch_nav"> <label for="touch_nav">
disable extra-wide page turn areas disable extra-wide page turn areas
</label> </label>
</div> </div>
<div class="control-group"> <div class="control-group">
@ -310,7 +310,7 @@
</div> </div>
</div> </div>
<div id="loader"> <div id="loader">
<img src="img/loading.gif"> <img src="<?php p($urlGenerator->linkTo('files_reader', 'img/loading.gif')) ?>">
</div> </div>
<!-- /navigation + viewer --> <!-- /navigation + viewer -->

24
files_reader/vendor/cbrjs/cbr.js vendored
View file

@ -50,7 +50,7 @@ CBRJS.Reader = function(bookPath, _options) {
} }
xhr.open('GET',url, true); xhr.open('GET',url, true);
options.start(filename); options.start(filename);
xhr.responseType = "arraybuffer"; xhr.responseType = "arraybuffer";
@ -70,10 +70,10 @@ CBRJS.Reader = function(bookPath, _options) {
reader.options.session.size = e.total; reader.options.session.size = e.total;
}; };
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, 'vendor/bitjs/'); var ua = new bitjs.archive[archive_class](this.response, document.head.dataset.basepath + '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%');
@ -120,9 +120,9 @@ CBRJS.Reader = function(bookPath, _options) {
$('.icon-unarchive').removeClass('active'); $('.icon-unarchive').removeClass('active');
$('.icon-unarchive').addClass('error'); $('.icon-unarchive').addClass('error');
$('#message').text('Failed to extract images from archive, file corrupted?'); $('#message').text('Failed to extract images from archive, file corrupted?');
}); });
} }
ua.start(); ua.start();
}; };
@ -261,7 +261,7 @@ ComicBook = (function ($) {
thumbnails: true, // true / false (use thumbnails in index) thumbnails: true, // true / false (use thumbnails in index)
thumbnailWidth: 200, // width of thumbnail thumbnailWidth: 200, // width of thumbnail
sidebarWide: false, // use wide sidbar sidebarWide: false, // use wide sidbar
currentPage: 0, // current page currentPage: 0, // current page
keyboard: { keyboard: {
32: 'next', // space 32: 'next', // space
34: 'next', // page-down 34: 'next', // page-down
@ -276,7 +276,7 @@ ComicBook = (function ($) {
70: 'toggleFullscreen', // f 70: 'toggleFullscreen', // f
27: 'closeSidebar' // esc 27: 'closeSidebar' // esc
}, },
vendorPath: 'vendor/', vendorPath: document.head.dataset.basepath + 'vendor/',
forward_buffer: 3, forward_buffer: 3,
session: { session: {
getCursor: function() {}, getCursor: function() {},
@ -442,7 +442,7 @@ ComicBook = (function ($) {
break; break;
default: default:
console.log("unknown enhancement: " + JSON.stringify(prop)); console.log("unknown enhancement: " + JSON.stringify(prop));
} }
} }
}; };
@ -570,7 +570,7 @@ ComicBook = (function ($) {
}; };
/** /**
* Insert thumbnail into TOC * Insert thumbnail into TOC
*/ */
ComicBook.prototype.tocInsert = function (image, page, replace) { ComicBook.prototype.tocInsert = function (image, page, replace) {
var placeholder = toc.children[page].firstChild; var placeholder = toc.children[page].firstChild;
@ -578,7 +578,7 @@ ComicBook = (function ($) {
placeholder.parentNode.replaceChild( placeholder.parentNode.replaceChild(
self.getThumb(image), self.getThumb(image),
placeholder placeholder
); );
} }
toc.children[page].addEventListener('click', function (e) { toc.children[page].addEventListener('click', function (e) {
@ -1407,7 +1407,7 @@ ComicBook = (function ($) {
page = options.currentPage; page = options.currentPage;
} }
document.getElementById('toc').parentNode.scrollTop = document.getElementById('toc').parentNode.scrollTop =
document.getElementById('page-' + String(page + 1)).offsetTop document.getElementById('page-' + String(page + 1)).offsetTop
- Math.floor($('.panels').height() * 1.5); - Math.floor($('.panels').height() * 1.5);
}; };
@ -1474,5 +1474,3 @@ ComicBook = (function ($) {
} }
})(window, jQuery); })(window, jQuery);

8
files_reader/vendor/cbrjs/css/cbr.css vendored
View file

@ -116,7 +116,13 @@ body:not(.mobile) .navigate:hover {
#cbr-loading-overlay { #cbr-loading-overlay {
z-index: 100; z-index: 100;
background: #000 url("img/loading.gif") no-repeat center; padding: 0;
width: 20px;
height: 20px;
}
#cbr-loading-overlay > img {
width: 100%;
} }
.overlay { .overlay {