mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-30 06:43:03 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'adv/bookmarks'

Browse Source
This commit is contained in:
OzzieIsaacs
2017-09-17 20:26:58 +02:00
parent 2a78a02e0b a4f81dd812
commit 378a0ca662
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cps/static/js/reading/epub.js
View File

@@ -8,7 +8,7 @@
var reader = ePubReader(calibre.bookUrl, {
restore: true,
bookmarks: [calibre.bookmark]
bookmarks: calibre.bookmark ? [calibre.bookmark] : []
});
reader.on("reader:bookmarked", updateBookmark.bind(reader, "add"));
reader.on("reader:unbookmarked", updateBookmark.bind(reader, "remove"));
@@ -21,7 +21,7 @@
// Remove other bookmarks (there can only be one)
if (action === "add") {
this.settings.bookmarks.filter(function (bookmark) {
return bookmark !== location;
return bookmark && bookmark !== location;
}).map(function (bookmark) {
this.removeBookmark(bookmark);
}.bind(this));