user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
This commit is contained in:
Ozzieisaacs
2020-04-30 18:08:28 +02:00
parent 27eb09fb19 e3246fd751
commit b160a8de0b
27 changed files with 589 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/static/js/caliBlur.js
+2 -2
View File
@@ -28,7 +28,7 @@ $( 'body.mailset' ).addClass( 'admin' );
curHref = window.location.href.split('/');
prevHref = document.referrer.split('/');
$( '.navbar-form.navbar-left' )
.before( '<div class="plexBack"><a href="' + document.referrer + '"></a></div>' );
.before( '<div class="plexBack"><a href="' + encodeURI(document.referrer) + '"></a></div>' );
if ( history.length === 1 ||
curHref[0] +
curHref[1] +
@@ -43,7 +43,7 @@ if ( history.length === 1 ||
//Weird missing a after pressing back from edit.
setTimeout(function() {
if ( $( '.plexBack a').length < 1 ) {
$( '.plexBack' ).append('<a href="' + document.referrer + '"></a>');
$( '.plexBack' ).append('<a href="' + encodeURI(document.referrer) + '"></a>');
}
},10);